summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-27 21:06:38 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-28 14:00:07 +0100
commit1eb80742966388b2c209183f951f2924dcd12a26 (patch)
tree36acdf9c6a7051e50d12b87ad78c8258400984c5 /sw
parent3c63480d3e0f961476df154854a51e50fb536ad4 (diff)
-Werror,-Wformat
Change-Id: I8ac3c45b83961541c4b5d9b2d5dc7193013d806d
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/dbg_lay.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 80182070235d..6036fa9cb232 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -345,7 +345,7 @@ void SwImplProtocol::CheckLine( OString& rLine )
}
if( !aTok.isEmpty() )
{
- sal_uLong nVal;
+ long nVal;
sscanf( aTok.getStr(), "%li", &nVal );
switch ( nInitFile )
{
@@ -362,9 +362,9 @@ void SwImplProtocol::CheckLine( OString& rLine )
case 3: {
sal_uLong nOld = SwProtocol::Record();
if( bNo )
- nOld &= ~nVal; // remove function
+ nOld &= ~sal_uLong(nVal); // remove function
else
- nOld |= nVal; // remove function
+ nOld |= sal_uLong(nVal); // remove function
SwProtocol::SetRecord( nOld );
}
break;
@@ -378,7 +378,7 @@ void SwImplProtocol::CheckLine( OString& rLine )
break;
case 5: nMaxLines = (sal_uInt16)nVal;
break;
- case 6: aVars.push_back( (long)nVal );
+ case 6: aVars.push_back( nVal );
break;
}
}