From: Tim Allison Date: Fri, 20 Jan 2017 12:10:29 +0000 (+0000) Subject: Bug 60608 -- improve charset handling in Hwmf -- remove deprecated drawString(String... X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d9bce7fff92d22ede7af63b14f4a4d807eddfdb2;p=poi.git 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 2716696dee..f292313185 100644 --- 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 { } } - /** - * - * @param text - * @param bounds - * @deprecated use {@link #drawString(byte[], Rectangle2D)} - */ - public void drawString(String text, Rectangle2D bounds) { - drawString(text, bounds, null); - } - public void drawString(byte[] text, Rectangle2D bounds) { drawString(text, bounds, null); } - /** - * - * @param text - * @param bounds - * @deprecated use {@link #drawString(byte[], Rectangle2D, int[])} - */ - public void drawString(String text, Rectangle2D bounds, int dx[]) { - drawString(text.getBytes(DEFAULT_CHARSET), bounds, dx); - } - public void drawString(byte[] text, Rectangle2D bounds, int dx[]) { HwmfFont font = prop.getFont(); if (font == null || text == null || text.length == 0) {