summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx24
1 files changed, 14 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 30fbebc4fbc3..e1787614f732 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5521,17 +5521,21 @@ static void ParaTabStopDelAdd( WW8Export& rWrt,
aTab.Add(*pTN, nLParaMgn); // must be inserted
nN++;
}
- else if (lcl_IsEqual(nOP, *pTO, nNP, *pTN)) // tabs are equal
- {
- nO++; // nothing to do
- nN++;
- }
- else // tabs same position, different type
+ else
{
- aTab.Del(*pTO, nLStypeMgn); // delete old one
- aTab.Add(*pTN, nLParaMgn); // insert new one
- nO++;
- nN++;
+ assert(pTO && pTN);
+ if (lcl_IsEqual(nOP, *pTO, nNP, *pTN)) // tabs are equal
+ {
+ nO++; // nothing to do
+ nN++;
+ }
+ else // tabs same position, different type
+ {
+ aTab.Del(*pTO, nLStypeMgn); // delete old one
+ aTab.Add(*pTN, nLParaMgn); // insert new one
+ nO++;
+ nN++;
+ }
}
} while( true );