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

[Libreoffice Gerrit user]

 src/lib/CDRParser.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5594f776dfef54e09780c62fca9cd85426a0b2d6
Author:     Fridrich Štrba <fridrich.strba at bluewin.ch>
AuthorDate: Thu Mar 25 12:46:36 2021 +0100
Commit:     Fridrich Štrba <fridrich.strba at bluewin.ch>
CommitDate: Thu Mar 25 12:46:36 2021 +0100

    Default style id for txsm5
    
    Change-Id: Ia7ada38f62d17abebc3d7d29d023750aac4dd451

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 4ea95e0..539c6cf 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2854,7 +2854,7 @@ void libcdr::CDRParser::readTxsm5(librevenge::RVNGInputStream *input)
   unsigned numPara = readU16(input);
   for (unsigned j=0; j<numPara; ++j)
   {
-    input->seek(2, librevenge::RVNG_SEEK_CUR);
+    unsigned stlId = readU16(input);
     unsigned numSt = readU16(input);
     std::map<unsigned, CDRStyle> styles;
     for (unsigned i= 0; i<numSt /* && getRemainingLength(input) >= 34 */; ++i)
@@ -2919,7 +2919,7 @@ void libcdr::CDRParser::readTxsm5(librevenge::RVNGInputStream *input)
       charDescriptions.push_back((readU16(input) >> 3) & 0xff);
     }
     if (!textData.empty())
-      m_collector->collectText(textId, 0, textData, charDescriptions, styles);
+      m_collector->collectText(textId, stlId, textData, charDescriptions, styles);
   }
 }