Fix bug #55001 - check for unicode text too (plus fix indents)

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java b/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
index 67341a267204039429c714d6a07ce61137fb9bd7..2ab57380a9c4ba0856a74b4aaaf862bbf41513d4 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
@@ -486,27 +486,32 @@ public abstract class TextShape extends SimpleShape {
       * @return the TextRun object for this text box
       */
     public TextRun getTextRun(){
-        if (null == this._txtrun) initTextRun();
-        if (null == this._txtrun && null != this._txtbox) {
-               TextHeaderAtom    tha = null; 
-               TextBytesAtom     tba = null;
-               StyleTextPropAtom sta = null;
-               Record[] childRecords = this._txtbox.getChildRecords();
-               for (Record r : childRecords) {
-                       if (r instanceof TextHeaderAtom) {
-                               tha = (TextHeaderAtom) r;
-                               } else if (r instanceof TextBytesAtom) {
-                                       tba = (TextBytesAtom) r;
-                               } else if (r instanceof StyleTextPropAtom) {
-                                       sta = (StyleTextPropAtom) r;
-                               }
-               }
-               if (null != tba) {
-                       this._txtrun = new TextRun(tha, tba, sta);
-               }
-         }
-         return _txtrun;
-     }
+       if (null == this._txtrun) initTextRun();
+       if (null == this._txtrun && null != this._txtbox) {
+          TextHeaderAtom    tha = null; 
+          TextBytesAtom     tba = null;
+          TextCharsAtom     tca = null;
+          StyleTextPropAtom sta = null;
+          Record[] childRecords = this._txtbox.getChildRecords();
+          for (Record r : childRecords) {
+             if (r instanceof TextHeaderAtom) {
+                tha = (TextHeaderAtom) r;
+             } else if (r instanceof TextBytesAtom) {
+                tba = (TextBytesAtom) r;
+             } else if (r instanceof TextCharsAtom) {
+                tca = (TextCharsAtom) r;
+             } else if (r instanceof StyleTextPropAtom) {
+                sta = (StyleTextPropAtom) r;
+             }
+          }
+          if (tba != null) {
+             this._txtrun = new TextRun(tha, tba, sta);
+          } else if (tca != null) {
+             this._txtrun = new TextRun(tha, tca, sta);
+          }
+       }
+       return _txtrun;
+    }
 
     public void setSheet(Sheet sheet) {
         _sheet = sheet;