Kaydet (Commit) dbd01385 authored tarafından Michael Meeks's avatar Michael Meeks

targetted minor cppcheck reversion

Change-Id: I897739c4623123c32433d0e10fd301e073bb496e
üst b1ca0f24
...@@ -2036,13 +2036,13 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp, ...@@ -2036,13 +2036,13 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
nTTyp ); nTTyp );
{ {
SwNodeIndex aContentIdx = *pNdIdx; SwNodeIndex aContentIdx = *pNdIdx;
++aContentIdx; aContentIdx++;
if ( aContentIdx.GetNode().IsTableNode() ) if ( aContentIdx.GetNode().IsTableNode() )
{ {
bool bContainsOnlyTables = true; bool bContainsOnlyTables = true;
do { do {
aContentIdx = *(aContentIdx.GetNode().EndOfSectionNode()); aContentIdx = *(aContentIdx.GetNode().EndOfSectionNode());
++aContentIdx; aContentIdx++;
if ( !aContentIdx.GetNode().IsTableNode() && if ( !aContentIdx.GetNode().IsTableNode() &&
aContentIdx.GetIndex() != pNdIdx->GetNode().EndOfSectionIndex() ) aContentIdx.GetIndex() != pNdIdx->GetNode().EndOfSectionIndex() )
{ {
......
...@@ -331,6 +331,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, ...@@ -331,6 +331,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
CharSet eEncoding = osl_getThreadTextEncoding(); CharSet eEncoding = osl_getThreadTextEncoding();
{ {
sal_uInt16 nUS; sal_uInt16 nUS;
short nShort;
sal_Char cChar; sal_Char cChar;
sal_Bool bFlag; sal_Bool bFlag;
String sStr; String sStr;
...@@ -362,7 +363,6 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, ...@@ -362,7 +363,6 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
} }
else // old start-value was a Byte else // old start-value was a Byte
{ {
short nShort;
rStream >> nUS; aFmt.SetStart( nUS ); rStream >> nUS; aFmt.SetStart( nUS );
sStr = rStream.ReadUniOrByteString(eEncoding); sStr = rStream.ReadUniOrByteString(eEncoding);
aFmt.SetPrefix( sStr ); aFmt.SetPrefix( sStr );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment