[Libreoffice-commits] libcdr.git: src/lib

[Fridrich Å trba]

 src/lib/CDRParser.cpp |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit c1bcc3bc59e566c86ca4e019c476dcaf0acc0d40
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Apr 12 15:11:19 2013 +0200

    Little fixes of txsm for >= 1300

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index bb99833..a1d4a33 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2724,7 +2724,7 @@ void libcdr::CDRParser::readTxsm(WPXInputStream *input, unsigned length)
       unsigned i = 0;
       for (i=0; i<numRecords; ++i)
       {
-        readU8(input);
+        unsigned char fl0 = readU8(input);
         readU8(input);
         unsigned char fl2 = readU8(input);
         unsigned char fl3 = 0;
@@ -2773,6 +2773,9 @@ void libcdr::CDRParser::readTxsm(WPXInputStream *input, unsigned length)
           if (flag)
             input->seek(52, WPX_SEEK_CUR);
         }
+        if (fl0 == 0x02)
+          if (m_version >= 1300)
+            input->seek(48, WPX_SEEK_CUR);
 
         charStyles[2*i] = charStyle;
       }
@@ -3098,13 +3101,11 @@ void libcdr::CDRParser::readStyd(WPXInputStream *input)
   m_collector->collectStld(styleId, charStyle);
 }
 
-void libcdr::CDRParser::readArtisticText(WPXInputStream * /*input*/)
+void libcdr::CDRParser::readArtisticText(WPXInputStream *input)
 {
-#if 0
   double x = readCoordinate(input);
   double y = readCoordinate(input);
-#endif
-  m_collector->collectArtisticText(0.0, 0.0);
+  m_collector->collectArtisticText(x, y);
 }
 
 void libcdr::CDRParser::readParagraphText(WPXInputStream *input)