diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/patattr.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/tool/autoform.cxx | 14 | ||||
-rw-r--r-- | sc/source/core/tool/ddelink.cxx | 12 | ||||
-rw-r--r-- | sc/source/core/tool/zforauto.cxx | 4 |
4 files changed, 16 insertions, 22 deletions
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 93adcfeea75e..fbd982db364a 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -172,7 +172,7 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ { short eFamDummy; pStr = new String; - rStream.ReadUniOrByteString( *pStr, rStream.GetStreamCharSet() ); + rStream.ReadByteString( *pStr, rStream.GetStreamCharSet() ); rStream >> eFamDummy; // wg. altem Dateiformat } else @@ -194,11 +194,11 @@ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) rStream << (sal_Bool)sal_True; if ( pStyle ) - rStream.WriteUniOrByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); + rStream.WriteByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); else if ( pName ) // wenn Style geloescht ist/war - rStream.WriteUniOrByteString( *pName, rStream.GetStreamCharSet() ); + rStream.WriteByteString( *pName, rStream.GetStreamCharSet() ); else - rStream.WriteUniOrByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), + rStream.WriteByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), rStream.GetStreamCharSet() ); rStream << (short)SFX_STYLE_FAMILY_PARA; // wg. altem Dateiformat diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 61b8355826f8..fa7836bc604a 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -797,14 +797,8 @@ sal_Bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersion (AUTOFORMAT_DATA_ID_504 <= nVer && nVer <= AUTOFORMAT_DATA_ID)) ) { // --- from 680/dr25 on: store strings as UTF-8 - if (nVer >= AUTOFORMAT_ID_680DR25) - { - aName = read_lenPrefixed_uInt8s_ToOUString(rStream, - RTL_TEXTENCODING_UTF8); - } - else - rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); - + CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); + rStream.ReadByteString( aName, eCharSet ); if( AUTOFORMAT_DATA_ID_552 <= nVer ) { rStream >> nStrResId; @@ -844,7 +838,7 @@ sal_Bool ScAutoFormatData::LoadOld( SvStream& rStream, const ScAfVersions& rVers bRet = (rStream.GetError() == 0); if (bRet && (nVal == AUTOFORMAT_OLD_DATA_ID)) { - rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); + rStream.ReadByteString( aName, rStream.GetStreamCharSet() ); sal_Bool b; rStream >> b; bIncludeFont = b; rStream >> b; bIncludeJustify = b; @@ -869,7 +863,7 @@ sal_Bool ScAutoFormatData::Save(SvStream& rStream) sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); + rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); rStream << nStrResId; rStream << ( b = bIncludeFont ); diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index ca956813697b..7fbb58b0ea4f 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -92,9 +92,9 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.ReadUniOrByteString( aAppl, eCharSet ); - rStream.ReadUniOrByteString( aTopic, eCharSet ); - rStream.ReadUniOrByteString( aItem, eCharSet ); + rStream.ReadByteString( aAppl, eCharSet ); + rStream.ReadByteString( aTopic, eCharSet ); + rStream.ReadByteString( aItem, eCharSet ); sal_Bool bHasValue; rStream >> bHasValue; @@ -114,9 +114,9 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.WriteUniOrByteString( aAppl, eCharSet ); - rStream.WriteUniOrByteString( aTopic, eCharSet ); - rStream.WriteUniOrByteString( aItem, eCharSet ); + rStream.WriteByteString( aAppl, eCharSet ); + rStream.WriteByteString( aTopic, eCharSet ); + rStream.WriteByteString( aItem, eCharSet ); sal_Bool bHasValue = ( pResult != NULL ); rStream << bHasValue; diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 048c981df3bf..4ebbee3551c0 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -61,7 +61,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat, void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) { sal_uInt16 nSysLang, nLang; - rStream.ReadUniOrByteString( sFormatstring, eByteStrSet ); + rStream.ReadByteString( sFormatstring, eByteStrSet ); rStream >> nSysLang >> nLang; eLnge = (LanguageType) nLang; eSysLnge = (LanguageType) nSysLang; @@ -71,7 +71,7 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) void ScNumFormatAbbrev::Save( SvStream& rStream, CharSet eByteStrSet ) const { - rStream.WriteUniOrByteString( sFormatstring, eByteStrSet ); + rStream.WriteByteString( sFormatstring, eByteStrSet ); rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge; } |