diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-16 23:15:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-17 23:04:11 +0000 |
| commit | 9d2807cc9df0a71fd367aaf44c8467cc4c72caca (patch) | |
| tree | 886d408c8011f94b3070e5f69430e2722fa7d04c /vcl | |
| parent | cee0d7a26a5098f6c39ac3ce634632a432402379 (diff) | |
ditch ENABLE_BYTESTRING_STREAM_OPERATORS
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/animate.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/gdi/cvtsvm.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/gdi/metaact.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/gdi/print.cxx | 1 |
4 files changed, 9 insertions, 12 deletions
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 9dcbce01ffaf..b4de8f90df42 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -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 ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index e3d027e29ad5..2fe6a96fdb04 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -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 ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 03c5390e6f36..5f86ff2cb2ac 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -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; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 7812032ac402..3dfe0412718e 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -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> |