[Libreoffice-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
Fri Jan 6 01:53:21 PST 2012
binfilter/bf_basic/source/basmgr/basmgr.cxx | 15 ++----
binfilter/bf_basic/source/classes/image.cxx | 11 +----
binfilter/bf_basic/source/classes/sbxmod.cxx | 4 -
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 | 5 --
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 | 17 +++----
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 | 8 +--
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 | 5 --
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 18 ++++----
binfilter/bf_sch/source/core/sch_memchrt.cxx | 14 +++---
binfilter/bf_sd/source/core/sd_anminfo.cxx | 11 +----
binfilter/bf_sd/source/core/sd_cusshow.cxx | 2
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 2
binfilter/bf_sd/source/core/sd_sdpage2.cxx | 10 +---
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 4 -
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 43 +++++++++-----------
binfilter/bf_sfx2/source/doc/timestamp.cxx | 2
binfilter/bf_so3/source/persist/persist.cxx | 4 -
binfilter/bf_starmath/source/starmath_document.cxx | 22 ++++------
binfilter/bf_svtools/source/items/svt_style.cxx | 12 ++---
binfilter/bf_svtools/source/items1/svt_bintitem.cxx | 3 -
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 5 --
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 2
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 6 +-
binfilter/bf_svx/source/items/svx_bulitem.cxx | 7 +--
binfilter/bf_svx/source/items/svx_flditem.cxx | 12 ++---
binfilter/bf_svx/source/items/svx_frmitems.cxx | 5 --
binfilter/bf_svx/source/items/svx_numitem.cxx | 6 +-
binfilter/bf_svx/source/items/svx_pageitem.cxx | 3 -
binfilter/bf_svx/source/items/svx_textitem.cxx | 8 +--
binfilter/bf_svx/source/outliner/svx_outlobj.cxx | 3 -
binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx | 4 -
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 | 4 -
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 | 3 -
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 9 +---
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 3 -
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 34 ++++++---------
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 5 --
binfilter/inc/bf_sc/global.hxx | 6 +-
binfilter/inc/bf_svtools/ownlist.hxx | 4 -
71 files changed, 231 insertions(+), 266 deletions(-)
New commits:
commit cc3eddde7886e7b5e8512395c925482494b2947b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 6 08:50:11 2012 +0000
make ReadUniOrByteString return a string
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 3ff8ba1..c551b55 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -609,18 +609,15 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
pInfo->bDoLoad = bDoLoad;
// Den Namen der Lib...
- String aName;
- rSStream.ReadUniOrByteString(aName, rSStream.GetStreamCharSet());
+ String aName = rSStream.ReadUniOrByteString(rSStream.GetStreamCharSet());
pInfo->SetLibName( aName );
// Absoluter Pfad....
- String aStorageName;
- rSStream.ReadUniOrByteString(aStorageName, rSStream.GetStreamCharSet());
+ String aStorageName = rSStream.ReadUniOrByteString(rSStream.GetStreamCharSet());
pInfo->SetStorageName( aStorageName );
// Relativer Pfad...
- String aRelStorageName;
- rSStream.ReadUniOrByteString(aRelStorageName, rSStream.GetStreamCharSet());
+ String aRelStorageName = rSStream.ReadUniOrByteString(rSStream.GetStreamCharSet());
pInfo->SetRelStorageName( aRelStorageName );
if ( nVer >= 2 )
@@ -1039,8 +1036,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
// und es geht weiter...
}
xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 als Trenner
- String aLibs;
- xManagerStream->ReadUniOrByteString(aLibs, xManagerStream->GetStreamCharSet());
+ String aLibs = xManagerStream->ReadUniOrByteString(xManagerStream->GetStreamCharSet());
xManagerStream->SetBufferSize( 0 );
xManagerStream.Clear(); // Sream schliessen
@@ -1222,8 +1218,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
*xBasicStream >> nPasswordMarker;
if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() )
{
- String aPassword;
- xBasicStream->ReadUniOrByteString(aPassword, xBasicStream->GetStreamCharSet());
+ String aPassword = xBasicStream->ReadUniOrByteString(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 776e4bd..1b6a796 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -128,24 +128,21 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
switch( nSign )
{
case B_NAME:
- r.ReadUniOrByteString( aName, eCharSet );
+ aName = r.ReadUniOrByteString( eCharSet );
break;
case B_COMMENT:
- r.ReadUniOrByteString( aComment, eCharSet );
+ aComment = r.ReadUniOrByteString( eCharSet );
break;
case B_SOURCE:
{
- String aTmp;
- r.ReadUniOrByteString( aTmp, eCharSet );
- aOUSource = aTmp;
+ aOUSource = r.ReadUniOrByteString( eCharSet );
break;
}
case B_EXTSOURCE:
{
for( UINT16 j = 0 ; j < nCount ; j++ )
{
- String aTmp;
- r.ReadUniOrByteString( aTmp, eCharSet );
+ String aTmp = r.ReadUniOrByteString( eCharSet );
aOUSource += aTmp;
}
break;
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index d64d352..f5b6be5 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -607,9 +607,7 @@ BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
return FALSE;
// Source-String holen
- String aTmp;
- rStrm.ReadUniOrByteString( aTmp, osl_getThreadTextEncoding() );
- aOUSource = aTmp;
+ aOUSource = rStrm.ReadUniOrByteString( osl_getThreadTextEncoding() );
return TRUE;
}
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 678e46d..8ccfe99 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*/ aErgString = rStream.ReadUniOrByteString( 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..06844cb 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*/ aString = rStream.ReadUniOrByteString( 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..2222965 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() );
+/*?*/ aStrVal1 = rStream.ReadUniOrByteString( 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() );
+/*?*/ aStrVal2 = rStream.ReadUniOrByteString( 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*/ aStyleName = rStream.ReadUniOrByteString( 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..14b4809 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -534,10 +534,9 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
/*N*/ ScReadHeader aFlagsHdr( rStream );
/*N*/
/*N*/ rStream >> nVersion; // 312 abwaerts
-/*N*/ rStream.ReadUniOrByteString( aPageStyle, rStream.GetStreamCharSet() );
+/*N*/ aPageStyle = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ rStream >> bProtected; // Dokument geschuetzt
-/*N*/ String aPass;
-/*N*/ rStream.ReadUniOrByteString( aPass, rStream.GetStreamCharSet() );
+/*N*/ String aPass = rStream.ReadUniOrByteString( 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..107c1da 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*/ pImpDesc->aDBName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImpDesc->aObject = rStream.ReadUniOrByteString( 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*/ aServiceName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aParSource = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aParName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aParUser = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aParPass = rStream.ReadUniOrByteString( 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*/ aTableName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aTableTag = rStream.ReadUniOrByteString( 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..44d0038 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*/ aName = rStream.ReadUniOrByteString( 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*/ aName = rStream.ReadUniOrByteString( 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..9291831 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*/ *pStr = rStream.ReadUniOrByteString( 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..59e85a9 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*/ *pStr = rStream.ReadUniOrByteString( 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..b56e261 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*/ aName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aTag = rStream.ReadUniOrByteString( 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*/ pColNames[nCol] = rStream.ReadUniOrByteString( 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..2b43997 100644
--- a/binfilter/bf_sc/source/core/data/sc_table2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx
@@ -1509,14 +1509,13 @@ BOOL ScTable::IsSelectionEditable(
/*N*/ {
/*N*/ ScReadHeader aFlagsHdr( rStream );
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
+/*N*/ aName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/
/*N*/ rStream >> bScenario;
-/*N*/ rStream.ReadUniOrByteString( aComment, rStream.GetStreamCharSet() );
+/*N*/ aComment = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/
/*N*/ rStream >> bProtected;
-/*N*/ String aPass;
-/*N*/ rStream.ReadUniOrByteString( aPass, rStream.GetStreamCharSet() );
+/*N*/ String aPass = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ if (aPass.Len())
/*N*/ SvPasswordHelper::GetHashPassword(aProtectPass, aPass);
/*N*/
@@ -1533,7 +1532,7 @@ BOOL ScTable::IsSelectionEditable(
/*N*/ SfxStyleSheetBasePool* pStylePool =
/*N*/ pDocument->GetStyleSheetPool();
/*N*/
-/*N*/ rStream.ReadUniOrByteString( aPageStyle, rStream.GetStreamCharSet() );
+/*N*/ aPageStyle = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/
/*N*/ if ( !pStylePool->Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ) )
/*N*/ {
@@ -1601,10 +1600,10 @@ BOOL ScTable::IsSelectionEditable(
/*N*/ ScReadHeader aLinkHdr( rStream );
/*N*/
/*N*/ rStream >> nLinkMode;
-/*N*/ rStream.ReadUniOrByteString( aLinkDoc, rStream.GetStreamCharSet() );
+/*N*/ aLinkDoc = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ aLinkDoc = ::binfilter::StaticBaseUrl::RelToAbs( aLinkDoc );
-/*N*/ rStream.ReadUniOrByteString( aLinkFlt, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aLinkTab, rStream.GetStreamCharSet() );
+/*N*/ aLinkFlt = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aLinkTab = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/
/*N*/ BOOL bRelURL;
/*N*/ if ( aLinkHdr.BytesLeft() )
@@ -1616,7 +1615,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*/ aLinkOpt = rStream.ReadUniOrByteString( 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..9659ceb 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*/ aInputTitle = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aInputMessage = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ rStream >> bShowError;
-/*N*/ rStream.ReadUniOrByteString( aErrorTitle, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aErrorMessage, rStream.GetStreamCharSet() );
+/*N*/ aErrorTitle = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aErrorMessage = rStream.ReadUniOrByteString( 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..e911df3 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*/ aName = rStream.ReadUniOrByteString( 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*/ aName = rStream.ReadUniOrByteString( 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..1ea6124 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*/ aName = rStream.ReadUniOrByteString( 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..ce2fd90 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*/ aComment = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/ // LinkEntries in zweiter Runde
/*N*/ }
@@ -1352,9 +1352,9 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ pNextInSlot( NULL ),
/*N*/ ppPrevInSlot( NULL )
/*N*/ {
-/*N*/ UINT32 n32; // Changetracking.sdc
-/*N*/ rStrm.ReadUniOrByteString( aOldValue, rStrm.GetStreamCharSet() );
-/*N*/ rStrm.ReadUniOrByteString( aNewValue, rStrm.GetStreamCharSet() );
+/*N*/ UINT32 n32; // Changetracking.sdc
+/*N*/ aOldValue = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
+/*N*/ aNewValue = rStrm.ReadUniOrByteString( 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..8ddb4ba 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*/ aAuthorToShow = rStream.ReadUniOrByteString( 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*/ aComment = rStream.ReadUniOrByteString( 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..9c19d1d 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*/ aStr = rStream.ReadUniOrByteString( 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..7a6f34c 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*/ aName = rStream.ReadUniOrByteString( 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*/ aDBName = rStream.ReadUniOrByteString( eCharSet );
+/*N*/ aDBStatement = rStream.ReadUniOrByteString( 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*/ *pQueryStr[i] = rStream.ReadUniOrByteString( 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..c2e4c8f 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*/ aAppl = rStream.ReadUniOrByteString( eCharSet );
+/*N*/ aTopic = rStream.ReadUniOrByteString( eCharSet );
+/*N*/ aItem = rStream.ReadUniOrByteString( 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..101e07f 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*/ aName = rStream.ReadUniOrByteString( 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*/ aName = rStream.ReadUniOrByteString( 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..4a5bb44 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*/ aMatStr = rStream.ReadUniOrByteString( 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..fc6581f 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*/ aStr = rStream.ReadUniOrByteString( 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..2094a77 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*/ rOpt.aGridColName = rStream.ReadUniOrByteString( 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..0f0c50e 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*/ sFormatstring = rStream.ReadUniOrByteString( 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..88b1c31 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -299,8 +299,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
if ( aWinStm.Is() && aWinStm->GetError() == ERRCODE_NONE )
{
aWinStm->SetBufferSize(1024);
- String aWinData;
- aWinStm->ReadUniOrByteString( aWinData, aWinStm->GetStreamCharSet() );
+ String aWinData = aWinStm->ReadUniOrByteString( aWinStm->GetStreamCharSet() );
if ( aWinData.Len() )
{
char cToken =',';
@@ -308,7 +307,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
+ aWinData = aWinStm->ReadUniOrByteString( 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 b096f5c..1de45ba 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -1370,15 +1370,15 @@ enum ChartStyleV0
/*N*/ BOOL bShowZDescr;
/*N*/
/*N*/ rIn >> bShowMainTitle;
-/*N*/ rIn.ReadUniOrByteString( aMainTitle, rIn.GetStreamCharSet() );
+/*N*/ aMainTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowSubTitle;
-/*N*/ rIn.ReadUniOrByteString( aSubTitle, rIn.GetStreamCharSet() );
+/*N*/ aSubTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowXAxisTitle;
-/*N*/ rIn.ReadUniOrByteString( aXAxisTitle, rIn.GetStreamCharSet() );
+/*N*/ aXAxisTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowYAxisTitle;
-/*N*/ rIn.ReadUniOrByteString( aYAxisTitle, rIn.GetStreamCharSet() );
+/*N*/ aYAxisTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
/*N*/ rIn >> bShowZAxisTitle;
-/*N*/ rIn.ReadUniOrByteString( aZAxisTitle, rIn.GetStreamCharSet() );
+/*N*/ aZAxisTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
/*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*/ pChartData->SomeData1() = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
+/*N*/ pChartData->SomeData2() = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
+/*N*/ pChartData->SomeData3() = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
+/*N*/ pChartData->SomeData4() = rIn.ReadUniOrByteString( 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 a7db746..524c31e 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -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*/ rMemChart.aMainTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
+/*N*/ rMemChart.aSubTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
+/*N*/ rMemChart.aXAxisTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
+/*N*/ rMemChart.aYAxisTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
+/*N*/ rMemChart.aZAxisTitle = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
/*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*/ rMemChart.pColText[ i ] = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
/*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*/ rMemChart.pRowText[ i ] = rIn.ReadUniOrByteString( 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 2ecbccf..049db00 100644
--- a/binfilter/bf_sd/source/core/sd_anminfo.cxx
+++ b/binfilter/bf_sd/source/core/sd_anminfo.cxx
@@ -192,8 +192,7 @@ using namespace ::com::sun::star;
/*N*/ // #unicode# eTextEnc = (rtl_TextEncoding)nCharSet;
/*N*/ eTextEnc = (rtl_TextEncoding)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion());
/*N*/
-/*N*/ String aSoundFileRel;
-/*N*/ rIn.ReadUniOrByteString( aSoundFileRel, eTextEnc );
+/*N*/ String aSoundFileRel = rIn.ReadUniOrByteString( 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 ));
@@ -233,18 +232,16 @@ using namespace ::com::sun::star;
/*N*/ eClickAction == presentation::ClickAction_VANISH ||
/*N*/ eClickAction == presentation::ClickAction_SOUND)
/*N*/ {
-/*N*/ String aBookmarkRel;
-/*N*/ rIn.ReadUniOrByteString( aBookmarkRel, eTextEnc );
+/*N*/ String aBookmarkRel = rIn.ReadUniOrByteString( 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*/ aBookmark = rIn.ReadUniOrByteString( eTextEnc );
/*N*/
-/*N*/ String aSecondSoundFileRel;
-/*N*/ rIn.ReadUniOrByteString( aSecondSoundFileRel, eTextEnc );
+/*N*/ String aSecondSoundFileRel = rIn.ReadUniOrByteString( 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..8113e4c 100644
--- a/binfilter/bf_sd/source/core/sd_cusshow.cxx
+++ b/binfilter/bf_sd/source/core/sd_cusshow.cxx
@@ -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*/ rCustomShow.aName = rIn.ReadUniOrByteString(
/*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..b14cdd9 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -614,7 +614,7 @@ SvStream& operator >> (SvStream& rIn, SdDrawDocument& rDoc)
if (rDoc.nFileFormatVersion >= 10)
{
- rIn.ReadUniOrByteString( rDoc.aPresPage, eSysSet );
+ rDoc.aPresPage = rIn.ReadUniOrByteString(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..8a374cf 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() );
+ aLayoutName = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
if (IsObjOrdNumsDirty())
RecalcObjOrdNums();
@@ -154,8 +154,7 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
// #90477# eCharSet = (CharSet) nCharSet;
eCharSet = (CharSet)GetSOLoadTextEncoding((rtl_TextEncoding)nCharSet, (sal_uInt16)rIn.GetVersion());
- String aSoundFileRel;
- rIn.ReadUniOrByteString( aSoundFileRel, rIn.GetStreamCharSet() );
+ String aSoundFileRel = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
INetURLObject aURLObj(::binfilter::StaticBaseUrl::SmartRelToAbs(aSoundFileRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
@@ -165,14 +164,13 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
// ab hier werden Daten der Versionen >=4 eingelesen
if (aIO.GetVersion() >=4)
{
- String aFileNameRel;
- rIn.ReadUniOrByteString( aFileNameRel, rIn.GetStreamCharSet() );
+ String aFileNameRel = rIn.ReadUniOrByteString( rIn.GetStreamCharSet() );
INetURLObject aURLObj(::binfilter::StaticBaseUrl::SmartRelToAbs(aFileNameRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
aFileName = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
- rIn.ReadUniOrByteString( aBookmarkName, rIn.GetStreamCharSet() );
+ aBookmarkName = rIn.ReadUniOrByteString( 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 f278456..5ead184 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -396,8 +396,8 @@ static const char pStorageName[] = "Configurations";
/*N*/ // retrieve type of item and human readable name
/*N*/ long lLength, lPos; // dummies
/*N*/ (*pStream) >> pItem->nType >> lPos >> lLength;
-/*N*/ pItem->bDefault = ( lPos == -1L );
-/*N*/ pStream->ReadUniOrByteString( pItem->aName, pStream->GetStreamCharSet() );
+/*N*/ pItem->bDefault = ( lPos == -1L );
+/*N*/ pItem->aName = pStream->ReadUniOrByteString( pStream->GetStreamCharSet() );
/*N*/ if ( pStream->GetError() )
/*N*/ {
/*?*/ pItem->bDefault = TRUE;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index cb226ac..850e15a 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*/ aHeader = rStream.ReadUniOrByteString( 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.ReadUniOrByteString( aTitle, rStream.GetStreamCharSet() );
+/*N*/ aTitle = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCUSERKEY_LENMAX - aTitle.Len());
-/*N*/ rStream.ReadUniOrByteString( aWord, rStream.GetStreamCharSet() );
+/*N*/ aWord = rStream.ReadUniOrByteString( 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.ReadUniOrByteString( aTitle, rStream.GetStreamCharSet() );
+/*N*/ aTitle = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCINFO_TITLELENMAX - aTitle.Len());
-/*N*/ rStream.ReadUniOrByteString( aTheme, rStream.GetStreamCharSet() );
+/*N*/ aTheme = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCINFO_THEMELENMAX - aTheme.Len());
-/*N*/ rStream.ReadUniOrByteString( aComment, rStream.GetStreamCharSet() );
+/*N*/ aComment = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ Skip(rStream, SFXDOCINFO_COMMENTLENMAX- aComment.Len());
-/*N*/ rStream.ReadUniOrByteString( aKeywords, rStream.GetStreamCharSet() );
+/*N*/ aKeywords = rStream.ReadUniOrByteString( 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.ReadUniOrByteString( aTemplateName, rStream.GetStreamCharSet() );
-/*N*/ rStream.ReadUniOrByteString( aTemplateFileName, rStream.GetStreamCharSet() );
+/*N*/ aTemplateName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ aTemplateFileName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ rStream >> d >> t;
/*N*/ aTemplateDate = DateTime(Date(d), Time(t));
/*N*/
@@ -464,9 +464,8 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ rStream >> nMailAddr;
/*N*/ for( i = 0; i < nMailAddr; i++ )
/*N*/ {
-/*N*/ String aDummyString;
/*N*/ USHORT nDummyFlags;
-/*N*/ rStream.ReadUniOrByteString( aDummyString, rStream.GetStreamCharSet() );
+/*N*/ rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ rStream >> nDummyFlags;
/*N*/ }
/*N*/ }
@@ -489,9 +488,9 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ if( aHeader.nVersion > 5 )
/*N*/ {
/*N*/ rStream >> bReloadEnabled;
-/*N*/ rStream.ReadUniOrByteString( aReloadURL, rStream.GetStreamCharSet() );
+/*N*/ aReloadURL = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ rStream >> nReloadSecs;
-/*N*/ rStream.ReadUniOrByteString( aDefaultTarget, rStream.GetStreamCharSet() );
+/*N*/ aDefaultTarget = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/
/*N*/ if ( !TestValidity_Impl( aReloadURL, sal_True ) )
/*N*/ {
@@ -520,19 +519,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*/ pImp->aCopiesTo = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImp->aOriginal = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImp->aReferences = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImp->aRecipient = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImp->aReplyTo = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImp->aBlindCopies = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImp->aInReplyTo = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
+/*N*/ pImp->aNewsgroups = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*N*/ rStream >> pImp->nPriority;
/*N*/ }
/*N*/ if ( aHeader.nVersion > 9 )
/*N*/ {
-/*N*/ rStream.ReadUniOrByteString( pImp->aSpecialMimeType, rStream.GetStreamCharSet() );
+/*N*/ pImp->aSpecialMimeType = rStream.ReadUniOrByteString( 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 f70f6f0..90ed421 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 );
+ m_sModifiedByName = rStream.ReadUniOrByteString( eConvertCharSet );
// Skip name in stream.
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 0dfc683..20c112e 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() );
+ aStorName = rStm.ReadUniOrByteString( osl_getThreadTextEncoding() );
+ aObjName = rStm.ReadUniOrByteString( 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 e13e5ee..f603295 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);
+/*?*/ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
+/*?*/ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
/*?*/ *pSvStream >> lDate >> lTime;
-/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+/*?*/ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
/*?*/ *pSvStream >> lDate >> lTime;
-/*?*/ pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+/*?*/ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
/*?*/ break;
/*N*/
/*N*/ case 'F':
@@ -584,9 +584,8 @@ BOOL SmDocShell::Load(SvStorage *pStor)
/*N*/
/*N*/ case 'S':
/*N*/ {
-/*N*/ String aTmp;
/*N*/ USHORT n;
-/*N*/ pSvStream->ReadUniOrByteString(aTmp, eEnc);
+/*N*/ pSvStream->ReadUniOrByteString(eEnc);
/*N*/ *pSvStream >> n;
/*N*/ break;
/*N*/ }
@@ -661,12 +660,12 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
case 'D':
{
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
+ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
*pSvStream >> lDate >> lTime;
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
*pSvStream >> lDate >> lTime;
- pSvStream->ReadUniOrByteString(aBuffer, eEnc);
+ aBuffer = pSvStream->ReadUniOrByteString(eEnc);
}
break;
@@ -680,9 +679,8 @@ BOOL SmDocShell::Try2x (SvStorage *pStor,
case 'S':
{
- String aTmp;
USHORT n;
- pSvStream->ReadUniOrByteString(aTmp, eEnc);
+ pSvStream->ReadUniOrByteString(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..71da24a 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 );
+ aName = rStream.ReadUniOrByteString(eEnc );
+ aParent = rStream.ReadUniOrByteString(eEnc );
+ aFollow = rStream.ReadUniOrByteString(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 );
+ aName = rStream.ReadUniOrByteString(eEnc );
+ aParent = rStream.ReadUniOrByteString(eEnc );
+ aFollow = rStream.ReadUniOrByteString(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..562ce3b 100644
--- a/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_bintitem.cxx
@@ -58,8 +58,7 @@ SfxBigIntItem::SfxBigIntItem(USHORT which, SvStream &rStream)
: SfxPoolItem(which)
{
DBG_CTOR(SfxBigIntItem, 0);
- UniString sTmp;
- rStream.ReadUniOrByteString(sTmp, rStream.GetStreamCharSet());
+ UniString sTmp = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
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..77d2f28 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());
+ rString = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
return rStream.GetError() == ERRCODE_NONE;
}
@@ -223,8 +223,7 @@ bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString)
bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString,
bool bUnicode)
{
- rStream.ReadUniOrByteString(rString,
- bUnicode ? RTL_TEXTENCODING_UCS2 :
+ rString = rStream.ReadUniOrByteString(bUnicode ? RTL_TEXTENCODING_UCS2 :
rStream.GetStreamCharSet());
return rStream.GetError() == ERRCODE_NONE;
}
diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index 250133e..7b5c958 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() );
+ sColorName = rStream.ReadUniOrByteString( 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 55ac6dc..179d318 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() = rtl::OStringToOUString(aByteString, eSrcEncoding);
// StyleName und Family...
- rIStream.ReadUniOrByteString( pC->GetStyle(), eSrcEncoding );
+ pC->GetStyle() = rIStream.ReadUniOrByteString( eSrcEncoding );
USHORT nStyleFamily;
rIStream >> nStyleFamily;
pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
@@ -960,11 +960,11 @@ void BinTextObject::CreateData300( SvStream& rIStream )
ContentInfo* pC = CreateAndInsertContent();
// Der Text...
- rIStream.ReadUniOrByteString( pC->GetText(),
+ pC->GetText() = rIStream.ReadUniOrByteString(
rIStream.GetStreamCharSet() );
// StyleName und Family...
- rIStream.ReadUniOrByteString( pC->GetStyle(),
+ pC->GetStyle() = rIStream.ReadUniOrByteString(
rIStream.GetStreamCharSet() );
USHORT nStyleFamily;
rIStream >> nStyleFamily;
diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx
index abd3f2f..1a354ab 100644
--- a/binfilter/bf_svx/source/items/svx_bulitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx
@@ -68,8 +68,7 @@ namespace binfilter {
/*N*/ rStream >> nTemp; aFont.SetItalic((FontItalic)nTemp);
/*N*/
/*N*/ // UNICODE: rStream >> aName; aFont.SetName( aName );
-/*N*/ String aName;
-/*N*/ rStream.ReadUniOrByteString(aName, rStream.GetStreamCharSet());
+/*N*/ String aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
/*N*/ aFont.SetName( aName );
/*N*/
/*N*/ if( nVer == 1 )
@@ -154,10 +153,10 @@ namespace binfilter {
/*N*/ rStrm >> nScale;
/*N*/
/*N*/ // UNICODE: rStrm >> aPrevText;
-/*N*/ rStrm.ReadUniOrByteString(aPrevText, rStrm.GetStreamCharSet());
+/*N*/ aPrevText = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
/*N*/
/*N*/ // UNICODE: rStrm >> aFollowText;
-/*N*/ rStrm.ReadUniOrByteString(aFollowText, rStrm.GetStreamCharSet());
+/*N*/ aFollowText = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
/*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 4a52407..6b19b25 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*/ aTmpURL = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
/*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*/ aTargetFrame = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
/*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*/ aFile = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
/*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*/ aName = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
/*N*/
/*N*/ // UNICODE: rStm >> aFirstName;
-/*N*/ rStm.ReadUniOrByteString(aFirstName, rStm.GetStreamCharSet());
+/*N*/ aFirstName = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
/*N*/
/*N*/ // UNICODE: rStm >> aShortName;
-/*N*/ rStm.ReadUniOrByteString(aShortName, rStm.GetStreamCharSet());
+/*N*/ aShortName = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
/*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..688125f 100644
--- a/binfilter/bf_svx/source/items/svx_frmitems.cxx
+++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx
@@ -1962,9 +1962,8 @@ public:
/*N*/
/*N*/ if ( nDoLoad & LOAD_LINK )
/*N*/ {
-/*N*/ String aRel;
/*N*/ // UNICODE: rStream >> aRel;
-/*N*/ rStream.ReadUniOrByteString(aRel, rStream.GetStreamCharSet());
+/*N*/ String aRel = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
/*N*/
/*N*/ String aAbs = ::binfilter::StaticBaseUrl::RelToAbs( aRel );
/*N*/ pStrLink = new String( aAbs );
@@ -1974,7 +1973,7 @@ public:
/*N*/ {
/*N*/ pStrFilter = new String;
/*N*/ // UNICODE: rStream >> *pStrFilter;
-/*N*/ rStream.ReadUniOrByteString(*pStrFilter, rStream.GetStreamCharSet());
+/*N*/ *pStrFilter = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
/*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..ed73966 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*/ sPrefix = rStream.ReadUniOrByteString(eEnc);
+/*N*/ sSuffix = rStream.ReadUniOrByteString(eEnc);
+/*N*/ sCharStyleName = rStream.ReadUniOrByteString(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..ca3ac1f 100644
--- a/binfilter/bf_svx/source/items/svx_pageitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_pageitem.cxx
@@ -200,13 +200,12 @@ using namespace ::com::sun::star;
/*N*/ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const
/*N*/ {
-/*N*/ XubString sStr;
/*N*/ BYTE eType;
/*N*/ sal_Bool bLand;
/*N*/ USHORT nUse;
/*N*/
/*N*/ // UNICODE: rStream >> sStr;
-/*N*/ rStream.ReadUniOrByteString( sStr, rStream.GetStreamCharSet() );
+/*N*/ String sStr = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
/*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..814cb9c 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*/ aName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
/*N*/
/*N*/ // UNICODE: rStrm >> aStyle;
-/*N*/ rStrm.ReadUniOrByteString(aStyle, rStrm.GetStreamCharSet());
+/*N*/ aStyle = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
/*N*/
/*N*/ // Task 91008/90471: set the "correct" textencoding
/*N*/ eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding, (USHORT)rStrm.GetVersion() );
@@ -345,8 +345,8 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ rStrm >> nMagic;
/*N*/ if ( nMagic == STORE_UNICODE_MAGIC_MARKER )
/*N*/ {
-/*N*/ rStrm.ReadUniOrByteString( aName, RTL_TEXTENCODING_UNICODE );
-/*N*/ rStrm.ReadUniOrByteString( aStyle, RTL_TEXTENCODING_UNICODE );
+/*N*/ aName = rStrm.ReadUniOrByteString( RTL_TEXTENCODING_UNICODE );
+/*N*/ aStyle = rStrm.ReadUniOrByteString( RTL_TEXTENCODING_UNICODE );
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
index 3f5cec3..c9feff4 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
@@ -151,8 +151,7 @@ namespace binfilter {
/*?*/ Color aColor;
/*?*/ rStream >> aColor;
/*?*/ rStream.SeekRel( 16 );
-/*?*/ String aName;
-/*?*/ rStream.ReadUniOrByteString(aName, rStream.GetStreamCharSet());
+/*?*/ rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
/*?*/ rStream.SeekRel( 12 );
/*?*/ }
/*?*/ long nDummy;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
index c8c54ec..e042663 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
@@ -140,7 +140,7 @@ namespace binfilter {
/*N*/ rIn >> rLayer.nID;
/*N*/
/*N*/ // UNICODE: rIn >> rLayer.aName;
-/*N*/ rIn.ReadUniOrByteString(rLayer.aName, rIn.GetStreamCharSet());
+/*N*/ rLayer.aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ if(aHead.GetVersion() >= 1)
/*N*/ {
@@ -189,7 +189,7 @@ namespace binfilter {
/*?*/ rIn >> rSet.aExclude;
/*?*/
/*?*/ // UNICODE: rIn >> rSet.aName;
-/*?*/ rIn.ReadUniOrByteString(rSet.aName, rIn.GetStreamCharSet());
+/*?*/ rSet.aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*?*/
/*?*/ return rIn;
/*?*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index b966e5b..3f720e3 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -1350,7 +1350,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // Tabellen- und Listennamen lesen (Tabellen/Listen existieren schon) // SOH!!!
/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ if(!bExtColorTable)
/*N*/ {
@@ -1362,31 +1362,31 @@ using namespace ::com::sun::star;
/*N*/ pColorTable->SetName(aName);
/*N*/ }
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ if(!aName.Len())
/*N*/ aName = pszStandard;
/*N*/ if(pDashList)
/*N*/ pDashList->SetName(aName);
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ if(!aName.Len())
/*N*/ aName = pszStandard;
/*N*/ if(pLineEndList)
/*N*/ pLineEndList->SetName(aName);
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ if(!aName.Len())
/*N*/ aName = pszStandard;
/*N*/ if(pHatchList)
/*N*/ pHatchList->SetName(aName);
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ if(!aName.Len())
/*N*/ aName = pszStandard;
/*N*/ if(pGradientList)
/*N*/ pGradientList->SetName(aName);
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ if(!aName.Len())
/*N*/ aName = pszStandard;
/*N*/ if(pBitmapList)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
index 02ffdab..92dee79 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
@@ -237,7 +237,7 @@ namespace binfilter {
/*N*/ sal_uInt16 nRead;
/*N*/
/*N*/ // UNICODE: rIn>>aStyleSheetName;
-/*N*/ rIn.ReadUniOrByteString(aStyleSheetName, rIn.GetStreamCharSet());
+/*N*/ aStyleSheetName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ if(aStyleSheetName.Len())
/*N*/ {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index 6c57ad9..7fb2101 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -924,13 +924,13 @@ namespace binfilter {
/*N*/ if(rHead.GetVersion() >= 8)
/*N*/ {
/*N*/ // UNICODE: rIn>>aFileName;
-/*N*/ rIn.ReadUniOrByteString(aFileName, rIn.GetStreamCharSet());
+/*N*/ aFileName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ }
/*N*/
/*N*/ if(rHead.GetVersion() >= 9)
/*N*/ {
/*N*/ // UNICODE: rIn >> aFilterName;
-/*N*/ rIn.ReadUniOrByteString(aFilterName, rIn.GetStreamCharSet());
+/*N*/ aFilterName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ }
/*N*/ else
/*?*/ aFilterName = String( RTL_CONSTASCII_USTRINGPARAM( "BMP - MS Windows" ) );
@@ -1028,7 +1028,7 @@ namespace binfilter {
/*N*/ rIn >> aCropRect;
/*N*/ rIn >> bTmp; bMirrored = bTmp;
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ // #85414# since there seems to be some documents wich have an illegal
/*N*/ // character inside the name of a graphic object we have to fix this
/*N*/ // here on load time or it will crash our xml later.
@@ -1039,7 +1039,7 @@ namespace binfilter {
/*?*/ aName.SetChar( nIndex, '?' );
/*N*/ }
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aFileNameRel, rIn.GetStreamCharSet());
+/*N*/ aFileNameRel = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ if( aFileNameRel.Len() )
/*N*/ {
@@ -1051,7 +1051,7 @@ namespace binfilter {
/*N*/ aFileName.Erase();
/*N*/
/*N*/ // UNICODE: rIn >> aFilterName;
-/*N*/ rIn.ReadUniOrByteString(aFilterName, rIn.GetStreamCharSet());
+/*N*/ aFilterName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ rIn >> bGraphicLink; // auch dieses Flag ist neu in V11
/*N*/
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index 881c951..3fc91ce 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -116,7 +116,7 @@ namespace binfilter {
/*N*/ UINT32 nTmp32;
/*N*/ String aFileNameRel;
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aFileNameRel, rIn.GetStreamCharSet());
+/*N*/ aFileNameRel = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ if( aFileNameRel.Len() )
/*N*/ {
@@ -128,7 +128,7 @@ namespace binfilter {
/*N*/ aFileName.Erase();
/*N*/
/*N*/ // UNICODE: rIn >> aObjName;
-/*N*/ rIn.ReadUniOrByteString(aObjName, rIn.GetStreamCharSet());
+/*N*/ aObjName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ rIn >> nTmp32; aFileDate0.SetDate(nTmp32);
/*N*/ rIn >> nTmp32; aFileDate0.SetTime(nTmp32);
@@ -679,7 +679,7 @@ namespace binfilter {
/*N*/ #endif
/*N*/
/*N*/ // UNICODE: rIn >> aName;
-/*N*/ rIn.ReadUniOrByteString(aName, rIn.GetStreamCharSet());
+/*N*/ aName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ UINT8 nTemp; rIn >> nTemp; bRefPoint = nTemp;
/*N*/ rIn >> aRefPoint;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
index 61c1e0a..80bafb5 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
@@ -483,10 +483,10 @@ void SdrOle2Obj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
#endif
// UNICODE: rIn >> mpImpl->aPersistName;
- rIn.ReadUniOrByteString(mpImpl->aPersistName, rIn.GetStreamCharSet());
+ mpImpl->aPersistName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
// UNICODE: rIn >> aProgName;
- rIn.ReadUniOrByteString(aProgName, rIn.GetStreamCharSet());
+ aProgName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
BOOL bObjRefValid;
rIn>>bObjRefValid;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx
index d3f134c..95a6fed 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx
@@ -176,7 +176,7 @@ namespace binfilter {
/*N*/ UINT16 nTmp16;
/*N*/ String aFileNameRel;
/*N*/
-/*N*/ rIn.ReadUniOrByteString(aFileNameRel, rIn.GetStreamCharSet());
+/*N*/ aFileNameRel = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ if( aFileNameRel.Len() )
/*N*/ {
@@ -189,7 +189,7 @@ namespace binfilter {
/*N*/ aFileName.Erase();
/*N*/
/*N*/ // UNICODE: rIn >> aFilterName;
-/*N*/ rIn.ReadUniOrByteString(aFilterName, rIn.GetStreamCharSet());
+/*N*/ aFilterName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ // #90477# rIn >> nTmp16; eCharSet = rtl_TextEncoding(nTmp16);
/*N*/ rIn >> nTmp16;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
index f275f56..4eea063 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
@@ -578,11 +578,11 @@ IMPL_LINK_INLINE_START(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,EMPTYARG
/*N*/ }
/*N*/ case SDRIORECNAME_VIEWAKTLAYER:
/*N*/ {
-/*N*/ rIn.ReadUniOrByteString(aAktLayer, rIn.GetStreamCharSet());
+/*N*/ aAktLayer = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ if(rSubHead.GetBytesLeft() > 0)
/*N*/ {
-/*N*/ rIn.ReadUniOrByteString(aMeasureLayer, rIn.GetStreamCharSet());
+/*N*/ aMeasureLayer = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ }
/*N*/ break;
/*N*/ }
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
index 0aa6119..ef7330a 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
@@ -257,7 +257,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ XOBitmap aXOBitmap;
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> aBmp;
@@ -284,7 +284,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ for( long nIndex = 0; nIndex < nCount; nIndex++ )
/*N*/ {
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/
@@ -332,7 +332,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
index c87daa0..8cbd863 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
@@ -545,7 +545,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ rIn >> nIndex;
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ rIn >> nRed;
@@ -570,7 +570,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ rIn >> nIndex;
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ /*if( aIOC.GetVersion() >= 0 )*/
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index 82e1311..b1f9441 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -336,7 +336,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ for (long nIndex = 0; nIndex < nCount; nIndex++)
/*N*/ {
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
@@ -361,7 +361,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
index 03e7867..d2fa5bf 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
@@ -308,7 +308,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ for (long nIndex = 0; nIndex < nCount; nIndex++)
/*N*/ {
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
@@ -346,7 +346,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ for (long nIndex = 0; nIndex < nCount; nIndex++)
/*N*/ {
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
@@ -387,7 +387,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index 512953c..ac75a4b 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -314,7 +314,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ for( long nIndex = 0; nIndex < nCount; nIndex++ )
/*N*/ {
/*N*/ // UNICODE:rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
@@ -342,7 +342,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ rIn >> nStyle;
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
index 224a362..57eaf72 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
@@ -333,7 +333,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ for( long nI = 0; nI < nCount; nI++ )
/*N*/ {
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/
/*N*/ aLclName = ConvertName( aLclName );
/*N*/ USHORT nPoints;
@@ -359,7 +359,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ for( long nI = 0; nI < nCount; nI++ )
/*N*/ {
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ XPolygon* pXPoly = new XPolygon;
@@ -378,7 +378,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XIOCompat aIOC( rIn, STREAM_READ );
/*N*/
/*N*/ // UNICODE: rIn >> aLclName;
-/*N*/ rIn.ReadUniOrByteString(aLclName, rIn.GetStreamCharSet());
+/*N*/ aLclName = rIn.ReadUniOrByteString(rIn.GetStreamCharSet());
/*N*/ aLclName = ConvertName( aLclName );
/*N*/
/*N*/ XPolygon aXPoly;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index aa84a05..b0d952c 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -717,7 +717,8 @@ inline BOOL Sw3IoImp::IsSw31Or40Export() const
inline SvStream& Sw3IoImp::InString( SvStream& rStrm, String& rStr )
{
- return rStrm.ReadUniOrByteString( rStr, eSrcSet );
+ rStr = rStrm.ReadUniOrByteString( eSrcSet );
+ return rStrm;
}
inline SvStream& Sw3IoImp::OutString( SvStream& rStrm, const String& rStr )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index 2ddff87..db0e04c 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
@@ -256,7 +256,7 @@ namespace binfilter {
/*N*/ if( pIo )
/*N*/ pNew->SetMap( pIo->InImageMap( sURL1, sTargetFrameName1, bServerMap ) );
/*N*/ if( nIVer>=1 )
-/*N*/ rStrm.ReadUniOrByteString( sName1, rStrm.GetStreamCharSet() );
+/*N*/ sName1 = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/
/*N*/ // fix #30592#: Boese Falle: Beim setzen einer URL wird eine Image-Map
/*N*/ // wieder geloescht.
@@ -325,8 +325,8 @@ SfxPoolItem* SwFmtFtnEndAtTxtEnd::Create( SvStream &rStrm, USHORT nVer ) const
String sPostfix, sSuffix1;
rStrm >> nOffset1
>> nFmtType;
- rStrm.ReadUniOrByteString( sPostfix, rStrm.GetStreamCharSet() );
- rStrm.ReadUniOrByteString( sSuffix1, rStrm.GetStreamCharSet() );
+ sPostfix = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
+ sSuffix1 = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
pNew->SetNumType( (SvxExtNumType)nFmtType );
pNew->SetOffset( nOffset1 );
@@ -640,10 +640,9 @@ SfxPoolItem* SwGammaGrf::Create(SvStream & rStrm, USHORT ) const
/*N*/ SfxPoolItem* SwNumRuleItem::Create( SvStream& rStrm,
/*N*/ USHORT nIVer ) const
/*N*/ {
-/*N*/ String sTmp;
/*N*/ UINT16 nPoolId;
/*N*/
-/*N*/ rStrm.ReadUniOrByteString( sTmp, rStrm.GetStreamCharSet() );
+/*N*/ String sTmp = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/ if( nIVer>0 )
/*N*/ {
/*N*/ // Pool-NumRules muessen evtl. noch umbenannt werden.
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 64d1911..f2e9607 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1387,7 +1387,6 @@ void Sw3StringPool::LoadOld( SvStream& r )
{
aPool.DeleteAndDestroy( 0, aPool.Count() );
sal_uInt16 n;
- String s;
r >> n;
// Dieser schlimme Hack ist notwendig, da ich vergessen habe,
// den Zeichensatz im Record zu speichern. Und kein Flag-Byte da!
@@ -1403,7 +1402,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
}
while( n-- )
{
- r.ReadUniOrByteString( s, eSrcEnc );
+ String s = r.ReadUniOrByteString( eSrcEnc );
Sw3String* p = new Sw3String( s, 0 );
aPool.Insert( p, aPool.Count() );
}
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
index 3a2e2a1..00f8128 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
@@ -290,8 +290,7 @@ namespace binfilter {
/*N*/ SfxPoolItem* SwFmtRefMark::Create( SvStream& rStrm, USHORT ) const
/*N*/ {
-/*N*/ String aName;
-/*N*/ rStrm.ReadUniOrByteString( aName, rStrm.GetStreamCharSet() );
+/*N*/ String aName = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/ return new SwFmtRefMark( aName );
/*N*/ }
@@ -309,9 +308,8 @@ namespace binfilter {
/*N*/ SfxPoolItem* SwFmtINetFmt::Create( SvStream& rStrm, USHORT nIVer ) const
/*N*/ {
/*N*/ UINT16 nId1, nId2;
-/*N*/ String aURL1, aTarget;
-/*N*/ rStrm.ReadUniOrByteString( aURL1, rStrm.GetStreamCharSet() );
-/*N*/ rStrm.ReadUniOrByteString( aTarget, rStrm.GetStreamCharSet() );
+/*N*/ String aURL1 = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
+/*N*/ String aTarget = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/ rStrm >> nId1 >> nId2;
/*N*/
/*N*/ aURL1 = ::binfilter::StaticBaseUrl::SmartRelToAbs( aURL1 );
@@ -342,14 +340,13 @@ namespace binfilter {
/*N #i27164#*/ USHORT nCurKey;
/*N #i27164#*/ String aLibName, aMacName;
/*N #i27164#*/ rStrm >> nCurKey;
-/*N #i27164#*/ rStrm.ReadUniOrByteString( aLibName, rStrm.GetStreamCharSet() );
-/*N #i27164#*/ rStrm.ReadUniOrByteString( aMacName, rStrm.GetStreamCharSet() );
+/*N #i27164#*/ aLibName = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
+/*N #i27164#*/ aMacName = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N #i27164#*/ pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, STARBASIC ) );
/*N*/ }
/*N*/ if( nIVer >= 1 )
/*N*/ {
-/*N*/ String aName1;
-/*N*/ rStrm.ReadUniOrByteString( aName1, rStrm.GetStreamCharSet() );;
+/*N*/ String aName1 = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );;
/*N*/ pNew->SetName( aName1 );
/*N*/ }
/*N*/ if( nIVer >= 2 )
@@ -358,10 +355,9 @@ namespace binfilter {
/*N*/ while( nCnt-- )
/*N*/ {
/*N #i27164#*/ USHORT nCurKey, nScriptType;
-/*N #i27164#*/ String aLibName, aMacName;
/*N #i27164#*/ rStrm >> nCurKey;
-/*N #i27164#*/ rStrm.ReadUniOrByteString( aLibName, rStrm.GetStreamCharSet() );
-/*N #i27164#*/ rStrm.ReadUniOrByteString( aMacName, rStrm.GetStreamCharSet() );
+/*N #i27164#*/ String aLibName = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
+/*N #i27164#*/ String aMacName = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N #i27164#*/ rStrm >> nScriptType;
/*N #i27164#*/ pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName,
/*N #i27164#*/ (ScriptType)nScriptType ) );
@@ -383,10 +379,9 @@ namespace binfilter {
/*N*/ SfxPoolItem* SwFmtFtn::Create( SvStream& rStrm, USHORT nIVer ) const
/*N*/ {
-/*N*/ String aNumber1;
/*N*/ UINT16 nNumber1;
/*N*/ rStrm >> nNumber1;
-/*N*/ rStrm.ReadUniOrByteString( aNumber1, rStrm.GetStreamCharSet() );
+/*N*/ String aNumber1 = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/
/*N*/ // Die Section fuer den Text erzeugen
/*N*/ Sw3IoImp* pIo = Sw3IoImp::GetCurrentIo();
@@ -476,13 +471,13 @@ namespace binfilter {
/*N*/ >> nLevel1;
/*N*/
/*N*/ if( nIVer < IVER_TOXMARK_STRPOOL )
-/*N*/ rStrm.ReadUniOrByteString( aTypeName, rStrm.GetStreamCharSet() );
+/*N*/ aTypeName = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/ else
/*N*/ rStrm >> nStrIdx;
/*N*/
-/*N*/ rStrm.ReadUniOrByteString( aAltText1, rStrm.GetStreamCharSet() );
-/*N*/ rStrm.ReadUniOrByteString( aPrimKey, rStrm.GetStreamCharSet() );
-/*N*/ rStrm.ReadUniOrByteString( aSecKey, rStrm.GetStreamCharSet() );
+/*N*/ aAltText1 = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
+/*N*/ aPrimKey = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
+/*N*/ aSecKey = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
/*N*/
/*N*/ BYTE cFlags = 0;
/*N*/ // With the 5.2, there are new tox types.
@@ -590,8 +585,7 @@ SfxPoolItem* SwFmtRuby::Create(SvStream & rStrm, USHORT /*nVer*/) const
SfxPoolItem* SwTblBoxFormula::Create( SvStream & rStrm, USHORT ) const
{
- String sStr;
- rStrm.ReadUniOrByteString( sStr, rStrm.GetStreamCharSet() );
+ String sStr = rStrm.ReadUniOrByteString( rStrm.GetStreamCharSet() );
return new SwTblBoxFormula( sStr );
}
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
index 75ba0c2..d3126aa 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
@@ -257,14 +257,13 @@ public:
/*N*/ for( USHORT n = 0; n < nTmp; ++n )
/*N*/ {
/*?*/ SwStyleCondColl* pNew = new SwStyleCondColl;
-/*?*/ r.ReadUniOrByteString( pNew->sColl, r.GetStreamCharSet() );
+/*?*/ pNew->sColl = r.ReadUniOrByteString( r.GetStreamCharSet() );
/*?*/ r >> pNew->nCondition;
/*?*/
/*?*/ if( USRFLD_EXPRESSION & pNew->nCondition )
/*?*/ {
/*?*/ OSL_ENSURE( !this, "noch nicht implementiert" );
-/*?*/ String s;
-/*?*/ r.ReadUniOrByteString( s, r.GetStreamCharSet() );
+/*?*/ r.ReadUniOrByteString( r.GetStreamCharSet() );
/*?*/ }
/*?*/ else
/*?*/ r >> pNew->nSubCondition;
diff --git a/binfilter/inc/bf_sc/global.hxx b/binfilter/inc/bf_sc/global.hxx
index 3c167df..58054a1 100644
--- a/binfilter/inc/bf_sc/global.hxx
+++ b/binfilter/inc/bf_sc/global.hxx
@@ -1217,9 +1217,9 @@ inline SvStream& operator>>( SvStream& rStream, ScPostIt& rPostIt )
// ohne bShown !!!
CharSet eSet = rStream.GetStreamCharSet();
- rStream.ReadUniOrByteString( rPostIt.aStrText, eSet );
- rStream.ReadUniOrByteString( rPostIt.aStrDate, eSet );
- rStream.ReadUniOrByteString( rPostIt.aStrAuthor, eSet );
+ rPostIt.aStrText = rStream.ReadUniOrByteString( eSet );
+ rPostIt.aStrDate = rStream.ReadUniOrByteString( eSet );
+ rPostIt.aStrAuthor = rStream.ReadUniOrByteString( eSet );
return rStream;
}
diff --git a/binfilter/inc/bf_svtools/ownlist.hxx b/binfilter/inc/bf_svtools/ownlist.hxx
index 5ec996a..4eded56 100644
--- a/binfilter/inc/bf_svtools/ownlist.hxx
+++ b/binfilter/inc/bf_svtools/ownlist.hxx
@@ -70,8 +70,8 @@ public:
friend SvStream& operator >> ( SvStream& rStm, SvCommand & rThis )
{
- rStm.ReadUniOrByteString( rThis.aCommand, osl_getThreadTextEncoding() );
- rStm.ReadUniOrByteString( rThis.aArgument, osl_getThreadTextEncoding() );
+ rThis.aCommand = rStm.ReadUniOrByteString( osl_getThreadTextEncoding() );
+ rThis.aArgument = rStm.ReadUniOrByteString( osl_getThreadTextEncoding() );
return rStm;
}
friend SvStream& operator << ( SvStream& rStm, const SvCommand & rThis )
More information about the Libreoffice-commits
mailing list