sd/source/filter/eppt/eppt.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 4 ++-- svx/source/gallery2/gallery1.cxx | 2 +- sw/source/filter/ww8/rtfexport.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 4229f1b186b84ab36d97b723a6a1f81e79d40d82 Author: Michael Meeks <michael.me...@suse.com> Date: Thu Jan 19 17:08:47 2012 +0000 WaE: ongoing stream operator cleanup, persuade ints they are sal_Int32s diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 7da27aa..1f7606f 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1457,7 +1457,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() mpStrm->Seek( nOfs ); // Fill the VBAInfoAtom with the correct index to the persisttable *mpStrm << nPersistEntrys << n1 - << 2; + << sal_Int32(2); mpStrm->Seek( nOldPos ); } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 7949538..2e5102b 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -255,7 +255,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) << (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 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_uInt8)1 // bool1 varScale - Set if zoom to fit is set << (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 ); rOut << (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) << (sal_uInt32)4 - << nTextInstance; + << sal_Int32(nTextInstance); if ( mbEmptyPresObj ) mnTextSize = 0; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 64a94ab..0ac9fab 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -285,7 +285,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if( pTestStm ) { - *pTestStm << 1; + *pTestStm << sal_Int32(1); if( pTestStm->GetError() ) rbDirIsReadOnly = sal_True; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 8534f82..6a9679f 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -715,7 +715,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt ) if (((const SwTxtFmtColl*)pParent)->IsAssignedToListLevelOfOutlineStyle()) { // Level 9 disables the outline - Strm() << OOO_STRING_SVTOOLS_RTF_LEVEL << 9; + Strm() << OOO_STRING_SVTOOLS_RTF_LEVEL << sal_Int32(9); bRet = true; } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits