From 2d3203b2db5b44592e70e52c9927324b65a45e06 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 6 Jan 2012 08:50:03 +0000
Subject: make ReadUniOrByteString return a string

---
 basic/source/basmgr/basmgr.cxx    | 15 +++++----------
 basic/source/classes/image.cxx    | 11 ++++-------
 basic/source/classes/sbxmod.cxx   |  4 +---
 basic/source/runtime/methods1.cxx |  3 +--
 4 files changed, 11 insertions(+), 22 deletions(-)

(limited to 'basic')

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index f452adc54d7c..3e5a0dd698b7 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -643,18 +643,15 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
         pInfo->bDoLoad = bDoLoad;
 
         // The name of the lib...
-        String aName;
-        rSStream.ReadUniOrByteString(aName, rSStream.GetStreamCharSet());
+        String aName = rSStream.ReadUniOrByteString(rSStream.GetStreamCharSet());
         pInfo->SetLibName( aName );
 
         // Absolute path...
-        String aStorageName;
-        rSStream.ReadUniOrByteString(aStorageName, rSStream.GetStreamCharSet());
+        String aStorageName = rSStream.ReadUniOrByteString(rSStream.GetStreamCharSet());
         pInfo->SetStorageName( aStorageName );
 
         // Relative path...
-        String aRelStorageName;
-        rSStream.ReadUniOrByteString(aRelStorageName, rSStream.GetStreamCharSet());
+        String aRelStorageName = rSStream.ReadUniOrByteString(rSStream.GetStreamCharSet());
         pInfo->SetRelStorageName( aRelStorageName );
 
         if ( nVer >= 2 )
@@ -1041,8 +1038,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
         // and it proceeds ...
     }
     xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator
-    String aLibs;
-    xManagerStream->ReadUniOrByteString(aLibs, xManagerStream->GetStreamCharSet());
+    String aLibs = xManagerStream->ReadUniOrByteString(xManagerStream->GetStreamCharSet());
     xManagerStream->SetBufferSize( 0 );
     xManagerStream.Clear(); // Close stream
 
@@ -1235,8 +1231,7 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt
                 *xBasicStream >> nPasswordMarker;
                 if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() )
                 {
-                    String aPassword;
-                    xBasicStream->ReadUniOrByteString(aPassword,
+                    String aPassword = xBasicStream->ReadUniOrByteString(
                         xBasicStream->GetStreamCharSet());
                     pLibInfo->SetPassword( aPassword );
                 }
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 79b3765fa1fc..af93adee99af 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -147,24 +147,21 @@ sal_Bool SbiImage::Load( SvStream& r, sal_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( sal_uInt16 j = 0 ; j < nCount ; j++ )
                 {
-                    String aTmp;
-                    r.ReadUniOrByteString( aTmp, eCharSet );
+                    String aTmp = r.ReadUniOrByteString(eCharSet);
                     aOUSource += aTmp;
                 }
                 break;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 975ecc20a0a2..ddb47c3885df 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2001,9 +2001,7 @@ sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         return sal_False;
 
     // Get the source string
-    String aTmp;
-    rStrm.ReadUniOrByteString( aTmp, osl_getThreadTextEncoding() );
-    aOUSource = aTmp;
+    aOUSource = rStrm.ReadUniOrByteString( osl_getThreadTextEncoding() );
     return sal_True;
 }
 
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 5b25252a780d..0c863ef0e0c5 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1106,8 +1106,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
         case SbxSTRING:
         case SbxLPSTR:
                 {
-                String aStr;
-                pStrm->ReadUniOrByteString( aStr, osl_getThreadTextEncoding() );
+                String aStr = pStrm->ReadUniOrByteString(osl_getThreadTextEncoding());
                 rVar.PutString( aStr );
                 }
                 break;
-- 
cgit