Bug 60608 -- improve charset handling in Hwmf -- remove deprecated drawString(String...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1779613 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java b/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
index 2716696deeac8e43c5f0097b63e5c3e3500d5ef2..f292313185b672259821efeb487bb14b0d133576 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
+++ b/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
@@ -316,30 +316,10 @@ public class HwmfGraphics {
         }\r
     }\r
 \r
-    /**\r
-     *\r
-     * @param text\r
-     * @param bounds\r
-     * @deprecated use {@link #drawString(byte[], Rectangle2D)}\r
-     */\r
-    public void drawString(String text, Rectangle2D bounds) {\r
-        drawString(text, bounds, null);\r
-    }\r
-\r
     public void drawString(byte[] text, Rectangle2D bounds) {\r
         drawString(text, bounds, null);\r
     }\r
 \r
-    /**\r
-     *\r
-     * @param text\r
-     * @param bounds\r
-     * @deprecated use {@link #drawString(byte[], Rectangle2D, int[])}\r
-     */\r
-    public void drawString(String text, Rectangle2D bounds, int dx[]) {\r
-        drawString(text.getBytes(DEFAULT_CHARSET), bounds, dx);\r
-    }\r
-\r
     public void drawString(byte[] text, Rectangle2D bounds, int dx[]) {\r
         HwmfFont font = prop.getFont();\r
         if (font == null || text == null || text.length == 0) {\r