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

[Fridrich Å trba]

 src/lib/CDRParser.cpp          |    2 +-
 src/lib/CDRStylesCollector.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca208091fadb40c6a2903a0b001e897e071a6591
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Apr 11 14:57:32 2013 +0200

    Minor fixes

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 551eec5..ea017e8 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2961,7 +2961,7 @@ void libcdr::CDRParser::readStyd(WPXInputStream *input)
     CDR_DEBUG_MSG(("Styd should not be present in this file version\n"));
     return;
   }
-  unsigned styleId = readUnsigned(input);
+  unsigned styleId = readU16(input);
   long startPosition = input->tell();
   unsigned chunkLength = readUnsigned(input);
   unsigned numOfArgs = readUnsigned(input);
diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp
index 7365ebb..634bf8c 100644
--- a/src/lib/CDRStylesCollector.cpp
+++ b/src/lib/CDRStylesCollector.cpp
@@ -304,9 +304,9 @@ void libcdr::CDRStylesCollector::collectText(unsigned textId, unsigned styleId,
     else
       appendCharacters(text, tmpTextData, tmpCharStyle.m_charSet);
     line.append(CDRText(text, tmpCharStyle));
+    CDR_DEBUG_MSG(("CDRStylesCollector::collectText - Text: %s\n", text.cstr()));
   }
 
-  CDR_DEBUG_MSG(("CDRStylesCollector::collectText - Text: %s\n", text.cstr()));
   std::vector<CDRTextLine> &paragraphVector = m_ps.m_texts[textId];
   paragraphVector.push_back(line);
 }