mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: ongoing stream operator cleanup, persuade ints they are sal_Int32s

Browse Source
This commit is contained in:
Michael Meeks
2012-01-19 17:08:47 +00:00
parent c5d4f4967e
commit 4229f1b186
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sd/source/filter/eppt/eppt.cxx
View File

@@ -1457,7 +1457,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
mpStrm->Seek( nOfs ); // Fill the VBAInfoAtom with the correct index to the persisttable mpStrm->Seek( nOfs ); // Fill the VBAInfoAtom with the correct index to the persisttable
*mpStrm << nPersistEntrys *mpStrm << nPersistEntrys
<< n1 << n1
<< 2; << sal_Int32(2);
mpStrm->Seek( nOldPos ); mpStrm->Seek( nOldPos );
} }

4
sd/source/filter/eppt/epptso.cxx
View File

@@ -255,7 +255,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
<< (sal_uInt32)( EPP_ViewInfoAtom << 16 ) << (sal_uInt32)52 << (sal_uInt32)( EPP_ViewInfoAtom << 16 ) << (sal_uInt32)52
<< (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the current scale << (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the current scale
<< (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the previous scale << (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the previous scale
<< (sal_Int32)0x17ac << 0xdda // Origin - Keeps the origin in master coordinates << (sal_Int32)0x17ac << (sal_Int32)0xdda // Origin - Keeps the origin in master coordinates
<< (sal_Int32)-780 << (sal_Int32)-84 // Origin << (sal_Int32)-780 << (sal_Int32)-84 // Origin
<< (sal_uInt8)1 // bool1 varScale - Set if zoom to fit is set << (sal_uInt8)1 // bool1 varScale - Set if zoom to fit is set
<< (sal_uInt8)0 // bool1 draftMode - Not used << (sal_uInt8)0 // bool1 draftMode - Not used
@@ -1151,7 +1151,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
PPTExParaSheet& rParaSheet = mpStyleSheet->GetParaSheet( nTextInstance ); PPTExParaSheet& rParaSheet = mpStyleSheet->GetParaSheet( nTextInstance );
rOut << (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) << (sal_uInt32)4 rOut << (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) << (sal_uInt32)4
<< nTextInstance; << sal_Int32(nTextInstance);
if ( mbEmptyPresObj ) if ( mbEmptyPresObj )
mnTextSize = 0; mnTextSize = 0;

2
svx/source/gallery2/gallery1.cxx
View File

@@ -285,7 +285,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
if( pTestStm ) if( pTestStm )
{ {
*pTestStm << 1; *pTestStm << sal_Int32(1);
if( pTestStm->GetError() ) if( pTestStm->GetError() )
rbDirIsReadOnly = sal_True; rbDirIsReadOnly = sal_True;

2
sw/source/filter/ww8/rtfexport.cxx
View File

@@ -715,7 +715,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
if (((const SwTxtFmtColl*)pParent)->IsAssignedToListLevelOfOutlineStyle()) if (((const SwTxtFmtColl*)pParent)->IsAssignedToListLevelOfOutlineStyle())
{ {
// Level 9 disables the outline // Level 9 disables the outline
Strm() << OOO_STRING_SVTOOLS_RTF_LEVEL << 9; Strm() << OOO_STRING_SVTOOLS_RTF_LEVEL << sal_Int32(9);
bRet = true; bRet = true;
} }