[Libreoffice-commits] .: 2 commits - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par3.cxx |    8 ++++----
 sw/source/filter/ww8/ww8scan.cxx |    4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 51af20c8b4183fc796f5c9d4be25d3560a20ca3e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 28 15:58:15 2012 +0000

    we don't want \'longs\' here

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index c3df152..5934524 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -360,9 +360,9 @@ struct WW8LFO   // nur DIE Eintraege, die WIR benoetigen!
 
 struct WW8LVL   // nur DIE Eintraege, die WIR benoetigen!
 {
-    long    nStartAt;       // start at value for this value
-    long    nV6DxaSpace;// Ver6-Compatible: min Space between Num anf text::Paragraph
-    long    nV6Indent;  // Ver6-Compatible: Breite des Prefix Textes; ggfs. zur
+    sal_Int32 nStartAt;       // start at value for this value
+    sal_Int32 nV6DxaSpace;// Ver6-Compatible: min Space between Num anf text::Paragraph
+    sal_Int32 nV6Indent;  // Ver6-Compatible: Breite des Prefix Textes; ggfs. zur
                         // Definition d. Erstzl.einzug nutzen!
     // Absatzattribute aus GrpprlPapx
     sal_uInt16  nDxaLeft;               // linker Einzug
@@ -385,7 +385,7 @@ struct WW8LVL   // nur DIE Eintraege, die WIR benoetigen!
 
 struct WW8LFOLVL
 {
-    long nStartAt;          // start-at value if bFormat==false and bStartAt == true
+    sal_Int32 nStartAt;          // start-at value if bFormat==false and bStartAt == true
                                             // (if bFormat==true, the start-at is stored in the LVL)
     sal_uInt8 nLevel;               // the level to be overridden
     // dieses Byte ist _absichtlich_ nicht in das folgende Byte hineingepackt   !!
commit a08fb657ec936f2785166d38e4f85682c4ba9aa1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 28 15:52:45 2012 +0000

    log some more useful information on invalid sprms

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index dfc04be..801e687 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7388,7 +7388,9 @@ sal_uInt8* wwSprmParser::findSprmData(sal_uInt16 nId, sal_uInt8* pSprms,
 
         bool bValid = nSize <= nLen;
 
-        SAL_WARN_IF(!bValid, "sw.ww8", "sprm longer than remaining bytes, doc or parser is wrong");
+        SAL_WARN_IF(!bValid, "sw.ww8",
+            "sprm 0x" << std::hex << nAktId << std::dec << " longer than remaining bytes, " <<
+            nSize << " vs " << nLen << "doc or parser is wrong");
 
         if (nAktId == nId && bValid) // Sprm found
             return pSprms + DistanceToData(nId);