summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-05-31 12:51:36 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-05-31 13:09:04 +0100
commitdbd01385199225ff7011811b28a75e88b0d2f8c8 (patch)
tree51c5338a2bad41cbae3232b328b47280afb4e452 /sw
parentb1ca0f247280ca1b7f96fef8c89bc451c38d11af (diff)
targetted minor cppcheck reversion
Change-Id: I897739c4623123c32433d0e10fd301e073bb496e
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx4
-rw-r--r--sw/source/ui/config/uinums.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index f4751086adfe..b1686c591499 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2036,13 +2036,13 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
nTTyp );
{
SwNodeIndex aContentIdx = *pNdIdx;
- ++aContentIdx;
+ aContentIdx++;
if ( aContentIdx.GetNode().IsTableNode() )
{
bool bContainsOnlyTables = true;
do {
aContentIdx = *(aContentIdx.GetNode().EndOfSectionNode());
- ++aContentIdx;
+ aContentIdx++;
if ( !aContentIdx.GetNode().IsTableNode() &&
aContentIdx.GetIndex() != pNdIdx->GetNode().EndOfSectionIndex() )
{
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 64170c2bf7d9..2118eff045fc 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -331,6 +331,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
CharSet eEncoding = osl_getThreadTextEncoding();
{
sal_uInt16 nUS;
+ short nShort;
sal_Char cChar;
sal_Bool bFlag;
String sStr;
@@ -362,7 +363,6 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
}
else // old start-value was a Byte
{
- short nShort;
rStream >> nUS; aFmt.SetStart( nUS );
sStr = rStream.ReadUniOrByteString(eEncoding);
aFmt.SetPrefix( sStr );