[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Dec 21 02:31:40 PST 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 10 +-
binfilter/bf_basic/source/classes/image.cxx | 8 +-
binfilter/bf_basic/source/classes/sbxmod.cxx | 2
binfilter/bf_basic/source/sbx/sbxbase.cxx | 9 --
binfilter/bf_basic/source/sbx/sbxcoll.cxx | 3
binfilter/bf_basic/source/sbx/sbxobj.cxx | 12 +--
binfilter/bf_basic/source/sbx/sbxvalue.cxx | 12 +--
binfilter/bf_basic/source/sbx/sbxvar.cxx | 15 +--
binfilter/bf_sc/source/core/data/sc_cell.cxx | 2
binfilter/bf_sc/source/core/data/sc_cell2.cxx | 2
binfilter/bf_sc/source/core/data/sc_conditio.cxx | 6 -
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 4 -
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 18 ++--
binfilter/bf_sc/source/core/data/sc_dpsave.cxx | 4 -
binfilter/bf_sc/source/core/data/sc_global2.cxx | 2
binfilter/bf_sc/source/core/data/sc_patattr.cxx | 2
binfilter/bf_sc/source/core/data/sc_pivot.cxx | 6 -
binfilter/bf_sc/source/core/data/sc_table2.cxx | 16 ++--
binfilter/bf_sc/source/core/data/sc_validat.cxx | 8 +-
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 4 -
binfilter/bf_sc/source/core/tool/sc_chartarr.cxx | 2
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_chgviset.cxx | 4 -
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 2
binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx | 8 +-
binfilter/bf_sc/source/core/tool/sc_ddelink.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_rangenam.cxx | 4 -
binfilter/bf_sc/source/core/tool/sc_scmatrix.cxx | 2
binfilter/bf_sc/source/core/tool/sc_userlist.cxx | 2
binfilter/bf_sc/source/core/tool/sc_viewopti.cxx | 2
binfilter/bf_sc/source/core/tool/sc_zforauto.cxx | 2
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 4 -
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 44 +++++------
binfilter/bf_sch/source/core/sch_memchrt.cxx | 28 +++----
binfilter/bf_sd/source/core/sd_anminfo.cxx | 8 +-
binfilter/bf_sd/source/core/sd_cusshow.cxx | 4 -
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 4 -
binfilter/bf_sd/source/core/sd_sdpage2.cxx | 8 +-
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 2
binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx | 30 +++----
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 4 -
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 44 +++++------
binfilter/bf_sfx2/source/doc/timestamp.cxx | 2
binfilter/bf_so3/source/inplace/applet2.cxx | 9 --
binfilter/bf_so3/source/inplace/plugin.cxx | 12 +--
binfilter/bf_so3/source/persist/persist.cxx | 4 -
binfilter/bf_starmath/source/starmath_document.cxx | 38 ++++-----
binfilter/bf_starmath/source/starmath_utility.cxx | 14 ++-
binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx | 4 -
binfilter/bf_svtools/source/items/svt_style.cxx | 12 +--
binfilter/bf_svtools/source/items1/svt_bintitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_cntwall.cxx | 3
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 4 -
binfilter/bf_svtools/source/misc/svt_imap.cxx | 17 ++--
binfilter/bf_svtools/source/misc/svt_templatefoldercache.cxx | 2
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 5 -
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 11 +-
binfilter/bf_svx/source/form/svx_fmpage.cxx | 5 -
binfilter/bf_svx/source/items/svx_bulitem.cxx | 6 -
binfilter/bf_svx/source/items/svx_flditem.cxx | 19 ++--
binfilter/bf_svx/source/items/svx_frmitems.cxx | 4 -
binfilter/bf_svx/source/items/svx_numitem.cxx | 6 -
binfilter/bf_svx/source/items/svx_pageitem.cxx | 2
binfilter/bf_svx/source/items/svx_textitem.cxx | 8 +-
binfilter/bf_svx/source/outliner/svx_outlobj.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx | 8 +-
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 12 +--
binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 10 +-
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 6 -
binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx | 4 -
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx | 4 -
binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx | 8 +-
binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx | 6 -
binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx | 4 -
binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx | 4 -
binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx | 6 -
binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx | 4 -
binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx | 6 -
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 4 -
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 13 +--
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 5 -
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 5 -
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 8 +-
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 3
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 28 +++----
binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx | 3
binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx | 5 -
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 4 -
binfilter/inc/bf_sc/global.hxx | 12 +--
binfilter/inc/bf_svtools/ownlist.hxx | 8 +-
91 files changed, 368 insertions(+), 370 deletions(-)
New commits:
commit 532ad9dc3829559aea17f641a10bc425a3e8e00c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 10:30:48 2011 +0000
Revert "convert ReadByteString/WriteByteString from ByteString to OString"
This reverts commit f54bda5b576e8270ecdfbcf3c0d81aea2dbf792f.
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index ef50be7..8826b32 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -187,7 +187,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ {
/*N*/ if ( nLen>1 )
/*N*/ {
-/*N*/ rtl::OString aTemp = read_uInt8s_ToOString(rStream, nLen-1);
+/*N*/ rtl::OString aTemp = read_uInt8s_AsOString(rStream, nLen-1);
/*N*/ sal_uInt8 nTerminator = 0;
/*N*/ rStream >> nTerminator;
/*N*/ DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" );
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index 116de4a..4678057 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -538,6 +538,7 @@ BOOL SmDocShell::Load(SvStorage *pStor)
/*N*/ long lTime;
/*N*/ sal_uInt32 lDate;
/*N*/ String aBuffer;
+/*N*/ ByteString aByteStr;
/*N*/
/*N*/ *pSvStream >> lIdent >> lVersion;
/*N*/
@@ -553,11 +554,9 @@ BOOL SmDocShell::Load(SvStorage *pStor)
/*N*/ switch (cTag)
/*N*/ {
/*N*/ case 'T':
- {
- rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(*pSvStream);
-/*N*/ aText = ImportString( aByteStr );
-/*N*/ Parse();
- }
+/*N*/ pSvStream->ReadByteString( aByteStr );
+/*N*/ aText = ImportString( aByteStr );
+/*N*/ Parse();
/*N*/ break;
/*N*/
/*N*/ case 'D':
@@ -638,6 +637,7 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
sal_uInt32 lDate;
UINT32 lDataSize;
String aBuffer;
+ ByteString aByteStr;
*pSvStream >> lDataSize >> lIdent >> lVersion;
@@ -652,11 +652,9 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
switch (cTag)
{
case 'T':
- {
- rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(*pSvStream);
- aText = ImportString( aByteStr );
- Parse();
- }
+ pSvStream->ReadByteString( aByteStr );
+ aText = ImportString( aByteStr );
+ Parse();
break;
case 'D':
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx b/binfilter/bf_starmath/source/starmath_utility.cxx
index 0fd5993..68aa269 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -41,13 +41,14 @@ namespace binfilter {
/*N*/ SvStream& operator >> (SvStream& rStream, SmFace& rFont)
/*N*/ {
/*N*/ sal_uInt32 nData;
+/*N*/ ByteString aByteStr;
/*N*/
-/*N*/ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(rStream);
-/*N*/ rFont.SetName( ImportString( aByteStr ) );
+/*N*/ rStream.ReadByteString( aByteStr );
+/*N*/ rFont.SetName( ImportString( aByteStr ) );
/*N*/ rStream >> nData;
/*N*/ rFont.SetFamily((FontFamily)nData);
/*N*/ rStream >> nData;
-/*N*/ rFont.SetCharSet( GetSOLoadTextEncoding( (rtl_TextEncoding) nData ) );
+/*N*/ rFont.SetCharSet( GetSOLoadTextEncoding( (rtl_TextEncoding) nData ) );
/*N*/ rStream >> nData;
/*N*/ rFont.SetWeight((FontWeight)nData);
/*N*/ rStream >> nData;
@@ -60,13 +61,14 @@ namespace binfilter {
/*?*/ {
/*?*/ BOOL bData;
/*?*/ sal_uInt32 nData;
+/*?*/ ByteString aByteStr;
/*?*/
-/*?*/ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(rStream);
-/*?*/ rFont.SetName( ImportString( aByteStr ) );
+/*?*/ rStream.ReadByteString( aByteStr );
+/*?*/ rFont.SetName( ImportString( aByteStr ) );
/*?*/ rStream >> nData;
/*?*/ rFont.SetFamily((FontFamily)nData);
/*?*/ rStream >> nData;
-/*?*/ rFont.SetCharSet( GetSOLoadTextEncoding( (rtl_TextEncoding) nData ) );
+/*?*/ rFont.SetCharSet( GetSOLoadTextEncoding( (rtl_TextEncoding) nData ) );
/*?*/ rStream >> nData;
/*?*/ rFont.SetWeight((FontWeight)nData);
/*?*/ rStream >> bData;
diff --git a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
index 5f98494..cb89719 100644
--- a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
@@ -259,8 +259,8 @@ BOOL GIFReader::ReadExtension()
// Appl.-Extension hat Laenge 11
if ( cSize == 0x0b )
{
- rtl::OString aAppId = read_uInt8s_ToOString(rIStm, 8);
- rtl::OString aAppCode = read_uInt8s_ToOString(rIStm, 3);
+ rtl::OString aAppId = read_uInt8s_AsOString(rIStm, 8);
+ rtl::OString aAppCode = read_uInt8s_AsOString(rIStm, 3);
rIStm >> cSize;
// NetScape-Extension
diff --git a/binfilter/bf_svtools/source/items1/svt_cntwall.cxx b/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
index a943993..72ffac2 100644
--- a/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
@@ -77,7 +77,8 @@ CntWallpaperItem::CntWallpaperItem( USHORT which, SvStream& rStream, USHORT nVer
readUnicodeString(rStream, _aURL, false);
// "Read" SfxWallpaperItem's string member _aFilter.
- read_lenPrefixed_uInt8s_ToOString(rStream); //dummy
+ ByteString aDummy;
+ rStream.ReadByteString(aDummy);
}
}
diff --git a/binfilter/bf_svtools/source/misc/svt_imap.cxx b/binfilter/bf_svtools/source/misc/svt_imap.cxx
index 870460a..cbe608b 100644
--- a/binfilter/bf_svtools/source/misc/svt_imap.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imap.cxx
@@ -95,15 +95,16 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL )
{
IMapCompat* pCompat;
rtl_TextEncoding nTextEncoding;
+ ByteString aString;
// Typ und Version ueberlesen wir
rIStm.SeekRel( 2 );
rIStm >> nReadVersion;
rIStm >> nTextEncoding;
- aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
- aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
+ rIStm.ReadByteString( aString ); aURL = String( aString.GetBuffer(), nTextEncoding );
+ rIStm.ReadByteString( aString ); aAltText = String( aString.GetBuffer(), nTextEncoding );
rIStm >> bActive;
- aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
+ rIStm.ReadByteString( aString ); aTarget = String( aString.GetBuffer(), nTextEncoding );
// URL absolut machen
aURL = ::binfilter::SmartRel2Abs( INetURLObject(rBaseURL), aURL, ::binfilter::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS );
@@ -119,7 +120,7 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL )
// ab Version 5 kann ein Objektname vorhanden sein
if ( nReadVersion >= 0x0005 )
{
- aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
+ rIStm.ReadByteString( aString ); aName = String( aString.GetBuffer(), nTextEncoding );
}
}
@@ -966,6 +967,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& rB
void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
{
+ ByteString aString;
char cMagic[6];
USHORT nOldFormat = rIStm.GetNumberFormatInt();
UINT16 nCount;
@@ -983,11 +985,10 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
// Version ueberlesen wir
rIStm.SeekRel( 2 );
- aName = read_lenPrefixed_uInt8s_ToOUString(rIStm,
- osl_getThreadTextEncoding() );
- read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy
+ rIStm.ReadByteString( aString ); aName = String( aString, osl_getThreadTextEncoding() );
+ rIStm.ReadByteString( aString ); // Dummy
rIStm >> nCount;
- read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy
+ rIStm.ReadByteString( aString ); // Dummy
pCompat = new IMapCompat( rIStm, STREAM_READ );
diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index 5bad95f..2ae68bf 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -1440,7 +1440,8 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter,
void SvNumberformat::LoadString( SvStream& rStream, String& rStr )
{
CharSet eStream = rStream.GetStreamCharSet();
- ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream);
+ ByteString aStr;
+ rStream.ReadByteString( aStr );
sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream );
if ( aStr.Search( cStream ) == STRING_NOTFOUND )
{ // simple conversion to unicode
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index 21a7443..50705ba 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -541,7 +541,8 @@ void BinTextObject::CreateData( SvStream& rIStream )
ContentInfo* pC = CreateAndInsertContent();
// Der Text...
- ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream);
+ ByteString aByteString;
+ rIStream.ReadByteString( aByteString );
pC->GetText() = String( aByteString, eSrcEncoding );
// StyleName und Family...
diff --git a/binfilter/bf_svx/source/form/svx_fmpage.cxx b/binfilter/bf_svx/source/form/svx_fmpage.cxx
index 6f8b928..bd3aeeb 100644
--- a/binfilter/bf_svx/source/form/svx_fmpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpage.cxx
@@ -81,8 +81,9 @@ namespace binfilter {
/*N*/ SdrPage::ReadData( rHead, rIn );
/*N*/ {
/*N*/ SdrDownCompat aVCCompat2( rIn, STREAM_READ );
-/*N*/ aPageName = read_lenPrefixed_uInt8s_ToOUString(rIn,
-/*N*/ osl_getThreadTextEncoding());
+/*N*/ ByteString aByteStringName;
+/*N*/ rIn.ReadByteString(aByteStringName);
+/*N*/ aPageName = String(aByteStringName, osl_getThreadTextEncoding());
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index 543fb34..5660a1b 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -262,12 +262,15 @@ namespace binfilter {
/*N*/
/*N*/ rStm >> nFormat;
/*N*/
+/*N*/ // UNICODE: rStm >> aTmpURL;
/*N*/ rStm.ReadByteString(aTmpURL);
/*N*/
+/*N*/ // UNICODE: rStm >> aRepresentation;
/*N*/ // read to a temp string first, read text encoding and
/*N*/ // convert later to stay compatible to fileformat
+/*N*/ ByteString aTempString;
/*N*/ rtl_TextEncoding aTempEncoding = RTL_TEXTENCODING_MS_1252; // #101493# Init for old documents
-/*N*/ rtl::OString aTempString = read_lenPrefixed_uInt8s_ToOString(rStm);
+/*N*/ rStm.ReadByteString(aTempString);
/*N*/
/*N*/ rStm >> nFrameMarker;
/*N*/ if ( nFrameMarker == FRAME_MARKER )
@@ -291,7 +294,7 @@ namespace binfilter {
/*?*/ rStm.SeekRel( -nUlongSize );
/*N*/
/*N*/ // now build representation string due to known encoding
-/*N*/ aRepresentation = rtl::OStringToOUString(aTempString, aTempEncoding);
+/*N*/ aRepresentation = String(aTempString, aTempEncoding);
/*N*/
/*N*/ eFormat= (SvxURLFormat)nFormat;
/*N*/
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index 91530f4..1eacbce 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
@@ -710,8 +710,9 @@ SfxPoolItem* SwGammaGrf::Create(SvStream & rStrm, USHORT ) const
/*N*/ if( 0 == nIVer )
/*N*/ {
/*N*/ sal_Char* dummy;
-/*N*/ rtl::OString sValue = read_lenPrefixed_uInt8s_ToOString(rStrm);
-/*N*/ dVal = strtod( sValue.getStr(), &dummy );
+/*N*/ ByteString sValue;
+/*N*/ rStrm.ReadByteString( sValue );
+/*N*/ dVal = strtod( sValue.GetBuffer(), &dummy );
/*N*/ }
/*N*/ else
/*N*/ rStrm >> dVal;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 9e0443c..414a80d 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -460,8 +460,9 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ ByteString s8 = read_lenPrefixed_uInt8s_ToOString(*rIo.pStrm);
-/*N*/ sal_Char cSrch = rIo.nVersion < SWG_DDESEP ? ' ' : ::binfilter::cTokenSeperator;
+/*N*/ ByteString s8;
+/*N*/ rIo.pStrm->ReadByteString( s8 );
+/*N*/ sal_Char cSrch = rIo.nVersion < SWG_DDESEP ? ' ' : ::binfilter::cTokenSeperator;
/*N*/
/*N*/ {
/*N*/ // die ersten beiden Blanks gegen den neuen Trenner austauschen
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index bbf3492..6548a85 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1426,8 +1426,9 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ while( n-- )
/*N*/ {
/*N*/ sal_uInt16 nId;
+/*N*/ ByteString s8;
/*N*/ r >> nId;
-/*N*/ rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString(r);
+/*N*/ r.ReadByteString( s8 );
/*N*/ if( nId == IDX_NOCONV_FF )
/*N*/ s = Sw3IoImp::ConvertStringNoDbDelim( s8, eSrcEnc );
/*N*/ else
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index de10946..3bb9081 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -473,11 +473,12 @@ void Sw3IoImp::InPasswd()
if( nVersion >= SWG_CRYPT )
{
sal_uInt8 cType;
+ ByteString aPasswd;
*pStrm >> cType;
// TODO: unicode: It seems that we had a bug here, because the
// password was converted from the source to the system encoding
// before it was decrypted. We now decrypt it first.
- /*rtl::OString aPasswd =*/ read_lenPrefixed_uInt8s_ToOString(*pStrm);
+ pStrm->ReadByteString( aPasswd );
/*
// Datum und Uhrzeit als Passwort fuers Passwort nehmen
sal_Char buf[ 17 ];
@@ -1296,13 +1297,14 @@ extern void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, sal_uInt16 nStrId,
/*N*/ void Sw3IoImp::InDBName()
/*N*/ {
+/*N*/ ByteString sStr8;
/*N*/ String sStr, sSQL;
/*N*/ SwDBData aData3;
/*N*/ OpenRec( SWG_DBNAME );
/*N*/
/*N*/ // MIB 9.4.97: Die Datenbanknamen koennen 0xff enthalten und muessen
/*N*/ // deshalb von Hand konvertiert werden.
-/*N*/ rtl::OString sStr8 = read_lenPrefixed_uInt8s_ToOString(*pStrm);
+/*N*/ pStrm->ReadByteString( sStr8 );
/*N*/ sStr = ConvertStringNoDbDelim( sStr8, eSrcSet );
/*N*/ aData3.sDataSource = sStr.GetToken(0, DB_DELIM);
/*N*/ aData3.sCommand = sStr.GetToken(1, DB_DELIM);
@@ -1356,7 +1358,7 @@ extern void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, sal_uInt16 nStrId,
/*N*/ SwNewDBMgr& rDBMgr = *pDoc->GetNewDBMgr();
/*N*/ for( sal_uInt16 i = 0; i < nCount; i++ )
/*N*/ {
-/*N*/ sStr8 = read_lenPrefixed_uInt8s_ToOString(*pStrm);
+/*N*/ pStrm->ReadByteString( sStr8 );
/*N*/ *pStrm >> nSelStart
/*N*/ >> nSelEnd;
/*N*/ sDBName = ConvertStringNoDbDelim( sStr8, eSrcSet );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 0219978..3a3b547 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -677,7 +677,8 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*?*/ pColl = pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
/*N*/
/*N*/ // Der Text des Nodes darf nicht einfach so konvertiert werden!
-/*N*/ rtl::OString aText8 = read_lenPrefixed_uInt8s_ToOString(*pStrm);
+/*N*/ ByteString aText8;
+/*N*/ pStrm->ReadByteString( aText8 );
/*N*/ if( pCrypter )
{
rtl::OStringBuffer aBuffer(aText8);
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
index 4d66e40..12ab3c8 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
@@ -254,9 +254,10 @@ void Sw3IoImp::SetDBName()
case SWG_DBNAME:
{
String sDBName;
+ ByteString s8;
OpenRec( SWG_DBNAME );
- rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString(*pStrm);
+ pStrm->ReadByteString( s8 );
rtl_TextEncoding eEnc = GetSOLoadTextEncoding(
(rtl_TextEncoding)cSet, pStrm->GetVersion() );
sDBName = ConvertStringNoDbDelim( s8, eEnc );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
index 9fbf330..4170224 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
@@ -413,9 +413,10 @@ namespace binfilter {
/*N*/ if( nVersion >= SWG_FLYWRAPCHGD )
/*N*/ {
/*N*/ String aLinkFileName;
+/*N*/ ByteString s8;
/*N*/
-/*N*/ rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString(*pStrm);
-/*N*/ aLinkFileName = ConvertStringNoDelim( s8, '\xff', ::binfilter::cTokenSeperator,
+/*N*/ pStrm->ReadByteString( s8 );
+/*N*/ aLinkFileName = ConvertStringNoDelim( s8, '\xff', ::binfilter::cTokenSeperator,
/*N*/ eSrcSet );
/*N*/
/*N*/ if( aLinkFileName.Len() && FILE_LINK_SECTION == nType )
commit 003ec7ed90702ce13c5e105fbe8abd87ab68dc7d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 10:30:37 2011 +0000
Revert "disentangle Read/WriteByteString OUString variants"
This reverts commit 7b7ea8bac8dd3b9178e214306cab44b0392096f3.
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 3ff8ba1..1bdd895 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -610,17 +610,17 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
// Den Namen der Lib...
String aName;
- rSStream.ReadUniOrByteString(aName, rSStream.GetStreamCharSet());
+ rSStream.ReadByteString(aName);
pInfo->SetLibName( aName );
// Absoluter Pfad....
String aStorageName;
- rSStream.ReadUniOrByteString(aStorageName, rSStream.GetStreamCharSet());
+ rSStream.ReadByteString(aStorageName);
pInfo->SetStorageName( aStorageName );
// Relativer Pfad...
String aRelStorageName;
- rSStream.ReadUniOrByteString(aRelStorageName, rSStream.GetStreamCharSet());
+ rSStream.ReadByteString(aRelStorageName);
pInfo->SetRelStorageName( aRelStorageName );
if ( nVer >= 2 )
@@ -1040,7 +1040,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
}
xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 als Trenner
String aLibs;
- xManagerStream->ReadUniOrByteString(aLibs, xManagerStream->GetStreamCharSet());
+ xManagerStream->ReadByteString(aLibs);
xManagerStream->SetBufferSize( 0 );
xManagerStream.Clear(); // Sream schliessen
@@ -1223,7 +1223,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() )
{
String aPassword;
- xBasicStream->ReadUniOrByteString(aPassword, xBasicStream->GetStreamCharSet());
+ xBasicStream->ReadByteString(aPassword);
pLibInfo->SetPassword( aPassword );
}
xBasicStream->SetCryptMaskKey(rtl::OString());
diff --git a/binfilter/bf_basic/source/classes/image.cxx b/binfilter/bf_basic/source/classes/image.cxx
index 776e4bd..c713451 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -128,15 +128,15 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
switch( nSign )
{
case B_NAME:
- r.ReadUniOrByteString( aName, eCharSet );
+ r.ReadByteString( aName, eCharSet );
break;
case B_COMMENT:
- r.ReadUniOrByteString( aComment, eCharSet );
+ r.ReadByteString( aComment, eCharSet );
break;
case B_SOURCE:
{
String aTmp;
- r.ReadUniOrByteString( aTmp, eCharSet );
+ r.ReadByteString( aTmp, eCharSet );
aOUSource = aTmp;
break;
}
@@ -145,7 +145,7 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
for( UINT16 j = 0 ; j < nCount ; j++ )
{
String aTmp;
- r.ReadUniOrByteString( aTmp, eCharSet );
+ r.ReadByteString( aTmp, eCharSet );
aOUSource += aTmp;
}
break;
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index d64d352..e664330 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -608,7 +608,7 @@ BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
// Source-String holen
String aTmp;
- rStrm.ReadUniOrByteString( aTmp, osl_getThreadTextEncoding() );
+ rStrm.ReadByteString( aTmp, osl_getThreadTextEncoding() );
aOUSource = aTmp;
return TRUE;
}
diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index 9a3a9bc..2a380c1 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -340,18 +340,15 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
{
aParams.Remove( 0, aParams.Count() );
UINT16 nParam;
- aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
- aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US );
+ rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
rStrm >> nHelpId >> nParam;
while( nParam-- )
{
XubString aName;
UINT16 nType, nFlags;
UINT32 nUserData = 0;
- aName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US );
rStrm >> nType >> nFlags;
if( nVer > 1 )
rStrm >> nUserData;
diff --git a/binfilter/bf_basic/source/sbx/sbxcoll.cxx b/binfilter/bf_basic/source/sbx/sbxcoll.cxx
index fb170a4..37cafe1 100644
--- a/binfilter/bf_basic/source/sbx/sbxcoll.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxcoll.cxx
@@ -281,8 +281,7 @@ BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
BOOL bRes = SbxCollection::LoadData( rStrm, nVer );
if( bRes )
{
- aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
rStrm >> bAddRemoveOk;
}
return bRes;
diff --git a/binfilter/bf_basic/source/sbx/sbxobj.cxx b/binfilter/bf_basic/source/sbx/sbxobj.cxx
index 1010374..fad14c3 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -584,10 +584,8 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
aData.pObj = this;
sal_uInt32 nSize;
XubString aDfltProp;
- aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
- aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
+ rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
ULONG nPos = rStrm.Tell();
rStrm >> nSize;
if( !LoadPrivateData( rStrm, nVer ) )
@@ -765,8 +763,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
aLine += aAttrs2;
if( !pVar->IsA( TYPE(SbxMethod) ) )
aLine.AppendAscii( " !! Not a Method !!" );
- write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US );
// bei Object-Methods auch das Object ausgeben
if ( pVar->GetValues_Impl().eType == SbxOBJECT &&
@@ -799,8 +796,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
aLine += aAttrs3;
if( !pVar->IsA( TYPE(SbxProperty) ) )
aLine.AppendAscii( " !! Not a Property !!" );
- write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US );
// bei Object-Properties auch das Object ausgeben
if ( pVar->GetValues_Impl().eType == SbxOBJECT &&
diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
index b7143bd..7982762 100644
--- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
@@ -1463,8 +1463,8 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
case SbxSINGLE:
{
// Floats als ASCII
- XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
- RTL_TEXTENCODING_ASCII_US);
+ XubString aVal;
+ r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
double d;
SbxDataType t;
if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
@@ -1479,8 +1479,8 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
case SbxDOUBLE:
{
// Floats als ASCII
- XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
- RTL_TEXTENCODING_ASCII_US);
+ XubString aVal;
+ r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
SbxDataType t;
if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK )
{
@@ -1502,8 +1502,8 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
}
case SbxSTRING:
{
- XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
- RTL_TEXTENCODING_ASCII_US);
+ XubString aVal;
+ r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
if( aVal.Len() )
aData.pString = new XubString( aVal );
else
diff --git a/binfilter/bf_basic/source/sbx/sbxvar.cxx b/binfilter/bf_basic/source/sbx/sbxvar.cxx
index bf02380..a8526d1 100644
--- a/binfilter/bf_basic/source/sbx/sbxvar.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvar.cxx
@@ -325,16 +325,14 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
{
if( !SbxValue::LoadData( rStrm, nVer ) )
return FALSE;
- maName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
rStrm >> nUserData;
}
else
{
rStrm.SeekRel( -1L );
rStrm >> nType;
- maName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
rStrm >> nUserData;
// Korrektur: Alte Methoden haben statt SbxNULL jetzt SbxEMPTY
if( nType == SbxNULL && GetClass() == SbxCLASS_METHOD )
@@ -354,8 +352,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
case SbxSINGLE:
{
// Floats als ASCII
- aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
double d;
SbxDataType t;
if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
@@ -370,8 +367,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
case SbxDOUBLE:
{
// Floats als ASCII
- aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
SbxDataType t;
if( ImpScan( aVal, aTmp.nDouble, t, NULL ) != SbxERR_OK )
{
@@ -381,8 +377,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
break;
}
case SbxSTRING:
- aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
- RTL_TEXTENCODING_ASCII_US);
+ rStrm.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
break;
case SbxEMPTY:
case SbxNULL:
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 678e46d..3bf2d93 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -735,7 +735,7 @@ static const sal_Char msgDbgInfinity[] =
/*N*/ rStream >> nErgValue;
/*N*/ if( cFlags & 0x10 )
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aErgString, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aErgString, rStream.GetStreamCharSet() );
/*N*/ bIsValue = FALSE;
/*N*/ }
/*N*/ pCode->Load( rStream, nVer, aPos );
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index e9a8d16..e64cd28 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -784,7 +784,7 @@ void ScFormulaCell::UpdateCompile( BOOL )
/*N*/ if( cData & 0x0F )
/*?*/ rStream.SeekRel( cData & 0x0F );
/*N*/ }
-/*N*/ rStream.ReadUniOrByteString( aString, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aString, rStream.GetStreamCharSet() );
/*N*/ }
/*N*/ void ScStringCell::ConvertFont( FontToSubsFontConverter hConv )
diff --git a/binfilter/bf_sc/source/core/data/sc_conditio.cxx b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
index d1a13b8..4d74892 100644
--- a/binfilter/bf_sc/source/core/data/sc_conditio.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_conditio.cxx
@@ -221,7 +221,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*?*/ bIsStr1 = TRUE;
-/*?*/ rStream.ReadUniOrByteString( aStrVal1, rStream.GetStreamCharSet() );
+/*?*/ rStream.ReadByteString( aStrVal1, rStream.GetStreamCharSet() );
/*N*/ }
/*N*/
/*N*/ if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN )
@@ -240,7 +240,7 @@ namespace binfilter {
/*?*/ else
/*?*/ {
/*?*/ bIsStr2 = TRUE;
-/*?*/ rStream.ReadUniOrByteString( aStrVal2, rStream.GetStreamCharSet() );
+/*?*/ rStream.ReadByteString( aStrVal2, rStream.GetStreamCharSet() );
/*?*/ }
/*N*/ }
/*N*/
@@ -873,7 +873,7 @@ namespace binfilter {
/*N*/ // im Datei-Header sind getrennte Eintraege fuer ScConditionEntry und ScCondFormatEntry
/*N*/
/*N*/ rHdr.StartEntry();
-/*N*/ rStream.ReadUniOrByteString( aStyleName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aStyleName, rStream.GetStreamCharSet() );
/*N*/ rHdr.EndEntry();
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index d51f10a..e02d649 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -534,10 +534,10 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
/*N*/ ScReadHeader aFlagsHdr( rStream );
/*N*/
/*N*/ rStream >> nVersion; // 312 abwaerts
-/*N*/ rStream.ReadUniOrByteString( aPageStyle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aPageStyle, rStream.GetStreamCharSet() );
/*N*/ rStream >> bProtected; // Dokument geschuetzt
/*N*/ String aPass;
-/*N*/ rStream.ReadUniOrByteString( aPass, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aPass, rStream.GetStreamCharSet() );
/*N*/ if (aPass.Len())
/*?*/ SvPasswordHelper::GetHashPassword(aProtectPass, aPass);
/*N*/ if ( aFlagsHdr.BytesLeft() )
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index 656198f..5de448a 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -496,8 +496,8 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ case SC_DP_SOURCE_DATABASE:
/*N*/ pImpDesc = new ScImportSourceDesc;
-/*N*/ rStream.ReadUniOrByteString( pImpDesc->aDBName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImpDesc->aObject, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( pImpDesc->aDBName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( pImpDesc->aObject, rStream.GetStreamCharSet() );
/*N*/ rStream >> pImpDesc->nType; // USHORT
/*N*/ rStream >> pImpDesc->bNative;
/*N*/ break;
@@ -511,11 +511,11 @@ using namespace ::com::sun::star;
/*N*/ case SC_DP_SOURCE_SERVICE:
/*N*/ {
/*N*/ String aServiceName, aParSource, aParName, aParUser, aParPass;
-/*N*/ rStream.ReadUniOrByteString( aServiceName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aParSource, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aParName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aParUser, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aParPass, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aServiceName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aParSource, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aParName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aParUser, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aParPass, rStream.GetStreamCharSet() );
/*N*/ pServDesc = new ScDPServiceDesc( aServiceName,
/*N*/ aParSource, aParName, aParUser, aParPass );
/*N*/ }
@@ -532,8 +532,8 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if (rHdr.BytesLeft()) // additional data starting from 561b
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aTableName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aTableTag, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aTableName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aTableTag, rStream.GetStreamCharSet() );
/*N*/ }
/*N*/
/*N*/ rHdr.EndEntry();
diff --git a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
index bbce757..29480db 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
@@ -110,7 +110,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ ScDPSaveMember::ScDPSaveMember(SvStream& rStream)
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
/*N*/ rStream >> nVisibleMode;
/*N*/ rStream >> nShowDetailsMode;
/*N*/
@@ -215,7 +215,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ long i;
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
/*N*/ rStream >> bIsDataLayout;
/*N*/
/*N*/ rStream >> bDupFlag;
diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx b/binfilter/bf_sc/source/core/data/sc_global2.cxx
index 1a658a9..5ebe7a0 100644
--- a/binfilter/bf_sc/source/core/data/sc_global2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx
@@ -210,7 +210,7 @@ namespace binfilter {
/*N*/ >> cConnect
/*N*/ >> nField
/*N*/ >> nVal;
-/*N*/ rStream.ReadUniOrByteString( *pStr, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( *pStr, rStream.GetStreamCharSet() );
/*N*/ eOp = (ScQueryOp) cOp;
/*N*/ eConnect = (ScQueryConnect) cConnect;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_patattr.cxx b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
index 2bcad47..1d6c3ca 100644
--- a/binfilter/bf_sc/source/core/data/sc_patattr.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_patattr.cxx
@@ -151,7 +151,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ if ( bHasStyle )
/*N*/ {
/*N*/ pStr = new String;
-/*N*/ rStream.ReadUniOrByteString( *pStr, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( *pStr, rStream.GetStreamCharSet() );
/*N*/ rStream >> eFamDummy; // wg. altem Dateiformat
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sc/source/core/data/sc_pivot.cxx b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
index 3042911..7917a8d 100644
--- a/binfilter/bf_sc/source/core/data/sc_pivot.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
@@ -364,8 +364,8 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/
/*N*/ if (rHdr.BytesLeft()) // ab 500a
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aTag, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aTag, rStream.GetStreamCharSet() );
/*N*/
/*N*/ DBG_ASSERT(!pColNames, "Spaltennamen schon gesetzt?");
/*N*/ rStream >> nColNameCount;
@@ -373,7 +373,7 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
/*N*/ {
/*N*/ pColNames = new String[nColNameCount];
/*N*/ for (USHORT nCol=0; nCol<nColNameCount; nCol++)
-/*N*/ rStream.ReadUniOrByteString( pColNames[nCol], rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( pColNames[nCol], rStream.GetStreamCharSet() );
/*N*/ }
/*N*/ }
/*N*/ // sonst wird hinterher aus ScPivotCollection::Load ein Name vergeben
diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx
index 46f96cb..32f0716 100644
--- a/binfilter/bf_sc/source/core/data/sc_table2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx
@@ -1509,14 +1509,14 @@ BOOL ScTable::IsSelectionEditable(
/*N*/ {
/*N*/ ScReadHeader aFlagsHdr( rStream );
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
/*N*/
/*N*/ rStream >> bScenario;
-/*N*/ rStream.ReadUniOrByteString( aComment, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aComment, rStream.GetStreamCharSet() );
/*N*/
/*N*/ rStream >> bProtected;
/*N*/ String aPass;
-/*N*/ rStream.ReadUniOrByteString( aPass, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aPass, rStream.GetStreamCharSet() );
/*N*/ if (aPass.Len())
/*N*/ SvPasswordHelper::GetHashPassword(aProtectPass, aPass);
/*N*/
@@ -1533,7 +1533,7 @@ BOOL ScTable::IsSelectionEditable(
/*N*/ SfxStyleSheetBasePool* pStylePool =
/*N*/ pDocument->GetStyleSheetPool();
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aPageStyle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aPageStyle, rStream.GetStreamCharSet() );
/*N*/
/*N*/ if ( !pStylePool->Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ) )
/*N*/ {
@@ -1601,10 +1601,10 @@ BOOL ScTable::IsSelectionEditable(
/*N*/ ScReadHeader aLinkHdr( rStream );
/*N*/
/*N*/ rStream >> nLinkMode;
-/*N*/ rStream.ReadUniOrByteString( aLinkDoc, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aLinkDoc, rStream.GetStreamCharSet() );
/*N*/ aLinkDoc = ::binfilter::StaticBaseUrl::RelToAbs( aLinkDoc );
-/*N*/ rStream.ReadUniOrByteString( aLinkFlt, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aLinkTab, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aLinkFlt, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aLinkTab, rStream.GetStreamCharSet() );
/*N*/
/*N*/ BOOL bRelURL;
/*N*/ if ( aLinkHdr.BytesLeft() )
@@ -1616,7 +1616,7 @@ BOOL ScTable::IsSelectionEditable(
/*N*/ aName = ScGlobal::GetDocTabName( aLinkDoc, aLinkTab );
/*N*/
/*N*/ if ( aLinkHdr.BytesLeft() ) // ab 336 auch Filter-Optionen
-/*N*/ rStream.ReadUniOrByteString( aLinkOpt, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aLinkOpt, rStream.GetStreamCharSet() );
/*N*/ }
/*N*/ break;
/*N*/ default:
diff --git a/binfilter/bf_sc/source/core/data/sc_validat.cxx b/binfilter/bf_sc/source/core/data/sc_validat.cxx
index af026a1..5bbd926 100644
--- a/binfilter/bf_sc/source/core/data/sc_validat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_validat.cxx
@@ -118,11 +118,11 @@ namespace binfilter {
/*N*/ rStream >> nDummy;
/*N*/ eDataMode = (ScValidationMode) nDummy;
/*N*/ rStream >> bShowInput;
-/*N*/ rStream.ReadUniOrByteString( aInputTitle, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aInputMessage, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aInputTitle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aInputMessage, rStream.GetStreamCharSet() );
/*N*/ rStream >> bShowError;
-/*N*/ rStream.ReadUniOrByteString( aErrorTitle, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aErrorMessage, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aErrorTitle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aErrorMessage, rStream.GetStreamCharSet() );
/*N*/ rStream >> nDummy;
/*N*/ eErrorStyle = (ScValidErrorStyle) nDummy;
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index 88044e8..9e5be8f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -451,7 +451,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ CharSet eSrcSet = rStream.GetStreamCharSet();
/*N*/
/*N*/ BOOL b;
-/*N*/ rStream.ReadUniOrByteString( aName, eSrcSet );
+/*N*/ rStream.ReadByteString( aName, eSrcSet );
/*N*/ if( AUTOFORMAT_DATA_ID_552 <= nVer )
/*N*/ {
/*N*/ rStream >> nStrResId;
@@ -490,7 +490,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ bRet = (rStream.GetError() == 0);
/*N*/ if (bRet && (nVal == AUTOFORMAT_OLD_DATA_ID))
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
/*N*/ BOOL b;
/*N*/ rStream >> b; bIncludeFont = b;
/*N*/ rStream >> b; bIncludeJustify = b;
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
index 00c9b46..5fd5b72 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
@@ -118,7 +118,7 @@ namespace binfilter {
/*N*/ rStream >> nStartRow;
/*N*/ rStream >> nCol2;
/*N*/ rStream >> nRow2;
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
/*N*/ rStream >> bColHeaders;
/*N*/ rStream >> bRowHeaders;
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index 0477aa3..6c01c7e 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -149,7 +149,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ rStrm >> n32; nAction = n32;
/*N*/ rStrm >> n32; nRejectAction = n32;
/*N*/ rStrm >> n16; eState = (ScChangeActionState) n16;
-/*N*/ rStrm.ReadUniOrByteString( aComment, rStrm.GetStreamCharSet() );
+/*N*/ rStrm.ReadByteString( aComment, rStrm.GetStreamCharSet() );
/*N*/ // LinkEntries in zweiter Runde
/*N*/ }
@@ -1353,8 +1353,8 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ ppPrevInSlot( NULL )
/*N*/ {
/*N*/ UINT32 n32; // Changetracking.sdc
-/*N*/ rStrm.ReadUniOrByteString( aOldValue, rStrm.GetStreamCharSet() );
-/*N*/ rStrm.ReadUniOrByteString( aNewValue, rStrm.GetStreamCharSet() );
+/*N*/ rStrm.ReadByteString( aOldValue, rStrm.GetStreamCharSet() );
+/*N*/ rStrm.ReadByteString( aNewValue, rStrm.GetStreamCharSet() );
/*N*/ rStrm >> n32; pNextContent = (ScChangeActionContent*)(ULONG) n32;
/*N*/ rStrm >> n32; pPrevContent = (ScChangeActionContent*)(ULONG) n32;
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgviset.cxx b/binfilter/bf_sc/source/core/tool/sc_chgviset.cxx
index 97c4a9f..01ecccf 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgviset.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgviset.cxx
@@ -99,7 +99,7 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting
/*N*/ rStream >> nDT; aLastDateTime.SetTime( nDT );
/*N*/ rStream >> bIsAuthor;
/*N*/ rStream >> bEveryoneButMe;
-/*N*/ rStream.ReadUniOrByteString( aAuthorToShow, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aAuthorToShow, rStream.GetStreamCharSet() );
/*N*/ rStream >> bIsRange;
/*N*/ aRangeList.Load( rStream, nVer );
/*N*/ if ( aHdr.BytesLeft() )
@@ -117,7 +117,7 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting
/*N*/ if ( aHdr.BytesLeft() ) //#59103#
/*N*/ {
/*N*/ rStream >> bIsComment;
-/*N*/ rStream.ReadUniOrByteString( aComment, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aComment, rStream.GetStreamCharSet() );
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
index e9143cf..94b47bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
@@ -287,7 +287,7 @@ namespace binfilter {
/*N*/ rtl_TextEncoding eSet = rStream.GetStreamCharSet();
/*N*/ for ( USHORT i=0; i<nCount; i++ )
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aStr, eSet );
+/*N*/ rStream.ReadByteString( aStr, eSet );
/*N*/ pItems[i] = new StrData( aStr );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
index 42ab4bd..5290b58 100644
--- a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
@@ -110,7 +110,7 @@ namespace binfilter {
/*N*/ BYTE nDummy;
/*N*/ rtl_TextEncoding eCharSet = rStream.GetStreamCharSet();
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aName, eCharSet );
+/*N*/ rStream.ReadByteString( aName, eCharSet );
/*N*/ rStream >> nTable;
/*N*/ rStream >> nStartCol;
/*N*/ rStream >> nStartRow;
@@ -141,8 +141,8 @@ namespace binfilter {
/*N*/ rStream >> bSubUserDef;
/*N*/ rStream >> bDBImport;
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aDBName, eCharSet );
-/*N*/ rStream.ReadUniOrByteString( aDBStatement, eCharSet );
+/*N*/ rStream.ReadByteString( aDBName, eCharSet );
+/*N*/ rStream.ReadByteString( aDBStatement, eCharSet );
/*N*/ rStream >> bDBNative;
/*N*/
/*N*/ for (i=0; i<MAXSORT; i++)
@@ -158,7 +158,7 @@ namespace binfilter {
/*N*/ rStream >> nDummy; eQueryOp[i] = (ScQueryOp) nDummy;
/*N*/ rStream >> bQueryByString[i];
/*N*/ pQueryStr[i] = new String;
-/*N*/ rStream.ReadUniOrByteString( *pQueryStr[i], eCharSet );
+/*N*/ rStream.ReadByteString( *pQueryStr[i], eCharSet );
/*N*/ rStream >> nQueryVal[i];
/*N*/ rStream >> nDummy; eQueryConnect[i] = (ScQueryConnect) nDummy;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
index 3073b19..54190ef 100644
--- a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
@@ -83,9 +83,9 @@ namespace binfilter {
/*N*/ rHdr.StartEntry();
/*N*/
/*N*/ rtl_TextEncoding eCharSet = rStream.GetStreamCharSet();
-/*N*/ rStream.ReadUniOrByteString( aAppl, eCharSet );
-/*N*/ rStream.ReadUniOrByteString( aTopic, eCharSet );
-/*N*/ rStream.ReadUniOrByteString( aItem, eCharSet );
+/*N*/ rStream.ReadByteString( aAppl, eCharSet );
+/*N*/ rStream.ReadByteString( aTopic, eCharSet );
+/*N*/ rStream.ReadByteString( aItem, eCharSet );
/*N*/
/*N*/ BOOL bHasValue;
/*N*/ rStream >> bHasValue;
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
index b3733df..04adbd6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
@@ -125,7 +125,7 @@ namespace binfilter {
/*N*/ {
/*N*/ UINT32 nPos;
/*N*/ BYTE nData;
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
/*N*/ rStream >> nPos >> eType >> nIndex >> nData;
/*N*/ if( nData & 0x0F )
/*?*/ rStream.SeekRel( nData & 0x0F );
@@ -135,7 +135,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ UINT16 nTokLen, r, c, t;
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
/*N*/ rStream >> c >> r >> t >> eType >> nIndex >> nTokLen;
/*N*/ aPos.Set( c, r, t );
/*N*/ if( nTokLen )
diff --git a/binfilter/bf_sc/source/core/tool/sc_scmatrix.cxx b/binfilter/bf_sc/source/core/tool/sc_scmatrix.cxx
index 9ad4162..900902d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_scmatrix.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_scmatrix.cxx
@@ -107,7 +107,7 @@ namespace binfilter {
/*N*/ // For unknown types read and forget string (upwards compatibility)
/*N*/
/*N*/ if ( nType != CELLTYPE_NONE )
-/*N*/ rStream.ReadUniOrByteString( aMatStr, eCharSet );
+/*N*/ rStream.ReadByteString( aMatStr, eCharSet );
/*N*/
/*N*/ if ( i < nCount )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
index a66c77f..b61f1db 100644
--- a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
@@ -84,7 +84,7 @@ namespace binfilter {
/*N*/ ScUserListData::ScUserListData( SvStream& rStream )
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aStr, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aStr, rStream.GetStreamCharSet() );
/*N*/ InitTokens();
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
index f93f336..52483aa 100644
--- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
@@ -269,7 +269,7 @@ using ::rtl::OUString;
/*N*/ rStream >> n, rOpt.aModeArr[i] = (ScVObjMode)n;
/*N*/
/*N*/ rStream >> rOpt.aGridCol;
-/*N*/ rStream.ReadUniOrByteString( rOpt.aGridColName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( rOpt.aGridColName, rStream.GetStreamCharSet() );
/*N*/
/*N*/ if( aHdr.BytesLeft() )
/*N*/ rStream >> rOpt.aOptArr[VOPT_HELPLINES];
diff --git a/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx b/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
index bdf49e5..5601e90 100644
--- a/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
@@ -61,7 +61,7 @@ static const sal_Char pStandardName[] = "Standard";
/*N*/ void ScNumFormatAbbrev::Load( SvStream& rStream )
/*N*/ {
/*N*/ USHORT nSysLang, nLang;
-/*N*/ rStream.ReadUniOrByteString( sFormatstring, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( sFormatstring, rStream.GetStreamCharSet() );
/*N*/ rStream >> nSysLang >> nLang;
/*N*/ eLnge = (LanguageType) nLang;
/*N*/ eSysLnge = (LanguageType) nSysLang;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 7b30101..066ff14 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -300,7 +300,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
{
aWinStm->SetBufferSize(1024);
String aWinData;
- aWinStm->ReadUniOrByteString( aWinData, aWinStm->GetStreamCharSet() );
+ aWinStm->ReadByteString( aWinData );
if ( aWinData.Len() )
{
char cToken =',';
@@ -308,7 +308,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
if ( aWinData.GetToken( 0, cToken ).EqualsAscii( "TASK" ) )
{
bOldFormat = FALSE;
- aWinStm->ReadUniOrByteString( aWinData, aWinStm->GetStreamCharSet() ); // read next string
+ aWinStm->ReadByteString( aWinData ); // read next string
}
USHORT nViewId = (USHORT) aWinData.GetToken( 0, cToken ).ToInt32();
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index b096f5c..d82304f 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -743,15 +743,15 @@ enum ChartStyleV0
/*N*/ rOut << (INT16)eSysSet;
/*N*/
/*N*/ rOut << bShowMainTitle;
-/*N*/ rOut.WriteUniOrByteString( aMainTitle, rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( aMainTitle );
/*N*/ rOut << bShowSubTitle;
-/*N*/ rOut.WriteUniOrByteString( aSubTitle, rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( aSubTitle );
/*N*/ rOut << bShowXAxisTitle;
-/*N*/ rOut.WriteUniOrByteString( aXAxisTitle, rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( aXAxisTitle );
/*N*/ rOut << bShowYAxisTitle;
-/*N*/ rOut.WriteUniOrByteString( aYAxisTitle, rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( aYAxisTitle );
/*N*/ rOut << bShowZAxisTitle;
-/*N*/ rOut.WriteUniOrByteString( aZAxisTitle, rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( aZAxisTitle );
/*N*/ rOut << bShowXAxis;
/*N*/ rOut << bShowXGridMain;
/*N*/ rOut << bShowXGridHelp;
@@ -936,19 +936,19 @@ enum ChartStyleV0
/*N*/ {
/*N*/ if (pChartData)
/*N*/ {
-/*N*/ rOut.WriteUniOrByteString( pChartData->SomeData1(), rOut.GetStreamCharSet() );
-/*N*/ rOut.WriteUniOrByteString( pChartData->SomeData2(), rOut.GetStreamCharSet() );
-/*N*/ rOut.WriteUniOrByteString( pChartData->SomeData3(), rOut.GetStreamCharSet() );
-/*N*/ rOut.WriteUniOrByteString( pChartData->SomeData4(), rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( pChartData->SomeData1() );
+/*N*/ rOut.WriteByteString( pChartData->SomeData2() );
+/*N*/ rOut.WriteByteString( pChartData->SomeData3() );
+/*N*/ rOut.WriteByteString( pChartData->SomeData4() );
/*N*/ }
/*N*/ else
/*N*/ {
/*?*/ String aEmpty;
/*?*/
-/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
-/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
-/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
-/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
+/*?*/ rOut.WriteByteString( aEmpty );
+/*?*/ rOut.WriteByteString( aEmpty );
+/*?*/ rOut.WriteByteString( aEmpty );
+/*?*/ rOut.WriteByteString( aEmpty );
/*N*/ }
/*N*/ }
/*N*/
@@ -1370,15 +1370,15 @@ enum ChartStyleV0
/*N*/ BOOL bShowZDescr;
/*N*/
/*N*/ rIn >> bShowMainTitle;
-/*N*/ rIn.ReadUniOrByteString( aMainTitle, rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( aMainTitle );
/*N*/ rIn >> bShowSubTitle;
-/*N*/ rIn.ReadUniOrByteString( aSubTitle, rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( aSubTitle );
/*N*/ rIn >> bShowXAxisTitle;
-/*N*/ rIn.ReadUniOrByteString( aXAxisTitle, rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( aXAxisTitle );
/*N*/ rIn >> bShowYAxisTitle;
-/*N*/ rIn.ReadUniOrByteString( aYAxisTitle, rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( aYAxisTitle );
/*N*/ rIn >> bShowZAxisTitle;
-/*N*/ rIn.ReadUniOrByteString( aZAxisTitle, rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( aZAxisTitle );
/*N*/ rIn >> bShowXAxis;
/*N*/ rIn >> bShowXGridMain;
/*N*/ rIn >> bShowXGridHelp;
@@ -1658,10 +1658,10 @@ enum ChartStyleV0
/*N*/ {
/*N*/ ByteString aReadString;
/*N*/
-/*N*/ rIn.ReadUniOrByteString( pChartData->SomeData1(), rIn.GetStreamCharSet() );
-/*N*/ rIn.ReadUniOrByteString( pChartData->SomeData2(), rIn.GetStreamCharSet() );
-/*N*/ rIn.ReadUniOrByteString( pChartData->SomeData3(), rIn.GetStreamCharSet() );
-/*N*/ rIn.ReadUniOrByteString( pChartData->SomeData4(), rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( pChartData->SomeData1() );
+/*N*/ rIn.ReadByteString( pChartData->SomeData2() );
+/*N*/ rIn.ReadByteString( pChartData->SomeData3() );
+/*N*/ rIn.ReadByteString( pChartData->SomeData4() );
/*N*/
/*N*/ if (nMoreData >= 3) rIn >> fSpotIntensity;
/*N*/ if (nMoreData <= 8) fAmbientIntensity = fSpotIntensity;
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index 73b8138..e401d27 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -470,17 +470,17 @@ namespace binfilter {
/*N*/ rOut << *(pOut ++);
/*N*/
/*N*/ rOut << (INT16)aSysCharSet;
-/*N*/ rOut.WriteUniOrByteString( rMemChart.aMainTitle, rOut.GetStreamCharSet() );
-/*N*/ rOut.WriteUniOrByteString( rMemChart.aSubTitle, rOut.GetStreamCharSet() );
-/*N*/ rOut.WriteUniOrByteString( rMemChart.aXAxisTitle, rOut.GetStreamCharSet() );
-/*N*/ rOut.WriteUniOrByteString( rMemChart.aYAxisTitle, rOut.GetStreamCharSet() );
-/*N*/ rOut.WriteUniOrByteString( rMemChart.aZAxisTitle, rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( rMemChart.aMainTitle );
+/*N*/ rOut.WriteByteString( rMemChart.aSubTitle );
+/*N*/ rOut.WriteByteString( rMemChart.aXAxisTitle );
+/*N*/ rOut.WriteByteString( rMemChart.aYAxisTitle );
+/*N*/ rOut.WriteByteString( rMemChart.aZAxisTitle );
/*N*/
/*N*/ for (i = 0; i < rMemChart.nColCnt; i++)
-/*N*/ rOut.WriteUniOrByteString( rMemChart.pColText[ i ], rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( rMemChart.pColText[ i ] );
/*N*/
/*N*/ for (i = 0; i < rMemChart.nRowCnt; i++)
-/*N*/ rOut.WriteUniOrByteString( rMemChart.pRowText[ i ], rOut.GetStreamCharSet() );
+/*N*/ rOut.WriteByteString( rMemChart.pRowText[ i ] );
/*N*/
/*N*/ rOut << (INT16)rMemChart.eDataType;
/*N*/
@@ -529,24 +529,24 @@ namespace binfilter {
/*N*/ (USHORT)rIn.GetVersion());
/*N*/ rIn.SetStreamCharSet( aCharSet );
/*N*/
-/*N*/ rIn.ReadUniOrByteString( rMemChart.aMainTitle, rIn.GetStreamCharSet() );
-/*N*/ rIn.ReadUniOrByteString( rMemChart.aSubTitle, rIn.GetStreamCharSet() );
-/*N*/ rIn.ReadUniOrByteString( rMemChart.aXAxisTitle, rIn.GetStreamCharSet() );
-/*N*/ rIn.ReadUniOrByteString( rMemChart.aYAxisTitle, rIn.GetStreamCharSet() );
-/*N*/ rIn.ReadUniOrByteString( rMemChart.aZAxisTitle, rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( rMemChart.aMainTitle );
+/*N*/ rIn.ReadByteString( rMemChart.aSubTitle );
+/*N*/ rIn.ReadByteString( rMemChart.aXAxisTitle );
+/*N*/ rIn.ReadByteString( rMemChart.aYAxisTitle );
+/*N*/ rIn.ReadByteString( rMemChart.aZAxisTitle );
/*N*/
/*N*/ rMemChart.pColText = new String[rMemChart.nColCnt];
/*N*/
/*N*/ for (short i = 0; i < rMemChart.nColCnt; i++)
/*N*/ {
-/*N*/ rIn.ReadUniOrByteString( rMemChart.pColText[ i ], rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( rMemChart.pColText[ i ] );
/*N*/ }
/*N*/
/*N*/ rMemChart.pRowText = new String[rMemChart.nRowCnt];
/*N*/
/*N*/ for (short i = 0; i < rMemChart.nRowCnt; i++)
/*N*/ {
-/*N*/ rIn.ReadUniOrByteString( rMemChart.pRowText[ i ], rIn.GetStreamCharSet() );
+/*N*/ rIn.ReadByteString( rMemChart.pRowText[ i ] );
/*N*/ }
/*N*/
/*N*/ rIn >> nInt16; rMemChart.eDataType = (short)nInt16;
diff --git a/binfilter/bf_sd/source/core/sd_anminfo.cxx b/binfilter/bf_sd/source/core/sd_anminfo.cxx
index 2ecbccf..4d4674e 100644
--- a/binfilter/bf_sd/source/core/sd_anminfo.cxx
+++ b/binfilter/bf_sd/source/core/sd_anminfo.cxx
@@ -193,7 +193,7 @@ using namespace ::com::sun::star;
/*N*/ eTextEnc = (rtl_TextEncoding)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion());
/*N*/
/*N*/ String aSoundFileRel;
-/*N*/ rIn.ReadUniOrByteString( aSoundFileRel, eTextEnc );
+/*N*/ rIn.ReadByteString( aSoundFileRel, eTextEnc );
/*N*/ if( aSoundFileRel.Len() )
/*N*/ {
/*N*/ INetURLObject aURLObj(SmartRel2Abs( INetURLObject(::binfilter::StaticBaseUrl::GetBaseURL()), aSoundFileRel, ::binfilter::GetMaybeFileHdl(), false, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8, false, INetURLObject::FSYS_DETECT ));
@@ -234,17 +234,17 @@ using namespace ::com::sun::star;
/*N*/ eClickAction == presentation::ClickAction_SOUND)
/*N*/ {
/*N*/ String aBookmarkRel;
-/*N*/ rIn.ReadUniOrByteString( aBookmarkRel, eTextEnc );
+/*N*/ rIn.ReadByteString( aBookmarkRel, eTextEnc );
/*N*/ INetURLObject aURLObj(::binfilter::StaticBaseUrl::SmartRelToAbs(aBookmarkRel, FALSE,
/*N*/ INetURLObject::WAS_ENCODED,
/*N*/ INetURLObject::DECODE_UNAMBIGUOUS));
/*N*/ aBookmark = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ }
/*N*/ else
-/*N*/ rIn.ReadUniOrByteString( aBookmark, eTextEnc );
+/*N*/ rIn.ReadByteString( aBookmark, eTextEnc );
/*N*/
/*N*/ String aSecondSoundFileRel;
-/*N*/ rIn.ReadUniOrByteString( aSecondSoundFileRel, eTextEnc );
+/*N*/ rIn.ReadByteString( aSecondSoundFileRel, eTextEnc );
/*N*/ if( aSecondSoundFileRel.Len() )
/*N*/ {
/*N*/ INetURLObject aURLObj(SmartRel2Abs( INetURLObject(::binfilter::StaticBaseUrl::GetBaseURL()), aSecondSoundFileRel, ::binfilter::GetMaybeFileHdl(), false, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8, false, INetURLObject::FSYS_DETECT ));
diff --git a/binfilter/bf_sd/source/core/sd_cusshow.cxx b/binfilter/bf_sd/source/core/sd_cusshow.cxx
index 3a29663..7de8205 100644
--- a/binfilter/bf_sd/source/core/sd_cusshow.cxx
+++ b/binfilter/bf_sd/source/core/sd_cusshow.cxx
@@ -98,7 +98,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // Name
/*N*/ // #90477# rOut.WriteByteString( rCustomShow.aName, ::GetStoreCharSet( osl_getThreadTextEncoding() ) );
-/*N*/ rOut.WriteUniOrByteString(rCustomShow.aName,
+/*N*/ rOut.WriteByteString(rCustomShow.aName,
/*N*/ GetSOStoreTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rOut.GetVersion()));
/*N*/
/*N*/ // Anzahl Seiten
@@ -132,7 +132,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // Name
/*N*/ // #90477# rIn.ReadByteString( rCustomShow.aName, ::GetStoreCharSet( osl_getThreadTextEncoding() ) );
-/*N*/ rIn.ReadUniOrByteString(rCustomShow.aName,
+/*N*/ rIn.ReadByteString(rCustomShow.aName,
/*N*/ GetSOLoadTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rIn.GetVersion()));
/*N*/
/*N*/ // Anzahl Seiten
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index 2c6f008..a2a7d59 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -410,7 +410,7 @@ SvStream& operator << (SvStream& rOut, SdDrawDocument& rDoc)
rOut << rDoc.bOnlineSpell;
rOut << rDoc.bHideSpell;
rOut << rDoc.bPresFullScreen;
- rOut.WriteUniOrByteString( rDoc.aPresPage, eSysSet );
+ rOut.WriteByteString( rDoc.aPresPage, eSysSet );
rOut << rDoc.bAnimationAllowed;
UINT16 nDocType = (UINT16) rDoc.eDocType;
@@ -614,7 +614,7 @@ SvStream& operator >> (SvStream& rIn, SdDrawDocument& rDoc)
if (rDoc.nFileFormatVersion >= 10)
{
- rIn.ReadUniOrByteString( rDoc.aPresPage, eSysSet );
+ rIn.ReadByteString( rDoc.aPresPage, eSysSet );
}
if (rDoc.nFileFormatVersion >= 11)
diff --git a/binfilter/bf_sd/source/core/sd_sdpage2.cxx b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
index dbbb28d..192e84a 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage2.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
@@ -106,7 +106,7 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
rIn >> nTime;
rIn >> bSoundOn;
rIn >> bExcluded;
- rIn.ReadUniOrByteString( aLayoutName, rIn.GetStreamCharSet() );
+ rIn.ReadByteString( aLayoutName );
if (IsObjOrdNumsDirty())
RecalcObjOrdNums();
@@ -155,7 +155,7 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
eCharSet = (CharSet)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion());
String aSoundFileRel;
- rIn.ReadUniOrByteString( aSoundFileRel, rIn.GetStreamCharSet() );
+ rIn.ReadByteString( aSoundFileRel );
INetURLObject aURLObj(::binfilter::StaticBaseUrl::SmartRelToAbs(aSoundFileRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
@@ -166,13 +166,13 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
if (aIO.GetVersion() >=4)
{
String aFileNameRel;
- rIn.ReadUniOrByteString( aFileNameRel, rIn.GetStreamCharSet() );
+ rIn.ReadByteString( aFileNameRel );
INetURLObject aURLObj(::binfilter::StaticBaseUrl::SmartRelToAbs(aFileNameRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
aFileName = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
- rIn.ReadUniOrByteString( aBookmarkName, rIn.GetStreamCharSet() );
+ rIn.ReadByteString( aBookmarkName );
}
// ab hier werden Daten der Versionen >=5 eingelesen
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index f278456..3f87ee9 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -397,7 +397,7 @@ static const char pStorageName[] = "Configurations";
/*N*/ long lLength, lPos; // dummies
/*N*/ (*pStream) >> pItem->nType >> lPos >> lLength;
/*N*/ pItem->bDefault = ( lPos == -1L );
-/*N*/ pStream->ReadUniOrByteString( pItem->aName, pStream->GetStreamCharSet() );
+/*N*/ pStream->ReadByteString( pItem->aName );
/*N*/ if ( pStream->GetError() )
/*N*/ {
/*?*/ pItem->bDefault = TRUE;
diff --git a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
index 1a8ab80..45c3377 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
@@ -92,19 +92,19 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
/*?*/ // In der 1.Version ohne Versionskennung
/*?*/ nAppBasic = nVersion;
/*?*/ nFileVersion = 1;
-/*?*/ aDocName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8);
-/*?*/ rInfo.aLibName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8);
-/*?*/ rInfo.aModuleName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8);
-/*?*/ rInfo.aMethodName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.ReadByteString(aDocName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.ReadByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.ReadByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.ReadByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
/*?*/ }
/*?*/ else
/*?*/ {
/*?*/ String aInput;
/*?*/ rStream >> nAppBasic;
-/*?*/ aDocName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8); // Vorsicht: kann bei AppName Unsinn sein!
-/*?*/ rInfo.aLibName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8);
-/*?*/ rInfo.aModuleName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8);
-/*?*/ aInput = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.ReadByteString(aDocName,RTL_TEXTENCODING_UTF8); // Vorsicht: kann bei AppName Unsinn sein!
+/*?*/ rStream.ReadByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.ReadByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.ReadByteString(aInput,RTL_TEXTENCODING_UTF8);
/*?*/
/*?*/ if ( nFileVersion == nCompatVersion )
/*?*/ rInfo.aMethodName = aInput;
@@ -131,18 +131,18 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
/*?*/ {
/*?*/ rStream << nVersion
/*?*/ << (sal_uInt16) rInfo.bAppBasic;
-/*?*/ write_lenPrefixed_uInt8s_FromOUString(rStream, rInfo.aLibName, RTL_TEXTENCODING_UTF8);
-/*?*/ write_lenPrefixed_uInt8s_FromOUString(rStream, rInfo.aModuleName, RTL_TEXTENCODING_UTF8);
-/*?*/ write_lenPrefixed_uInt8s_FromOUString(rStream, rInfo.aMethodName, RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.WriteByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
/*?*/ }
/*?*/ else
/*?*/ {
/*?*/ rStream << nVersion
/*?*/ << (sal_uInt16) rInfo.bAppBasic;
-/*?*/ write_lenPrefixed_uInt8s_FromOUString(rStream, SFX_APP()->GetName(), RTL_TEXTENCODING_UTF8);
-/*?*/ write_lenPrefixed_uInt8s_FromOUString(rStream, rInfo.aLibName, RTL_TEXTENCODING_UTF8);
-/*?*/ write_lenPrefixed_uInt8s_FromOUString(rStream, rInfo.aModuleName, RTL_TEXTENCODING_UTF8);
-/*?*/ write_lenPrefixed_uInt8s_FromOUString(rStream, rInfo.aMethodName, RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.WriteByteString(SFX_APP()->GetName(),RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
+/*?*/ rStream.WriteByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
/*?*/ }
/*?*/
/*?*/ return rStream;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 0d60989..2ca11c3 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -1778,8 +1778,8 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*?*/ for( sal_uInt16 i=0; i<nLclCount; ++i )
/*?*/ {
/*?*/ SfxVersionInfo *pNew = new SfxVersionInfo;
-/*?*/ pNew->aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8);
-/*?*/ pNew->aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8);
+/*?*/ rStrm.ReadByteString( pNew->aComment, RTL_TEXTENCODING_UTF8 );
+/*?*/ rStrm.ReadByteString( pNew->aName, RTL_TEXTENCODING_UTF8 );
/*?*/ pNew->aCreateStamp.Load( rStrm );
/*?*/ maList.push_back( pNew );
/*?*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index cb226ac..ef50be7 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -363,7 +363,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ BYTE b;
/*N*/ long nVer = rStream.GetVersion();
/*N*/ rStream.SetVersion( SOFFICE_FILEFORMAT_40 );
-/*N*/ rStream.ReadUniOrByteString( aHeader, rStream.GetStreamCharSet() ); //(dv??)
+/*N*/ rStream.ReadByteString( aHeader ); //(dv??)
/*N*/ rStream >> nVersion >> b;
/*N*/ rStream.SetVersion( nVer );
/*N*/ bPasswd = (BOOL)b;
@@ -373,9 +373,9 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ BOOL SfxDocUserKey::Load(SvStream &rStream)
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( aTitle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aTitle );
/*N*/ Skip(rStream, SFXDOCUSERKEY_LENMAX - aTitle.Len());
-/*N*/ rStream.ReadUniOrByteString( aWord, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aWord );
/*N*/ Skip(rStream, SFXDOCUSERKEY_LENMAX - aWord.Len());
/*N*/ return rStream.GetError() == SVSTREAM_OK;
/*N*/ }
@@ -439,21 +439,21 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ aChanged.Load(rStream);
/*N*/ aPrinted.Load(rStream);
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aTitle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aTitle );
/*N*/ Skip(rStream, SFXDOCINFO_TITLELENMAX - aTitle.Len());
-/*N*/ rStream.ReadUniOrByteString( aTheme, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aTheme );
/*N*/ Skip(rStream, SFXDOCINFO_THEMELENMAX - aTheme.Len());
-/*N*/ rStream.ReadUniOrByteString( aComment, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aComment );
/*N*/ Skip(rStream, SFXDOCINFO_COMMENTLENMAX- aComment.Len());
-/*N*/ rStream.ReadUniOrByteString( aKeywords, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aKeywords );
/*N*/ Skip(rStream, SFXDOCINFO_KEYWORDLENMAX - aKeywords.Len());
/*N*/
/*N*/ USHORT i;
/*N*/ for(i = 0; i < MAXDOCUSERKEYS; ++i)
/*N*/ aUserKeys[i].Load(rStream);
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aTemplateName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aTemplateFileName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aTemplateName );
+/*N*/ rStream.ReadByteString( aTemplateFileName );
/*N*/ rStream >> d >> t;
/*N*/ aTemplateDate = DateTime(Date(d), Time(t));
/*N*/
@@ -466,7 +466,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ {
/*N*/ String aDummyString;
/*N*/ USHORT nDummyFlags;
-/*N*/ rStream.ReadUniOrByteString( aDummyString, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aDummyString );
/*N*/ rStream >> nDummyFlags;
/*N*/ }
/*N*/ }
@@ -489,9 +489,9 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ if( aHeader.nVersion > 5 )
/*N*/ {
/*N*/ rStream >> bReloadEnabled;
-/*N*/ rStream.ReadUniOrByteString( aReloadURL, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aReloadURL );
/*N*/ rStream >> nReloadSecs;
-/*N*/ rStream.ReadUniOrByteString( aDefaultTarget, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( aDefaultTarget );
/*N*/
/*N*/ if ( !TestValidity_Impl( aReloadURL, sal_True ) )
/*N*/ {
@@ -520,19 +520,19 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ rStream >> nByte;
/*N*/ bSaveVersionOnClose = nByte? 1: 0;
/*N*/
-/*N*/ rStream.ReadUniOrByteString( pImp->aCopiesTo, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImp->aOriginal, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImp->aReferences, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImp->aRecipient, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImp->aReplyTo, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImp->aBlindCopies, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImp->aInReplyTo, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( pImp->aNewsgroups, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( pImp->aCopiesTo );
+/*N*/ rStream.ReadByteString( pImp->aOriginal );
+/*N*/ rStream.ReadByteString( pImp->aReferences );
+/*N*/ rStream.ReadByteString( pImp->aRecipient );
+/*N*/ rStream.ReadByteString( pImp->aReplyTo );
+/*N*/ rStream.ReadByteString( pImp->aBlindCopies );
+/*N*/ rStream.ReadByteString( pImp->aInReplyTo );
+/*N*/ rStream.ReadByteString( pImp->aNewsgroups );
/*N*/ rStream >> pImp->nPriority;
/*N*/ }
/*N*/ if ( aHeader.nVersion > 9 )
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( pImp->aSpecialMimeType, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( pImp->aSpecialMimeType );
/*N*/ }
/*N*/ if ( aHeader.nVersion > 10 )
/*N*/ {
diff --git a/binfilter/bf_sfx2/source/doc/timestamp.cxx b/binfilter/bf_sfx2/source/doc/timestamp.cxx
index f70f6f0..7436d12 100644
--- a/binfilter/bf_sfx2/source/doc/timestamp.cxx
+++ b/binfilter/bf_sfx2/source/doc/timestamp.cxx
@@ -206,7 +206,7 @@ BOOL TimeStamp::Load ( SvStream& rStream )
CharSet eConvertCharSet = rStream.GetStreamCharSet();
DBG_ASSERT( !(eConvertCharSet == RTL_TEXTENCODING_DONTKNOW) , "TimeStamp::Load()\nCharSet of stream is unknown. Can't convert bytestring to UniCode!\n" );
DBG_ASSERT( !(eConvertCharSet == ((rtl_TextEncoding)9)) , "TimeStamp::Load()\nCharSet SYSTEM is obsolete. Can't convert bytestring to UniCode!\n" );
- rStream.ReadUniOrByteString( m_sModifiedByName, eConvertCharSet );
+ rStream.ReadByteString( m_sModifiedByName, eConvertCharSet );
// Skip name in stream.
diff --git a/binfilter/bf_so3/source/inplace/applet2.cxx b/binfilter/bf_so3/source/inplace/applet2.cxx
index bc20fb2..146f8d7 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.cxx
@@ -625,12 +625,9 @@ BOOL SvAppletObject::Load
if( nVer == APPLET_VERS )
{
*xStm >> pImpl->aCmdList;
- pImpl->aClass = read_lenPrefixed_uInt8s_ToOUString(*xStm,
- RTL_TEXTENCODING_ASCII_US );
- pImpl->aName = read_lenPrefixed_uInt8s_ToOUString(*xStm,
- RTL_TEXTENCODING_ASCII_US);
- pImpl->aCodeBase = read_lenPrefixed_uInt8s_ToOUString(*xStm,
- RTL_TEXTENCODING_ASCII_US);
+ xStm->ReadByteString( pImpl->aClass, RTL_TEXTENCODING_ASCII_US );
+ xStm->ReadByteString( pImpl->aName, RTL_TEXTENCODING_ASCII_US );
+ xStm->ReadByteString( pImpl->aCodeBase, RTL_TEXTENCODING_ASCII_US );
*xStm >> pImpl->bMayScript;
}
else
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index 836ee2f..9f60852 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.cxx
@@ -719,8 +719,8 @@ BOOL SvPlugInObject::Load
{
if( nVer == 1 )
{
- String aURL = read_lenPrefixed_uInt8s_ToOUString(*xStm,
- RTL_TEXTENCODING_ASCII_US);
+ String aURL;
+ xStm->ReadByteString( aURL, RTL_TEXTENCODING_ASCII_US );
pURL = new INetURLObject( aURL );
// Ignore, not necessary
BOOL bStrict;
@@ -728,15 +728,15 @@ BOOL SvPlugInObject::Load
}
else
{
- String aURL = read_lenPrefixed_uInt8s_ToOUString(*xStm,
- RTL_TEXTENCODING_ASCII_US);
+ String aURL;
+ xStm->ReadByteString( aURL, RTL_TEXTENCODING_ASCII_US );
pURL = new INetURLObject(
::binfilter::StaticBaseUrl::RelToAbs( aURL ));
}
}
- String aMimeType = read_lenPrefixed_uInt8s_ToOUString(*xStm,
- RTL_TEXTENCODING_ASCII_US);
+ String aMimeType;
+ xStm->ReadByteString( aMimeType, RTL_TEXTENCODING_ASCII_US );
}
else
xStm->SetError( ERRCODE_IO_WRONGVERSION );
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 0dfc683..bbe370c 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -128,8 +128,8 @@ void SvInfoObject::Load( SvPersistStream & rStm )
rStm.SetError( SVSTREAM_WRONGVERSION );
else
{
- rStm.ReadUniOrByteString( aStorName, osl_getThreadTextEncoding() );
- rStm.ReadUniOrByteString( aObjName, osl_getThreadTextEncoding() );
+ rStm.ReadByteString( aStorName, osl_getThreadTextEncoding() );
+ rStm.ReadByteString( aObjName, osl_getThreadTextEncoding() );
if( !aObjName.Len() )
aObjName = aStorName;
rStm >> aSvClassName;
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index cf84f9f..116de4a 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -561,12 +561,12 @@ BOOL SmDocShell::Load(SvStorage *pStor)
/*N*/ break;
/*N*/
/*N*/ case 'D':
-/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
-/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadByteString(aBuffer, eEnc);
/*?*/ *pSvStream >> lDate >> lTime;
-/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadByteString(aBuffer, eEnc);
/*?*/ *pSvStream >> lDate >> lTime;
-/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadByteString(aBuffer, eEnc);
/*?*/ break;
/*N*/
/*N*/ case 'F':
@@ -586,7 +586,7 @@ BOOL SmDocShell::Load(SvStorage *pStor)
/*N*/ {
/*N*/ String aTmp;
/*N*/ USHORT n;
-/*N*/ pSvStream->ReadUniOrByteString(aTmp, eEnc);
+/*N*/ pSvStream->ReadByteString(aTmp, eEnc);
/*N*/ *pSvStream >> n;
/*N*/ break;
/*N*/ }
@@ -661,12 +661,12 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
case 'D':
{
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+ pSvStream->ReadByteString(aBuffer, eEnc);
+ pSvStream->ReadByteString(aBuffer, eEnc);
*pSvStream >> lDate >> lTime;
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+ pSvStream->ReadByteString(aBuffer, eEnc);
*pSvStream >> lDate >> lTime;
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+ pSvStream->ReadByteString(aBuffer, eEnc);
}
break;
@@ -682,7 +682,7 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
{
String aTmp;
USHORT n;
- pSvStream->ReadUniOrByteString(aTmp, eEnc);
+ pSvStream->ReadByteString(aTmp, eEnc);
*pSvStream >> n;
break;
}
diff --git a/binfilter/bf_svtools/source/items/svt_style.cxx b/binfilter/bf_svtools/source/items/svt_style.cxx
index ae318c4..47d5d91 100644
--- a/binfilter/bf_svtools/source/items/svt_style.cxx
+++ b/binfilter/bf_svtools/source/items/svt_style.cxx
@@ -825,9 +825,9 @@ BOOL SfxStyleSheetBasePool::Load( SvStream& rStream )
String aHelpFile;
USHORT nFamily, nStyleMask,nCount;
sal_uInt32 nHelpId;
- rStream.ReadUniOrByteString(aName, eEnc );
- rStream.ReadUniOrByteString(aParent, eEnc );
- rStream.ReadUniOrByteString(aFollow, eEnc );
+ rStream.ReadByteString(aName, eEnc );
+ rStream.ReadByteString(aParent, eEnc );
+ rStream.ReadByteString(aFollow, eEnc );
rStream >> nFamily >> nStyleMask;
SfxPoolItem::readByteString(rStream, aHelpFile);
rStream >> nHelpId;
@@ -919,9 +919,9 @@ BOOL SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
String aHelpFile;
USHORT nFamily, nStyleMask,nCount;
sal_uInt32 nHelpId;
- rStream.ReadUniOrByteString(aName, eEnc );
- rStream.ReadUniOrByteString(aParent, eEnc );
- rStream.ReadUniOrByteString(aFollow, eEnc );
+ rStream.ReadByteString(aName, eEnc );
+ rStream.ReadByteString(aParent, eEnc );
+ rStream.ReadByteString(aFollow, eEnc );
rStream >> nFamily >> nStyleMask;
SfxPoolItem::readByteString(rStream, aHelpFile);
if(nVersion!=STYLESTREAM_VERSION)
diff --git a/binfilter/bf_svtools/source/items1/svt_bintitem.cxx b/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
index 75d97e4..7f5cf08 100644
--- a/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
@@ -59,7 +59,7 @@ SfxBigIntItem::SfxBigIntItem(USHORT which, SvStream &rStream)
{
DBG_CTOR(SfxBigIntItem, 0);
UniString sTmp;
- rStream.ReadUniOrByteString(sTmp, rStream.GetStreamCharSet());
+ rStream.ReadByteString(sTmp);
BigInt aTmp(sTmp);
aVal = aTmp;
}
diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
index 8bee674..4b5c3e7 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
@@ -214,7 +214,7 @@ USHORT SfxPoolItem::GetVersion( USHORT ) const
// static
bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString)
{
- rStream.ReadUniOrByteString(rString, rStream.GetStreamCharSet());
+ rStream.ReadByteString(rString);
return rStream.GetError() == ERRCODE_NONE;
}
@@ -223,7 +223,7 @@ bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString)
bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString,
bool bUnicode)
{
- rStream.ReadUniOrByteString(rString,
+ rStream.ReadByteString(rString,
bUnicode ? RTL_TEXTENCODING_UCS2 :
rStream.GetStreamCharSet());
return rStream.GetError() == ERRCODE_NONE;
diff --git a/binfilter/bf_svtools/source/misc/svt_templatefoldercache.cxx b/binfilter/bf_svtools/source/misc/svt_templatefoldercache.cxx
index 4c2b5e0..18ab0a8 100644
--- a/binfilter/bf_svtools/source/misc/svt_templatefoldercache.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_templatefoldercache.cxx
@@ -128,7 +128,7 @@ namespace binfilter
void operator() ( const String& _rString ) const
{
- m_rStorage.WriteUniOrByteString( _rString, m_rStorage.GetStreamCharSet() );
+ m_rStorage.WriteByteString( _rString );
}
};
//.........................................................................
diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index 100eb20..5bad95f 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -276,7 +276,7 @@ void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc,
rStream >> nAnz; //! noch nicht direkt nAnzStrings wg. Enlarge
Enlarge( nAnz );
aI.Load( rStream, nAnz );
- rStream.ReadUniOrByteString( sColorName, rStream.GetStreamCharSet() );
+ rStream.ReadByteString( sColorName, rStream.GetStreamCharSet() );
rLoadedColorName = sColorName;
pColor = rSc.GetColor(sColorName);
}
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index aadf10b..21a7443 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -545,7 +545,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
pC->GetText() = String( aByteString, eSrcEncoding );
// StyleName und Family...
- rIStream.ReadUniOrByteString( pC->GetStyle(), eSrcEncoding );
+ rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding );
USHORT nStyleFamily;
rIStream >> nStyleFamily;
pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
@@ -960,12 +960,10 @@ void BinTextObject::CreateData300( SvStream& rIStream )
ContentInfo* pC = CreateAndInsertContent();
// Der Text...
- rIStream.ReadUniOrByteString( pC->GetText(),
- rIStream.GetStreamCharSet() );
+ rIStream.ReadByteString( pC->GetText() );
// StyleName und Family...
- rIStream.ReadUniOrByteString( pC->GetStyle(),
- rIStream.GetStreamCharSet() );
+ rIStream.ReadByteString( pC->GetStyle() );
USHORT nStyleFamily;
rIStream >> nStyleFamily;
pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx
index abd3f2f..a5f8683 100644
--- a/binfilter/bf_svx/source/items/svx_bulitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx
@@ -69,7 +69,7 @@ namespace binfilter {
/*N*/
/*N*/ // UNICODE: rStream >> aName; aFont.SetName( aName );
/*N*/ String aName;
-/*N*/ rStream.ReadUniOrByteString(aName, rStream.GetStreamCharSet());
+/*N*/ rStream.ReadByteString(aName);
/*N*/ aFont.SetName( aName );
/*N*/
/*N*/ if( nVer == 1 )
@@ -154,10 +154,10 @@ namespace binfilter {
/*N*/ rStrm >> nScale;
/*N*/
/*N*/ // UNICODE: rStrm >> aPrevText;
-/*N*/ rStrm.ReadUniOrByteString(aPrevText, rStrm.GetStreamCharSet());
+/*N*/ rStrm.ReadByteString(aPrevText);
/*N*/
/*N*/ // UNICODE: rStrm >> aFollowText;
-/*N*/ rStrm.ReadUniOrByteString(aFollowText, rStrm.GetStreamCharSet());
+/*N*/ rStrm.ReadByteString(aFollowText);
/*N*/
/*N*/ nValidMask = 0xFFFF;
/*N*/ }
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index 24b0d76..543fb34 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -262,7 +262,7 @@ namespace binfilter {
/*N*/
/*N*/ rStm >> nFormat;
/*N*/
-/*N*/ rStm.ReadUniOrByteString(aTmpURL, rStm.GetStreamCharSet());
+/*N*/ rStm.ReadByteString(aTmpURL);
/*N*/
/*N*/ // read to a temp string first, read text encoding and
/*N*/ // convert later to stay compatible to fileformat
@@ -273,7 +273,7 @@ namespace binfilter {
/*N*/ if ( nFrameMarker == FRAME_MARKER )
/*N*/ {
/*N*/ // UNICODE: rStm >> aTargetFrame;
-/*N*/ rStm.ReadUniOrByteString(aTargetFrame, rStm.GetStreamCharSet());
+/*N*/ rStm.ReadByteString(aTargetFrame);
/*N*/
/*N*/ rStm >> nCharSetMarker;
/*N*/ if ( nCharSetMarker == CHARSET_MARKER )
@@ -515,7 +515,7 @@ namespace binfilter {
/*N*/ USHORT nType, nFormat;
/*N*/
/*N*/ // UNICODE: rStm >> aFile;
-/*N*/ rStm.ReadUniOrByteString(aFile, rStm.GetStreamCharSet());
+/*N*/ rStm.ReadByteString(aFile);
/*N*/
/*N*/ rStm >> nType;
/*N*/ rStm >> nFormat;
@@ -585,13 +585,13 @@ namespace binfilter {
/*N*/ USHORT nType, nFormat;
/*N*/
/*N*/ // UNICODE: rStm >> aName;
-/*N*/ rStm.ReadUniOrByteString(aName, rStm.GetStreamCharSet());
+/*N*/ rStm.ReadByteString(aName);
/*N*/
/*N*/ // UNICODE: rStm >> aFirstName;
-/*N*/ rStm.ReadUniOrByteString(aFirstName, rStm.GetStreamCharSet());
+/*N*/ rStm.ReadByteString(aFirstName);
/*N*/
/*N*/ // UNICODE: rStm >> aShortName;
-/*N*/ rStm.ReadUniOrByteString(aShortName, rStm.GetStreamCharSet());
+/*N*/ rStm.ReadByteString(aShortName);
/*N*/
/*N*/ rStm >> nType;
/*N*/ rStm >> nFormat;
diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx
index 20da142..78a6194 100644
--- a/binfilter/bf_svx/source/items/svx_frmitems.cxx
+++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx
@@ -1964,7 +1964,7 @@ public:
/*N*/ {
/*N*/ String aRel;
/*N*/ // UNICODE: rStream >> aRel;
-/*N*/ rStream.ReadUniOrByteString(aRel, rStream.GetStreamCharSet());
+/*N*/ rStream.ReadByteString(aRel);
/*N*/
/*N*/ String aAbs = ::binfilter::StaticBaseUrl::RelToAbs( aRel );
/*N*/ pStrLink = new String( aAbs );
@@ -1974,7 +1974,7 @@ public:
/*N*/ {
/*N*/ pStrFilter = new String;
/*N*/ // UNICODE: rStream >> *pStrFilter;
-/*N*/ rStream.ReadUniOrByteString(*pStrFilter, rStream.GetStreamCharSet());
+/*N*/ rStream.ReadByteString(*pStrFilter);
/*N*/ }
/*N*/
/*N*/ rStream >> nPos;
diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
index 59b9bda..8f31a32 100644
--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
@@ -220,9 +220,9 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ rStream >> nShort;
/*N*/ nCharTextDistance = nShort;
/*N*/ rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
-/*N*/ rStream.ReadUniOrByteString(sPrefix, eEnc);
-/*N*/ rStream.ReadUniOrByteString(sSuffix, eEnc);
-/*N*/ rStream.ReadUniOrByteString(sCharStyleName, eEnc);
+/*N*/ rStream.ReadByteString(sPrefix, eEnc);
+/*N*/ rStream.ReadByteString(sSuffix, eEnc);
+/*N*/ rStream.ReadByteString(sCharStyleName, eEnc);
/*N*/ rStream >> nUSHORT;
/*N*/ if(nUSHORT)
/*N*/ {
diff --git a/binfilter/bf_svx/source/items/svx_pageitem.cxx b/binfilter/bf_svx/source/items/svx_pageitem.cxx
index aa7ef83..54d0209 100644
--- a/binfilter/bf_svx/source/items/svx_pageitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_pageitem.cxx
@@ -206,7 +206,7 @@ using namespace ::com::sun::star;
/*N*/ USHORT nUse;
/*N*/
/*N*/ // UNICODE: rStream >> sStr;
-/*N*/ rStream.ReadUniOrByteString( sStr, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadByteString( sStr );
/*N*/
/*N*/ rStream >> eType;
/*N*/ rStream >> bLand;
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index 54b3edb..109325a 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -327,10 +327,10 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ rStrm >> eFontTextEncoding;
/*N*/
/*N*/ // UNICODE: rStrm >> aName;
-/*N*/ rStrm.ReadUniOrByteString(aName, rStrm.GetStreamCharSet());
+/*N*/ rStrm.ReadByteString(aName);
/*N*/
/*N*/ // UNICODE: rStrm >> aStyle;
-/*N*/ rStrm.ReadUniOrByteString(aStyle, rStrm.GetStreamCharSet());
+/*N*/ rStrm.ReadByteString(aStyle);
/*N*/
/*N*/ // Task 91008/90471: set the "correct" textencoding
/*N*/ eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding, (USHORT)rStrm.GetVersion() );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list