summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-07-02 01:55:56 +0100
committerMichael Meeks <michael.meeks@novell.com>2011-07-08 11:34:38 +0100
commitb00c51c9fb1a69431248e3bfa3d8e9265e69a83c (patch)
tree5707aa7bd203430900b150cf575f128a8c0e6a1c
parentc703b311c907b4c97850b5c81ae6a9d3ef47954c (diff)
Related: fdo#37057 use standard sprm iterator
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 4ab1be3502..bda689b1e4 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3727,11 +3727,11 @@ void WW8RStyle::ImportSprms(sal_uInt8 *pSprms, short nLen, bool bPap)
nSprmsLen = nLen;
}
- while ( nLen > 0 )
+ WW8SprmIter aSprmIter(pSprms, nLen, maSprmParser);
+ while (const sal_uInt8* pSprm = aSprmIter.GetSprms())
{
- sal_uInt16 nL1 = pIo->ImportSprm(pSprms);
- nLen = nLen - nL1;
- pSprms += nL1;
+ pIo->ImportSprm(pSprm);
+ aSprmIter.advance();
}
pParaSprms = 0;