Commits

Anonymous committed 2eb1aab

cmcfixes76: #i113073# redundant dereferences

Comments (0)

Files changed (1)

sw/source/filter/ww8/ww8par2.cxx

         return;
     mbHasSpacing=true;
 #ifdef DBG_UTIL
-    BYTE nWhichCell =
+    BYTE nWhichCell = *pParams;
+    ASSERT(nWhichCell == 0, "Expected cell to be 0!");
 #endif
-			*pParams++;
-    ASSERT(nWhichCell == 0, "Expected cell to be 0!");
-    *pParams++; //unknown byte
+    ++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++)
     {
     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;
     ASSERT(nOverrideSpacing[nWhichCell] < 0x10,
         "Unexpected value for nSideBits");
 #ifdef DBG_UTIL
-    BYTE nUnknown2 =
+    BYTE nUnknown2 = *pParams;
+    ASSERT(nUnknown2 == 0x3, "Unexpected value for spacing2");
 #endif
-			*pParams++;
-    ASSERT(nUnknown2 == 0x3, "Unexpected value for spacing2");
+    ++pParams;
     USHORT nValue =  SVBT16ToShort( pParams );
 
     for (int i=0; i < 4; i++)