[Libreoffice-commits] .: 3 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 05:45:39 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, 370 insertions(+), 368 deletions(-)
New commits:
commit 7e34bc14b1eda1a6429b2639061d1a4146674f1d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 13:34:04 2011 +0000
tweak for pre language-defect #77
diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index 9a3a9bc..4e22a61 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -340,9 +340,9 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
{
aParams.Remove( 0, aParams.Count() );
UINT16 nParam;
- aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aComment = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
- aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aHelpFile = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
rStrm >> nHelpId >> nParam;
while( nParam-- )
@@ -350,7 +350,7 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
XubString aName;
UINT16 nType, nFlags;
UINT32 nUserData = 0;
- aName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
rStrm >> nType >> nFlags;
if( nVer > 1 )
diff --git a/binfilter/bf_basic/source/sbx/sbxcoll.cxx b/binfilter/bf_basic/source/sbx/sbxcoll.cxx
index fb170a4..d24dea4 100644
--- a/binfilter/bf_basic/source/sbx/sbxcoll.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxcoll.cxx
@@ -281,7 +281,7 @@ BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
BOOL bRes = SbxCollection::LoadData( rStrm, nVer );
if( bRes )
{
- aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aElemClass = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
rStrm >> bAddRemoveOk;
}
diff --git a/binfilter/bf_basic/source/sbx/sbxobj.cxx b/binfilter/bf_basic/source/sbx/sbxobj.cxx
index 1010374..2230015 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -584,9 +584,9 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
aData.pObj = this;
sal_uInt32 nSize;
XubString aDfltProp;
- aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aClassName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
- aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aDfltProp = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
ULONG nPos = rStrm.Tell();
rStrm >> nSize;
@@ -765,7 +765,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,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aLine,
RTL_TEXTENCODING_ASCII_US);
// bei Object-Methods auch das Object ausgeben
@@ -799,7 +799,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,
+ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aLine,
RTL_TEXTENCODING_ASCII_US);
// bei Object-Properties auch das Object ausgeben
diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
index b7143bd..44a7849 100644
--- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
@@ -1463,7 +1463,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
case SbxSINGLE:
{
// Floats als ASCII
- XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
+ XubString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
RTL_TEXTENCODING_ASCII_US);
double d;
SbxDataType t;
@@ -1479,7 +1479,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
case SbxDOUBLE:
{
// Floats als ASCII
- XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
+ XubString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
RTL_TEXTENCODING_ASCII_US);
SbxDataType t;
if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK )
@@ -1502,7 +1502,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
}
case SbxSTRING:
{
- XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
+ XubString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
RTL_TEXTENCODING_ASCII_US);
if( aVal.Len() )
aData.pString = new XubString( aVal );
diff --git a/binfilter/bf_basic/source/sbx/sbxvar.cxx b/binfilter/bf_basic/source/sbx/sbxvar.cxx
index bf02380..a0385d4 100644
--- a/binfilter/bf_basic/source/sbx/sbxvar.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvar.cxx
@@ -325,7 +325,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
{
if( !SbxValue::LoadData( rStrm, nVer ) )
return FALSE;
- maName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ maName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
rStrm >> nUserData;
}
@@ -333,7 +333,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
{
rStrm.SeekRel( -1L );
rStrm >> nType;
- maName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ maName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
rStrm >> nUserData;
// Korrektur: Alte Methoden haben statt SbxNULL jetzt SbxEMPTY
@@ -354,7 +354,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
case SbxSINGLE:
{
// Floats als ASCII
- aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
double d;
SbxDataType t;
@@ -370,7 +370,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
case SbxDOUBLE:
{
// Floats als ASCII
- aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
SbxDataType t;
if( ImpScan( aVal, aTmp.nDouble, t, NULL ) != SbxERR_OK )
@@ -381,7 +381,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
break;
}
case SbxSTRING:
- aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
RTL_TEXTENCODING_ASCII_US);
break;
case SbxEMPTY:
diff --git a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
index 1a8ab80..ba87fa2 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);
+/*?*/ aDocName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, RTL_TEXTENCODING_UTF8);
+/*?*/ rInfo.aLibName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, RTL_TEXTENCODING_UTF8);
+/*?*/ rInfo.aModuleName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, RTL_TEXTENCODING_UTF8);
+/*?*/ rInfo.aMethodName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, 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);
+/*?*/ aDocName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, RTL_TEXTENCODING_UTF8); // Vorsicht: kann bei AppName Unsinn sein!
+/*?*/ rInfo.aLibName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, RTL_TEXTENCODING_UTF8);
+/*?*/ rInfo.aModuleName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, RTL_TEXTENCODING_UTF8);
+/*?*/ aInput = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, 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);
+/*?*/ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, rInfo.aLibName, RTL_TEXTENCODING_UTF8);
+/*?*/ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, rInfo.aModuleName, RTL_TEXTENCODING_UTF8);
+/*?*/ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, 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);
+/*?*/ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, SFX_APP()->GetName(), RTL_TEXTENCODING_UTF8);
+/*?*/ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, rInfo.aLibName, RTL_TEXTENCODING_UTF8);
+/*?*/ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, rInfo.aModuleName, RTL_TEXTENCODING_UTF8);
+/*?*/ write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, 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..2bf7615 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);
+/*?*/ pNew->aComment = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_UTF8);
+/*?*/ pNew->aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_UTF8);
/*?*/ pNew->aCreateStamp.Load( rStrm );
/*?*/ maList.push_back( pNew );
/*?*/ }
diff --git a/binfilter/bf_so3/source/inplace/applet2.cxx b/binfilter/bf_so3/source/inplace/applet2.cxx
index bc20fb2..0abc2ac 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.cxx
@@ -625,11 +625,11 @@ BOOL SvAppletObject::Load
if( nVer == APPLET_VERS )
{
*xStm >> pImpl->aCmdList;
- pImpl->aClass = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ pImpl->aClass = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(*xStm,
RTL_TEXTENCODING_ASCII_US );
- pImpl->aName = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ pImpl->aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(*xStm,
RTL_TEXTENCODING_ASCII_US);
- pImpl->aCodeBase = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ pImpl->aCodeBase = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(*xStm,
RTL_TEXTENCODING_ASCII_US);
*xStm >> pImpl->bMayScript;
}
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index 836ee2f..ac7643c 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.cxx
@@ -719,7 +719,7 @@ BOOL SvPlugInObject::Load
{
if( nVer == 1 )
{
- String aURL = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ String aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(*xStm,
RTL_TEXTENCODING_ASCII_US);
pURL = new INetURLObject( aURL );
// Ignore, not necessary
@@ -728,14 +728,14 @@ BOOL SvPlugInObject::Load
}
else
{
- String aURL = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ String aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(*xStm,
RTL_TEXTENCODING_ASCII_US);
pURL = new INetURLObject(
::binfilter::StaticBaseUrl::RelToAbs( aURL ));
}
}
- String aMimeType = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ String aMimeType = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(*xStm,
RTL_TEXTENCODING_ASCII_US);
}
else
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index cf84f9f..e13e5ee 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -554,7 +554,7 @@ BOOL SmDocShell::Load(SvStorage *pStor)
/*N*/ {
/*N*/ case 'T':
{
- rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(*pSvStream);
+ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pSvStream);
/*N*/ aText = ImportString( aByteStr );
/*N*/ Parse();
}
@@ -653,7 +653,7 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
{
case 'T':
{
- rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(*pSvStream);
+ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pSvStream);
aText = ImportString( aByteStr );
Parse();
}
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx b/binfilter/bf_starmath/source/starmath_utility.cxx
index 0fd5993..cc29a46 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -42,7 +42,7 @@ namespace binfilter {
/*N*/ {
/*N*/ sal_uInt32 nData;
/*N*/
-/*N*/ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(rStream);
+/*N*/ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
/*N*/ rFont.SetName( ImportString( aByteStr ) );
/*N*/ rStream >> nData;
/*N*/ rFont.SetFamily((FontFamily)nData);
@@ -61,7 +61,7 @@ namespace binfilter {
/*?*/ BOOL bData;
/*?*/ sal_uInt32 nData;
/*?*/
-/*?*/ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString(rStream);
+/*?*/ rtl::OString aByteStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
/*?*/ rFont.SetName( ImportString( aByteStr ) );
/*?*/ rStream >> nData;
/*?*/ rFont.SetFamily((FontFamily)nData);
diff --git a/binfilter/bf_svtools/source/items1/svt_cntwall.cxx b/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
index a943993..d7d5271 100644
--- a/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_cntwall.cxx
@@ -77,7 +77,7 @@ CntWallpaperItem::CntWallpaperItem( USHORT which, SvStream& rStream, USHORT nVer
readUnicodeString(rStream, _aURL, false);
// "Read" SfxWallpaperItem's string member _aFilter.
- read_lenPrefixed_uInt8s_ToOString(rStream); //dummy
+ read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); //dummy
}
}
diff --git a/binfilter/bf_svtools/source/misc/svt_imap.cxx b/binfilter/bf_svtools/source/misc/svt_imap.cxx
index 870460a..49b76e9 100644
--- a/binfilter/bf_svtools/source/misc/svt_imap.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imap.cxx
@@ -100,10 +100,10 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL )
rIStm.SeekRel( 2 );
rIStm >> nReadVersion;
rIStm >> nTextEncoding;
- aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
- aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
+ aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding);
+ aAltText = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding);
rIStm >> bActive;
- aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
+ aTarget = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding);
// URL absolut machen
aURL = ::binfilter::SmartRel2Abs( INetURLObject(rBaseURL), aURL, ::binfilter::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS );
@@ -119,7 +119,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);
+ aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding);
}
}
@@ -983,11 +983,11 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
// Version ueberlesen wir
rIStm.SeekRel( 2 );
- aName = read_lenPrefixed_uInt8s_ToOUString(rIStm,
+ aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm,
osl_getThreadTextEncoding() );
- read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy
+ read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); // Dummy
rIStm >> nCount;
- read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy
+ read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); // 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 100eb20..250133e 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -1440,7 +1440,7 @@ 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 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
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 aadf10b..f9dde52 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -541,7 +541,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
ContentInfo* pC = CreateAndInsertContent();
// Der Text...
- ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream);
+ ByteString aByteString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStream);
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..c17a9d7 100644
--- a/binfilter/bf_svx/source/form/svx_fmpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpage.cxx
@@ -81,7 +81,7 @@ namespace binfilter {
/*N*/ SdrPage::ReadData( rHead, rIn );
/*N*/ {
/*N*/ SdrDownCompat aVCCompat2( rIn, STREAM_READ );
-/*N*/ aPageName = read_lenPrefixed_uInt8s_ToOUString(rIn,
+/*N*/ aPageName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn,
/*N*/ osl_getThreadTextEncoding());
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index 24b0d76..4a52407 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -267,7 +267,7 @@ namespace binfilter {
/*N*/ // read to a temp string first, read text encoding and
/*N*/ // convert later to stay compatible to fileformat
/*N*/ rtl_TextEncoding aTempEncoding = RTL_TEXTENCODING_MS_1252; // #101493# Init for old documents
-/*N*/ rtl::OString aTempString = read_lenPrefixed_uInt8s_ToOString(rStm);
+/*N*/ rtl::OString aTempString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm);
/*N*/
/*N*/ rStm >> nFrameMarker;
/*N*/ if ( nFrameMarker == FRAME_MARKER )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index d71b94e..2ddff87 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
@@ -710,7 +710,7 @@ 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*/ rtl::OString sValue = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStrm);
/*N*/ dVal = strtod( sValue.getStr(), &dummy );
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 9e0443c..fbce014 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -460,7 +460,7 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ ByteString s8 = read_lenPrefixed_uInt8s_ToOString(*rIo.pStrm);
+/*N*/ ByteString s8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*rIo.pStrm);
/*N*/ sal_Char cSrch = rIo.nVersion < SWG_DDESEP ? ' ' : ::binfilter::cTokenSeperator;
/*N*/
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 3147ccd..64d1911 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1427,7 +1427,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ {
/*N*/ sal_uInt16 nId;
/*N*/ r >> nId;
-/*N*/ rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString(r);
+/*N*/ rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(r);
/*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..cceee33 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -477,7 +477,7 @@ void Sw3IoImp::InPasswd()
// 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);
+ /*rtl::OString aPasswd =*/ read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pStrm);
/*
// Datum und Uhrzeit als Passwort fuers Passwort nehmen
sal_Char buf[ 17 ];
@@ -1302,7 +1302,7 @@ extern void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, sal_uInt16 nStrId,
/*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*/ rtl::OString sStr8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pStrm);
/*N*/ sStr = ConvertStringNoDbDelim( sStr8, eSrcSet );
/*N*/ aData3.sDataSource = sStr.GetToken(0, DB_DELIM);
/*N*/ aData3.sCommand = sStr.GetToken(1, DB_DELIM);
@@ -1356,7 +1356,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*/ sStr8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pStrm);
/*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..434b572 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -677,7 +677,7 @@ 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*/ rtl::OString aText8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pStrm);
/*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..9c6e21d 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
@@ -256,7 +256,7 @@ void Sw3IoImp::SetDBName()
String sDBName;
OpenRec( SWG_DBNAME );
- rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString(*pStrm);
+ rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pStrm);
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..a452554 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
@@ -414,7 +414,7 @@ namespace binfilter {
/*N*/ {
/*N*/ String aLinkFileName;
/*N*/
-/*N*/ rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString(*pStrm);
+/*N*/ rtl::OString s8 = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pStrm);
/*N*/ aLinkFileName = ConvertStringNoDelim( s8, '\xff', ::binfilter::cTokenSeperator,
/*N*/ eSrcSet );
/*N*/
commit f045bde0995dd22aa71917cc702d781757496d25
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 10:47:02 2011 +0000
disentangle Read/WriteByteString OUString variants
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 1bdd895..3ff8ba1 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.ReadByteString(aName);
+ rSStream.ReadUniOrByteString(aName, rSStream.GetStreamCharSet());
pInfo->SetLibName( aName );
// Absoluter Pfad....
String aStorageName;
- rSStream.ReadByteString(aStorageName);
+ rSStream.ReadUniOrByteString(aStorageName, rSStream.GetStreamCharSet());
pInfo->SetStorageName( aStorageName );
// Relativer Pfad...
String aRelStorageName;
- rSStream.ReadByteString(aRelStorageName);
+ rSStream.ReadUniOrByteString(aRelStorageName, rSStream.GetStreamCharSet());
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->ReadByteString(aLibs);
+ xManagerStream->ReadUniOrByteString(aLibs, xManagerStream->GetStreamCharSet());
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->ReadByteString(aPassword);
+ xBasicStream->ReadUniOrByteString(aPassword, xBasicStream->GetStreamCharSet());
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 c713451..776e4bd 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.ReadByteString( aName, eCharSet );
+ r.ReadUniOrByteString( aName, eCharSet );
break;
case B_COMMENT:
- r.ReadByteString( aComment, eCharSet );
+ r.ReadUniOrByteString( aComment, eCharSet );
break;
case B_SOURCE:
{
String aTmp;
- r.ReadByteString( aTmp, eCharSet );
+ r.ReadUniOrByteString( 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.ReadByteString( aTmp, eCharSet );
+ r.ReadUniOrByteString( aTmp, eCharSet );
aOUSource += aTmp;
}
break;
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index e664330..d64d352 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.ReadByteString( aTmp, osl_getThreadTextEncoding() );
+ rStrm.ReadUniOrByteString( 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 2a380c1..9a3a9bc 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -340,15 +340,18 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
{
aParams.Remove( 0, aParams.Count() );
UINT16 nParam;
- rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US );
- rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
+ aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
+ aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
rStrm >> nHelpId >> nParam;
while( nParam-- )
{
XubString aName;
UINT16 nType, nFlags;
UINT32 nUserData = 0;
- rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US );
+ aName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ 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 37cafe1..fb170a4 100644
--- a/binfilter/bf_basic/source/sbx/sbxcoll.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxcoll.cxx
@@ -281,7 +281,8 @@ BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
BOOL bRes = SbxCollection::LoadData( rStrm, nVer );
if( bRes )
{
- rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
+ aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ 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 fad14c3..1010374 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -584,8 +584,10 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
aData.pObj = this;
sal_uInt32 nSize;
XubString aDfltProp;
- rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
- rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
+ aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
+ aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
ULONG nPos = rStrm.Tell();
rStrm >> nSize;
if( !LoadPrivateData( rStrm, nVer ) )
@@ -763,7 +765,8 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
aLine += aAttrs2;
if( !pVar->IsA( TYPE(SbxMethod) ) )
aLine.AppendAscii( " !! Not a Method !!" );
- rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US );
+ write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine,
+ RTL_TEXTENCODING_ASCII_US);
// bei Object-Methods auch das Object ausgeben
if ( pVar->GetValues_Impl().eType == SbxOBJECT &&
@@ -796,7 +799,8 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
aLine += aAttrs3;
if( !pVar->IsA( TYPE(SbxProperty) ) )
aLine.AppendAscii( " !! Not a Property !!" );
- rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US );
+ write_lenPrefixed_uInt8s_FromOUString(rStrm, 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 7982762..b7143bd 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;
- r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
+ XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
+ 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;
- r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
+ XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
+ 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;
- r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
+ XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r,
+ 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 a8526d1..bf02380 100644
--- a/binfilter/bf_basic/source/sbx/sbxvar.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvar.cxx
@@ -325,14 +325,16 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
{
if( !SbxValue::LoadData( rStrm, nVer ) )
return FALSE;
- rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
+ maName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
rStrm >> nUserData;
}
else
{
rStrm.SeekRel( -1L );
rStrm >> nType;
- rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
+ maName = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
rStrm >> nUserData;
// Korrektur: Alte Methoden haben statt SbxNULL jetzt SbxEMPTY
if( nType == SbxNULL && GetClass() == SbxCLASS_METHOD )
@@ -352,7 +354,8 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
case SbxSINGLE:
{
// Floats als ASCII
- rStrm.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
+ aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
double d;
SbxDataType t;
if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
@@ -367,7 +370,8 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
case SbxDOUBLE:
{
// Floats als ASCII
- rStrm.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
+ aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ RTL_TEXTENCODING_ASCII_US);
SbxDataType t;
if( ImpScan( aVal, aTmp.nDouble, t, NULL ) != SbxERR_OK )
{
@@ -377,7 +381,8 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
break;
}
case SbxSTRING:
- rStrm.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US );
+ aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm,
+ 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 3bf2d93..678e46d 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.ReadByteString( aErgString, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 e64cd28..e9a8d16 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.ReadByteString( aString, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 4d74892..d1a13b8 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.ReadByteString( aStrVal1, rStream.GetStreamCharSet() );
+/*?*/ rStream.ReadUniOrByteString( 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.ReadByteString( aStrVal2, rStream.GetStreamCharSet() );
+/*?*/ rStream.ReadUniOrByteString( 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.ReadByteString( aStyleName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 e02d649..d51f10a 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.ReadByteString( aPageStyle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aPageStyle, rStream.GetStreamCharSet() );
/*N*/ rStream >> bProtected; // Dokument geschuetzt
/*N*/ String aPass;
-/*N*/ rStream.ReadByteString( aPass, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 5de448a..656198f 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.ReadByteString( pImpDesc->aDBName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadByteString( pImpDesc->aObject, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( pImpDesc->aDBName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.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*/ 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*/ 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.ReadByteString( aTableName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadByteString( aTableTag, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aTableName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 29480db..bbce757 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.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 5ebe7a0..1a658a9 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.ReadByteString( *pStr, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( *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 1d6c3ca..2bcad47 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.ReadByteString( *pStr, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( *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 7917a8d..3042911 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.ReadByteString( aName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadByteString( aTag, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( pColNames[nCol], rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 32f0716..46f96cb 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.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
/*N*/
/*N*/ rStream >> bScenario;
-/*N*/ rStream.ReadByteString( aComment, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aComment, rStream.GetStreamCharSet() );
/*N*/
/*N*/ rStream >> bProtected;
/*N*/ String aPass;
-/*N*/ rStream.ReadByteString( aPass, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aPageStyle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aLinkDoc, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aLinkDoc, rStream.GetStreamCharSet() );
/*N*/ aLinkDoc = ::binfilter::StaticBaseUrl::RelToAbs( aLinkDoc );
-/*N*/ rStream.ReadByteString( aLinkFlt, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadByteString( aLinkTab, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aLinkFlt, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aLinkOpt, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 5bbd926..af026a1 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.ReadByteString( aInputTitle, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadByteString( aInputMessage, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aInputTitle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aInputMessage, rStream.GetStreamCharSet() );
/*N*/ rStream >> bShowError;
-/*N*/ rStream.ReadByteString( aErrorTitle, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadByteString( aErrorMessage, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aErrorTitle, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 9e5be8f..88044e8 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.ReadByteString( aName, eSrcSet );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 5fd5b72..00c9b46 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.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 6c01c7e..0477aa3 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.ReadByteString( aComment, rStrm.GetStreamCharSet() );
+/*N*/ rStrm.ReadUniOrByteString( 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.ReadByteString( aOldValue, rStrm.GetStreamCharSet() );
-/*N*/ rStrm.ReadByteString( aNewValue, rStrm.GetStreamCharSet() );
+/*N*/ rStrm.ReadUniOrByteString( aOldValue, rStrm.GetStreamCharSet() );
+/*N*/ rStrm.ReadUniOrByteString( 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 01ecccf..97c4a9f 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.ReadByteString( aAuthorToShow, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aComment, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 94b47bd..e9143cf 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.ReadByteString( aStr, eSet );
+/*N*/ rStream.ReadUniOrByteString( 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 5290b58..42ab4bd 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.ReadByteString( aName, eCharSet );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aDBName, eCharSet );
-/*N*/ rStream.ReadByteString( aDBStatement, eCharSet );
+/*N*/ rStream.ReadUniOrByteString( aDBName, eCharSet );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( *pQueryStr[i], eCharSet );
+/*N*/ rStream.ReadUniOrByteString( *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 54190ef..3073b19 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.ReadByteString( aAppl, eCharSet );
-/*N*/ rStream.ReadByteString( aTopic, eCharSet );
-/*N*/ rStream.ReadByteString( aItem, eCharSet );
+/*N*/ rStream.ReadUniOrByteString( aAppl, eCharSet );
+/*N*/ rStream.ReadUniOrByteString( aTopic, eCharSet );
+/*N*/ rStream.ReadUniOrByteString( 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 04adbd6..b3733df 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.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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.ReadByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 900902d..9ad4162 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.ReadByteString( aMatStr, eCharSet );
+/*N*/ rStream.ReadUniOrByteString( 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 b61f1db..a66c77f 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.ReadByteString( aStr, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 52483aa..f93f336 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.ReadByteString( rOpt.aGridColName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 5601e90..bdf49e5 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.ReadByteString( sFormatstring, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( 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 066ff14..7b30101 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->ReadByteString( aWinData );
+ aWinStm->ReadUniOrByteString( aWinData, aWinStm->GetStreamCharSet() );
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->ReadByteString( aWinData ); // read next string
+ aWinStm->ReadUniOrByteString( aWinData, aWinStm->GetStreamCharSet() ); // 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 d82304f..b096f5c 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.WriteByteString( aMainTitle );
+/*N*/ rOut.WriteUniOrByteString( aMainTitle, rOut.GetStreamCharSet() );
/*N*/ rOut << bShowSubTitle;
-/*N*/ rOut.WriteByteString( aSubTitle );
+/*N*/ rOut.WriteUniOrByteString( aSubTitle, rOut.GetStreamCharSet() );
/*N*/ rOut << bShowXAxisTitle;
-/*N*/ rOut.WriteByteString( aXAxisTitle );
+/*N*/ rOut.WriteUniOrByteString( aXAxisTitle, rOut.GetStreamCharSet() );
/*N*/ rOut << bShowYAxisTitle;
-/*N*/ rOut.WriteByteString( aYAxisTitle );
+/*N*/ rOut.WriteUniOrByteString( aYAxisTitle, rOut.GetStreamCharSet() );
/*N*/ rOut << bShowZAxisTitle;
-/*N*/ rOut.WriteByteString( aZAxisTitle );
+/*N*/ rOut.WriteUniOrByteString( aZAxisTitle, rOut.GetStreamCharSet() );
/*N*/ rOut << bShowXAxis;
/*N*/ rOut << bShowXGridMain;
/*N*/ rOut << bShowXGridHelp;
@@ -936,19 +936,19 @@ enum ChartStyleV0
/*N*/ {
/*N*/ if (pChartData)
/*N*/ {
-/*N*/ rOut.WriteByteString( pChartData->SomeData1() );
-/*N*/ rOut.WriteByteString( pChartData->SomeData2() );
-/*N*/ rOut.WriteByteString( pChartData->SomeData3() );
-/*N*/ rOut.WriteByteString( pChartData->SomeData4() );
+/*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*/ }
/*N*/ else
/*N*/ {
/*?*/ String aEmpty;
/*?*/
-/*?*/ rOut.WriteByteString( aEmpty );
-/*?*/ rOut.WriteByteString( aEmpty );
-/*?*/ rOut.WriteByteString( aEmpty );
-/*?*/ rOut.WriteByteString( aEmpty );
+/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
+/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
+/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
+/*?*/ rOut.WriteUniOrByteString( aEmpty, rOut.GetStreamCharSet() );
/*N*/ }
/*N*/ }
/*N*/
@@ -1370,15 +1370,15 @@ enum ChartStyleV0
/*N*/ BOOL bShowZDescr;
/*N*/
/*N*/ rIn >> bShowMainTitle;
-/*N*/ rIn.ReadByteString( aMainTitle );
+/*N*/ rIn.ReadUniOrByteString( aMainTitle, rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowSubTitle;
-/*N*/ rIn.ReadByteString( aSubTitle );
+/*N*/ rIn.ReadUniOrByteString( aSubTitle, rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowXAxisTitle;
-/*N*/ rIn.ReadByteString( aXAxisTitle );
+/*N*/ rIn.ReadUniOrByteString( aXAxisTitle, rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowYAxisTitle;
-/*N*/ rIn.ReadByteString( aYAxisTitle );
+/*N*/ rIn.ReadUniOrByteString( aYAxisTitle, rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowZAxisTitle;
-/*N*/ rIn.ReadByteString( aZAxisTitle );
+/*N*/ rIn.ReadUniOrByteString( aZAxisTitle, rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowXAxis;
/*N*/ rIn >> bShowXGridMain;
/*N*/ rIn >> bShowXGridHelp;
@@ -1658,10 +1658,10 @@ enum ChartStyleV0
/*N*/ {
/*N*/ ByteString aReadString;
/*N*/
-/*N*/ rIn.ReadByteString( pChartData->SomeData1() );
-/*N*/ rIn.ReadByteString( pChartData->SomeData2() );
-/*N*/ rIn.ReadByteString( pChartData->SomeData3() );
-/*N*/ rIn.ReadByteString( pChartData->SomeData4() );
+/*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*/
/*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 e401d27..73b8138 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.WriteByteString( rMemChart.aMainTitle );
-/*N*/ rOut.WriteByteString( rMemChart.aSubTitle );
-/*N*/ rOut.WriteByteString( rMemChart.aXAxisTitle );
-/*N*/ rOut.WriteByteString( rMemChart.aYAxisTitle );
-/*N*/ rOut.WriteByteString( rMemChart.aZAxisTitle );
+/*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*/
/*N*/ for (i = 0; i < rMemChart.nColCnt; i++)
-/*N*/ rOut.WriteByteString( rMemChart.pColText[ i ] );
+/*N*/ rOut.WriteUniOrByteString( rMemChart.pColText[ i ], rOut.GetStreamCharSet() );
/*N*/
/*N*/ for (i = 0; i < rMemChart.nRowCnt; i++)
-/*N*/ rOut.WriteByteString( rMemChart.pRowText[ i ] );
+/*N*/ rOut.WriteUniOrByteString( rMemChart.pRowText[ i ], rOut.GetStreamCharSet() );
/*N*/
/*N*/ rOut << (INT16)rMemChart.eDataType;
/*N*/
@@ -529,24 +529,24 @@ namespace binfilter {
/*N*/ (USHORT)rIn.GetVersion());
/*N*/ rIn.SetStreamCharSet( aCharSet );
/*N*/
-/*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*/ 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*/
/*N*/ rMemChart.pColText = new String[rMemChart.nColCnt];
/*N*/
/*N*/ for (short i = 0; i < rMemChart.nColCnt; i++)
/*N*/ {
-/*N*/ rIn.ReadByteString( rMemChart.pColText[ i ] );
+/*N*/ rIn.ReadUniOrByteString( rMemChart.pColText[ i ], rIn.GetStreamCharSet() );
/*N*/ }
/*N*/
/*N*/ rMemChart.pRowText = new String[rMemChart.nRowCnt];
/*N*/
/*N*/ for (short i = 0; i < rMemChart.nRowCnt; i++)
/*N*/ {
-/*N*/ rIn.ReadByteString( rMemChart.pRowText[ i ] );
+/*N*/ rIn.ReadUniOrByteString( rMemChart.pRowText[ i ], rIn.GetStreamCharSet() );
/*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 4d4674e..2ecbccf 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.ReadByteString( aSoundFileRel, eTextEnc );
+/*N*/ rIn.ReadUniOrByteString( 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.ReadByteString( aBookmarkRel, eTextEnc );
+/*N*/ rIn.ReadUniOrByteString( 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.ReadByteString( aBookmark, eTextEnc );
+/*N*/ rIn.ReadUniOrByteString( aBookmark, eTextEnc );
/*N*/
/*N*/ String aSecondSoundFileRel;
-/*N*/ rIn.ReadByteString( aSecondSoundFileRel, eTextEnc );
+/*N*/ rIn.ReadUniOrByteString( 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 7de8205..3a29663 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.WriteByteString(rCustomShow.aName,
+/*N*/ rOut.WriteUniOrByteString(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.ReadByteString(rCustomShow.aName,
+/*N*/ rIn.ReadUniOrByteString(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 a2a7d59..2c6f008 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.WriteByteString( rDoc.aPresPage, eSysSet );
+ rOut.WriteUniOrByteString( 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.ReadByteString( rDoc.aPresPage, eSysSet );
+ rIn.ReadUniOrByteString( 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 192e84a..dbbb28d 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.ReadByteString( aLayoutName );
+ rIn.ReadUniOrByteString( aLayoutName, rIn.GetStreamCharSet() );
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.ReadByteString( aSoundFileRel );
+ rIn.ReadUniOrByteString( aSoundFileRel, rIn.GetStreamCharSet() );
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.ReadByteString( aFileNameRel );
+ rIn.ReadUniOrByteString( aFileNameRel, rIn.GetStreamCharSet() );
INetURLObject aURLObj(::binfilter::StaticBaseUrl::SmartRelToAbs(aFileNameRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
aFileName = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
- rIn.ReadByteString( aBookmarkName );
+ rIn.ReadUniOrByteString( aBookmarkName, rIn.GetStreamCharSet() );
}
// 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 3f87ee9..f278456 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->ReadByteString( pItem->aName );
+/*N*/ pStream->ReadUniOrByteString( pItem->aName, pStream->GetStreamCharSet() );
/*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 45c3377..1a8ab80 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;
-/*?*/ 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);
+/*?*/ 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);
/*?*/ }
/*?*/ else
/*?*/ {
/*?*/ String aInput;
/*?*/ rStream >> nAppBasic;
-/*?*/ 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);
+/*?*/ 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);
/*?*/
/*?*/ if ( nFileVersion == nCompatVersion )
/*?*/ rInfo.aMethodName = aInput;
@@ -131,18 +131,18 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
/*?*/ {
/*?*/ rStream << nVersion
/*?*/ << (sal_uInt16) rInfo.bAppBasic;
-/*?*/ rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
-/*?*/ rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
-/*?*/ rStream.WriteByteString(rInfo.aMethodName,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);
/*?*/ }
/*?*/ else
/*?*/ {
/*?*/ rStream << nVersion
/*?*/ << (sal_uInt16) rInfo.bAppBasic;
-/*?*/ 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);
+/*?*/ 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);
/*?*/ }
/*?*/
/*?*/ return rStream;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 2ca11c3..0d60989 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;
-/*?*/ rStrm.ReadByteString( pNew->aComment, RTL_TEXTENCODING_UTF8 );
-/*?*/ rStrm.ReadByteString( pNew->aName, RTL_TEXTENCODING_UTF8 );
+/*?*/ pNew->aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8);
+/*?*/ pNew->aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, 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 ef50be7..cb226ac 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.ReadByteString( aHeader ); //(dv??)
+/*N*/ rStream.ReadUniOrByteString( aHeader, rStream.GetStreamCharSet() ); //(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.ReadByteString( aTitle );
+/*N*/ rStream.ReadUniOrByteString( aTitle, rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCUSERKEY_LENMAX - aTitle.Len());
-/*N*/ rStream.ReadByteString( aWord );
+/*N*/ rStream.ReadUniOrByteString( aWord, rStream.GetStreamCharSet() );
/*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.ReadByteString( aTitle );
+/*N*/ rStream.ReadUniOrByteString( aTitle, rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCINFO_TITLELENMAX - aTitle.Len());
-/*N*/ rStream.ReadByteString( aTheme );
+/*N*/ rStream.ReadUniOrByteString( aTheme, rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCINFO_THEMELENMAX - aTheme.Len());
-/*N*/ rStream.ReadByteString( aComment );
+/*N*/ rStream.ReadUniOrByteString( aComment, rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCINFO_COMMENTLENMAX- aComment.Len());
-/*N*/ rStream.ReadByteString( aKeywords );
+/*N*/ rStream.ReadUniOrByteString( aKeywords, rStream.GetStreamCharSet() );
/*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.ReadByteString( aTemplateName );
-/*N*/ rStream.ReadByteString( aTemplateFileName );
+/*N*/ rStream.ReadUniOrByteString( aTemplateName, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( aTemplateFileName, rStream.GetStreamCharSet() );
/*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.ReadByteString( aDummyString );
+/*N*/ rStream.ReadUniOrByteString( aDummyString, rStream.GetStreamCharSet() );
/*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.ReadByteString( aReloadURL );
+/*N*/ rStream.ReadUniOrByteString( aReloadURL, rStream.GetStreamCharSet() );
/*N*/ rStream >> nReloadSecs;
-/*N*/ rStream.ReadByteString( aDefaultTarget );
+/*N*/ rStream.ReadUniOrByteString( aDefaultTarget, rStream.GetStreamCharSet() );
/*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.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.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 >> pImp->nPriority;
/*N*/ }
/*N*/ if ( aHeader.nVersion > 9 )
/*N*/ {
-/*N*/ rStream.ReadByteString( pImp->aSpecialMimeType );
+/*N*/ rStream.ReadUniOrByteString( pImp->aSpecialMimeType, rStream.GetStreamCharSet() );
/*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 7436d12..f70f6f0 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.ReadByteString( m_sModifiedByName, eConvertCharSet );
+ rStream.ReadUniOrByteString( 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 146f8d7..bc20fb2 100644
--- a/binfilter/bf_so3/source/inplace/applet2.cxx
+++ b/binfilter/bf_so3/source/inplace/applet2.cxx
@@ -625,9 +625,12 @@ BOOL SvAppletObject::Load
if( nVer == APPLET_VERS )
{
*xStm >> pImpl->aCmdList;
- xStm->ReadByteString( pImpl->aClass, RTL_TEXTENCODING_ASCII_US );
- xStm->ReadByteString( pImpl->aName, RTL_TEXTENCODING_ASCII_US );
- xStm->ReadByteString( pImpl->aCodeBase, RTL_TEXTENCODING_ASCII_US );
+ 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 >> pImpl->bMayScript;
}
else
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index 9f60852..836ee2f 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;
- xStm->ReadByteString( aURL, RTL_TEXTENCODING_ASCII_US );
+ String aURL = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ RTL_TEXTENCODING_ASCII_US);
pURL = new INetURLObject( aURL );
// Ignore, not necessary
BOOL bStrict;
@@ -728,15 +728,15 @@ BOOL SvPlugInObject::Load
}
else
{
- String aURL;
- xStm->ReadByteString( aURL, RTL_TEXTENCODING_ASCII_US );
+ String aURL = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ RTL_TEXTENCODING_ASCII_US);
pURL = new INetURLObject(
::binfilter::StaticBaseUrl::RelToAbs( aURL ));
}
}
- String aMimeType;
- xStm->ReadByteString( aMimeType, RTL_TEXTENCODING_ASCII_US );
+ String aMimeType = read_lenPrefixed_uInt8s_ToOUString(*xStm,
+ 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 bbe370c..0dfc683 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.ReadByteString( aStorName, osl_getThreadTextEncoding() );
- rStm.ReadByteString( aObjName, osl_getThreadTextEncoding() );
+ rStm.ReadUniOrByteString( aStorName, osl_getThreadTextEncoding() );
+ rStm.ReadUniOrByteString( 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 116de4a..cf84f9f 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->ReadByteString(aBuffer, eEnc);
-/*?*/ pSvStream->ReadByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
/*?*/ *pSvStream >> lDate >> lTime;
-/*?*/ pSvStream->ReadByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
/*?*/ *pSvStream >> lDate >> lTime;
-/*?*/ pSvStream->ReadByteString(aBuffer, eEnc);
+/*?*/ pSvStream->ReadUniOrByteString(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->ReadByteString(aTmp, eEnc);
+/*N*/ pSvStream->ReadUniOrByteString(aTmp, eEnc);
/*N*/ *pSvStream >> n;
/*N*/ break;
/*N*/ }
@@ -661,12 +661,12 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
case 'D':
{
- pSvStream->ReadByteString(aBuffer, eEnc);
- pSvStream->ReadByteString(aBuffer, eEnc);
+ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
*pSvStream >> lDate >> lTime;
- pSvStream->ReadByteString(aBuffer, eEnc);
+ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
*pSvStream >> lDate >> lTime;
- pSvStream->ReadByteString(aBuffer, eEnc);
+ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
}
break;
@@ -682,7 +682,7 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
{
String aTmp;
USHORT n;
- pSvStream->ReadByteString(aTmp, eEnc);
+ pSvStream->ReadUniOrByteString(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 47d5d91..ae318c4 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.ReadByteString(aName, eEnc );
- rStream.ReadByteString(aParent, eEnc );
- rStream.ReadByteString(aFollow, eEnc );
+ rStream.ReadUniOrByteString(aName, eEnc );
+ rStream.ReadUniOrByteString(aParent, eEnc );
+ rStream.ReadUniOrByteString(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.ReadByteString(aName, eEnc );
- rStream.ReadByteString(aParent, eEnc );
- rStream.ReadByteString(aFollow, eEnc );
+ rStream.ReadUniOrByteString(aName, eEnc );
+ rStream.ReadUniOrByteString(aParent, eEnc );
+ rStream.ReadUniOrByteString(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 7f5cf08..75d97e4 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.ReadByteString(sTmp);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list