diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/config/uinums.cxx | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 4ecbd2abe185..1fdb6426b8e6 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -401,8 +401,8 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s sal_uInt16 eSys, eLge; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadUniOrByteString( sNumFmtString, eCharSet ) - >> eSys >> eLge; + sNumFmtString = rStream.ReadUniOrByteString( eCharSet ); + rStream >> eSys >> eLge; eSysLanguage = (LanguageType) eSys; eNumFmtLanguage = (LanguageType) eLge; if ( eSysLanguage == LANGUAGE_SYSTEM ) // von alten Versionen (Calc) @@ -780,7 +780,7 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions sal_Bool b; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVal >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadUniOrByteString( aName, eCharSet ); + aName = rStream.ReadUniOrByteString( eCharSet ); if( AUTOFORMAT_DATA_ID_552 <= nVal ) { rStream >> nStrResId; @@ -830,7 +830,7 @@ sal_Bool SwTableAutoFmt::LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ) if( bRet && ( AUTOFORMAT_OLD_DATA_ID == nVal )) { sal_Bool b; - rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); + aName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() ); rStream >> b; bInclFont = b; rStream >> b; bInclJustify = b; rStream >> b; bInclFrame = b; diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index c43a2f4ed99b..0079b1f2c2bb 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -235,7 +235,7 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion ) { CharSet eEncoding = osl_getThreadTextEncoding(); - rStream.ReadUniOrByteString(aName, eEncoding); + aName = rStream.ReadUniOrByteString(eEncoding); char c; for(sal_uInt16 n = 0; n < MAXLEVEL; ++n ) @@ -354,9 +354,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, long nL; rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar ); - rStream.ReadUniOrByteString(sStr, eEncoding); + sStr = rStream.ReadUniOrByteString(eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadUniOrByteString(sStr, eEncoding); + sStr = rStream.ReadUniOrByteString(eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nL; aFmt.SetLSpace( lNumIndent ); @@ -366,9 +366,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { short nShort; rStream >> nUS; aFmt.SetStart( nUS ); - rStream.ReadUniOrByteString(sStr, eEncoding); + sStr = rStream.ReadUniOrByteString(eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadUniOrByteString(sStr, eEncoding); + sStr = rStream.ReadUniOrByteString(eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nUS; aFmt.SetAbsLSpace( nUS ); @@ -385,7 +385,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, sal_uInt16 nPitch; String aName; - rStream.ReadUniOrByteString(aName, eEncoding); + aName = rStream.ReadUniOrByteString(eEncoding); rStream >> nFamily >> nCharSet >> nWidth >> nHeight >> nPitch; if( aName.Len() ) @@ -411,7 +411,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { sal_uInt16 nItemCount; rStream >> nCharPoolId; - rStream.ReadUniOrByteString(sCharFmtName, eEncoding); + sCharFmtName = rStream.ReadUniOrByteString(eEncoding); rStream >> nItemCount; while( nItemCount-- ) |