diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 08:50:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 09:52:42 +0000 |
| commit | 2d3203b2db5b44592e70e52c9927324b65a45e06 (patch) | |
| tree | a175859b1be2a2ee2ca598a6b8a9f34c25ea40f2 /vcl | |
| parent | 0100280a5c5b121fab2aa932092a7a887bbb507c (diff) | |
make ReadUniOrByteString return a string
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/font.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/metaact.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 059b1fe85320..a80c4c7e3bdc 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -780,8 +780,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) sal_Bool bTmp; sal_uInt8 nTmp8; - rIStm.ReadUniOrByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); - rIStm.ReadUniOrByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); + rImpl_Font.maFamilyName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); + rImpl_Font.maStyleName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); rIStm >> rImpl_Font.maSize; rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 74881f6fdc58..6589f504e5df 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnIndex; rIStm >> mnLen; @@ -1435,7 +1435,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) COMPAT( rIStm ); rIStm >> maStartPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnIndex; rIStm >> mnLen; rIStm >> nAryLen; @@ -1575,7 +1575,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnWidth; rIStm >> mnIndex; rIStm >> mnLen; @@ -1668,7 +1668,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maRect; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnStyle; if ( aCompat.GetVersion() >= 2 ) // Version 2 |