support for processing of symbols in HWPF, see Bugzilla 49908

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

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 8793b5e9823f01b88c2c0b00a6101d46346bd4ef..94691ec8f2f887aaaafeaf46de181fae24ec56a7 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.7-beta4" date="2010-??-??">
+           <action dev="poi-developers" type="fix">49908 - support for processing of symbols in HWPF</action>
            <action dev="poi-developers" type="fix">50022 - support for retrieving pictures from HSSF workbooks</action>
            <action dev="poi-developers" type="fix">50020 - Avoid IllegalStateException when creating Data validation in sheet with macro</action>
            <action dev="poi-developers" type="fix">50033 - Improved rounding in MOD</action>

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
index 2b6d41bb3fb47af4f5a9e20f4d0b3ab64233d96a..076b0029aca706c99839e52f3ea486d23a5312a6 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
@@ -18,6 +18,7 @@
 package org.apache.poi.hwpf.usermodel;
 
 import org.apache.poi.hwpf.model.CHPX;
+import org.apache.poi.hwpf.model.Ffn;
 import org.apache.poi.hwpf.model.StyleSheet;
 import org.apache.poi.hwpf.sprm.SprmBuffer;
 
@@ -557,5 +558,50 @@ public final class CharacterRun
 
     return cp;
   }
+  
+  /**
+   * Returns true, if the CharacterRun is a special character run containing a symbol, otherwise false.
+   *
+   * <p>In case of a symbol, the {@link #text()} method always returns a single character 0x0028, but word actually stores
+   * the character in a different field. Use {@link #getSymbolCharacter()} to get that character and {@link #getSymbolFont()}
+   * to determine its font.
+   */
+  public boolean isSymbol()
+  {
+    return isSpecialCharacter() && text().equals("\u0028");
+  }
+
+  /**
+   * Returns the symbol character, if this is a symbol character run.
+   * 
+   * @see #isSymbol()
+   * @throws IllegalStateException If this is not a symbol character run: call {@link #isSymbol()} first.
+   */
+  public char getSymbolCharacter()
+  {
+    if (isSymbol()) {
+      return (char)_props.getXchSym();
+    } else
+      throw new IllegalStateException("Not a symbol CharacterRun");
+  }
+
+  /**
+   * Returns the symbol font, if this is a symbol character run. Might return null, if the font index is not found in the font table.
+   * 
+   * @see #isSymbol()
+   * @throws IllegalStateException If this is not a symbol character run: call {@link #isSymbol()} first.
+   */
+  public Ffn getSymbolFont()
+  {
+    if (isSymbol()) {
+      Ffn[] fontNames = _doc.getFontTable().getFontNames();
+
+      if (fontNames.length <= _props.getFtcSym())
+        return null;
+
+      return fontNames[_props.getFtcSym()];
+    } else
+      throw new IllegalStateException("Not a symbol CharacterRun");
+  }
 
 }

diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
new file mode 100755 (executable)
index 0000000..bc1d997
--- /dev/null
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
@@ -0,0 +1,48 @@
+/* ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+==================================================================== */\r
+\r
+package org.apache.poi.hwpf.usermodel;\r
+\r
+import java.io.IOException;\r
+\r
+import junit.framework.TestCase;\r
+\r
+import org.apache.poi.hwpf.HWPFDocument;\r
+import org.apache.poi.hwpf.HWPFTestDataSamples;\r
+\r
+/**\r
+ * API for processing of symbols, see Bugzilla 49908\r
+ */\r
+public final class TestRangeSymbols extends TestCase {\r
+\r
+    public void test() throws IOException {\r
+        HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug49908.doc");\r
+\r
+        Range range = doc.getRange();\r
+\r
+        assertTrue(range.numCharacterRuns() >= 2);\r
+        CharacterRun chr = range.getCharacterRun(0);\r
+        assertEquals(false, chr.isSymbol());\r
+\r
+        chr = range.getCharacterRun(1);\r
+        assertEquals(true, chr.isSymbol());\r
+        assertEquals("\u0028", chr.text());\r
+        assertEquals("Wingdings", chr.getSymbolFont().getMainFontName());\r
+        assertEquals(0xf028, chr.getSymbolCharacter());\r
+    }\r
+\r
+}
\ No newline at end of file

diff --git a/test-data/document/Bug49908.doc b/test-data/document/Bug49908.doc
new file mode 100755 (executable)
index 0000000..6a89732
Binary files /dev/null and b/test-data/document/Bug49908.doc differ