strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ditch ENABLE_BYTESTRING_STREAM_OPERATORS

Browse source
This commit is contained in:
Caolán McNamara 2011-11-16 23:15:14 +00:00
parent cee0d7a26a
commit 9d2807cc9d
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vcl/source/gdi/animate.cxx
View file

@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#define ENABLE_BYTESTRING_STREAM_OPERATORS
#include <vcl/animate.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
@ -836,7 +835,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
rOStm << nDummy32; // unbenutzt
rOStm << nDummy32; // unbenutzt
rOStm << nDummy32; // unbenutzt
rOStm << aDummyStr; // unbenutzt
rOStm.WriteByteString(aDummyStr); // unbenutzt
rOStm << nRest; // Anzahl der Strukturen, die noch _folgen_
}
}
@ -901,7 +900,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
rIStm >> nTmp32; // unbenutzt
rIStm >> nTmp32; // unbenutzt
rIStm >> nTmp32; // unbenutzt
rIStm >> aDummyStr; // unbenutzt
rIStm.ReadByteString(aDummyStr); // unbenutzt
rIStm >> nTmp16; // Rest zu lesen
rAnimation.Insert( aAnimBmp );

8
vcl/source/gdi/cvtsvm.cxx
View file

@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#define ENABLE_BYTESTRING_STREAM_OPERATORS
#include <algorithm>
#include <string.h>
#include <tools/stack.hxx>
@ -1326,7 +1324,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
sal_uInt8* pData;
sal_Int32 nFollowingActionCount;
rIStm >> aComment >> nValue >> nDataSize;
rIStm.ReadByteString(aComment);
rIStm >> nValue >> nDataSize;
if( nDataSize )
{
@ -2397,7 +2396,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm.SeekRel( 4 );
// write data
rOStm << pA->GetComment() << pA->GetValue() << nDataSize;
rOStm.WriteByteString(pA->GetComment());
rOStm << pA->GetValue() << nDataSize;
if( nDataSize )
rOStm.Write( pA->GetData(), nDataSize );

7
vcl/source/gdi/metaact.cxx
View file

@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#define ENABLE_BYTESTRING_STREAM_OPERATORS
#include <algorithm>
#include <string.h>
#include <tools/stream.hxx>
@ -4202,7 +4200,8 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const
void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
rOStm << maComment << mnValue << mnDataSize;
rOStm.WriteByteString(maComment);
rOStm << mnValue << mnDataSize;
if ( mnDataSize )
rOStm.Write( mpData, mnDataSize );
@ -4214,7 +4213,7 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
ByteString sTmp;
rIStm >> sTmp;
rIStm.ReadByteString(sTmp);
maComment = sTmp;
rIStm >> mnValue >> mnDataSize;

1
vcl/source/gdi/print.cxx
View file

@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#define ENABLE_BYTESTRING_STREAM_OPERATORS
#include <list>
#include <tools/debug.hxx>