[ooo-build-commit] .: 2 commits - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par2.cxx |   18 +++++++++---------
 sw/source/ui/config/usrpref.cxx  |    4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit a2e9a07a2c01155f900152b7ac8e7581c4963cfa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 16:27:23 2010 +0100

    fix warning

diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index c6be3b6..cd27b5b 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -63,12 +63,12 @@ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) :
     bIsVScrollMetricSet(sal_False),
     nDefTab( MM50 * 4 ),
     bIsSquaredPageMode(sal_False),
-    bApplyCharUnit(sal_False),
     aContentConfig(bWeb, *this),
     aLayoutConfig(bWeb, *this),
     aGridConfig(bWeb, *this),
     aCursorConfig(*this),
-    pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0)
+    pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0),
+    bApplyCharUnit(sal_False)
 {
     MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
     eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
commit 0065350c69c9307145cf9df693dc7b2c5fc0c9db
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 15:21:10 2010 +0100

    #i113073# redundant dereferences

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 5207ef6..a81d61c 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1509,15 +1509,15 @@ void WW8TabBandDesc::ProcessSpacing(const BYTE* pParams)
         return;
     mbHasSpacing=true;
 #ifdef DBG_UTIL
-    BYTE nWhichCell =
-#endif
-            *pParams++;
+    BYTE nWhichCell = *pParams;
     ASSERT(nWhichCell == 0, "Expected cell to be 0!");
-    *pParams++; //unknown byte
+#endif
+    ++pParams; //Skip which cell
+    ++pParams; //unknown byte
 
     BYTE nSideBits = *pParams++;
     ASSERT(nSideBits < 0x10, "Unexpected value for nSideBits");
-    *pParams++; //unknown byte
+    ++pParams; //unknown byte
     USHORT nValue =  SVBT16ToShort( pParams );
     for (int i = wwTOP; i <= wwRIGHT; i++)
     {
@@ -1555,7 +1555,7 @@ void WW8TabBandDesc::ProcessSpecificSpacing(const BYTE* pParams)
     if (nWhichCell >= MAX_COL + 1)
         return;
 
-    *pParams++; //unknown byte
+    ++pParams; //unknown byte
     BYTE nSideBits = *pParams++;
     ASSERT(nSideBits < 0x10, "Unexpected value for nSideBits");
     nOverrideSpacing[nWhichCell] |= nSideBits;
@@ -1563,10 +1563,10 @@ void WW8TabBandDesc::ProcessSpecificSpacing(const BYTE* pParams)
     ASSERT(nOverrideSpacing[nWhichCell] < 0x10,
         "Unexpected value for nSideBits");
 #ifdef DBG_UTIL
-    BYTE nUnknown2 =
-#endif
-            *pParams++;
+    BYTE nUnknown2 = *pParams;
     ASSERT(nUnknown2 == 0x3, "Unexpected value for spacing2");
+#endif
+    ++pParams;
     USHORT nValue =  SVBT16ToShort( pParams );
 
     for (int i=0; i < 4; i++)