ByteString->rtl::OString

5 files changed, 28 insertions, 25 deletions

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 23355664b27b..b392c2dc170e 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -39,20 +39,21 @@
 #include "scitems.hxx"
 #include "rangelst.hxx"
 #include <editeng/flstitem.hxx>
-#include <svx/pageitem.hxx>
 #include <editeng/paperinf.hxx>
-#include <svx/postattr.hxx>
 #include <editeng/sizeitem.hxx>
-#include <unotools/misccfg.hxx>
+#include <rtl/strbuf.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 #include <svtools/ctrltool.hxx>
+#include <svx/pageitem.hxx>
+#include <svx/postattr.hxx>
+#include <unotools/localedatawrapper.hxx>
+#include <unotools/misccfg.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
-#include <unotools/localedatawrapper.hxx>
 
 #include "docsh.hxx"
 #include "docshimp.hxx"
@@ -963,9 +964,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                 String aValue;
                 if ( eSourceType == SC_CAT_CONTENT )
                     ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue );
-                ByteString aError( aValue, gsl_getSystemTextEncoding() );
-                aError += " weggelassen";
-                OSL_FAIL( aError.GetBuffer() );
+                rtl::OStringBuffer aError(rtl::OUStringToOString(aValue,
+                    osl_getThreadTextEncoding()));
+                aError.append(RTL_CONSTASCII_STRINGPARAM(" weggelassen"));
+                OSL_FAIL( aError.getStr() );
 #endif
             }
             else
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 858809bcda24..cb30e00b5a29 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2018,10 +2018,11 @@ long ScDocShell::DdeGetData( const String& rItem,
     {
         if( rItem.EqualsIgnoreCaseAscii( "Format" ) )
         {
-            ByteString aFmtByte( aDdeTextFmt, gsl_getSystemTextEncoding() );
+            rtl::OString aFmtByte(rtl::OUStringToOString(aDdeTextFmt,
+                osl_getThreadTextEncoding()));
             rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >(
-                                        (sal_Int8*)aFmtByte.GetBuffer(),
-                                        aFmtByte.Len() + 1 );
+                                        (const sal_Int8*)aFmtByte.getStr(),
+                                        aFmtByte.getLength() + 1 );
             return 1;
         }
         ScImportExport aObj( &aDocument, rItem );
@@ -2033,13 +2034,13 @@ long ScDocShell::DdeGetData( const String& rItem,
         if( aDdeTextFmt.EqualsAscii( "SYLK" ) ||
             aDdeTextFmt.EqualsAscii( "FSYLK" ) )
         {
-            ByteString aData;
+            rtl::OString aData;
             if( aObj.ExportByteString( aData, gsl_getSystemTextEncoding(),
                                         SOT_FORMATSTR_ID_SYLK ) )
             {
                 rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >(
-                                            (sal_Int8*)aData.GetBuffer(),
-                                            aData.Len() + 1 );
+                                            (const sal_Int8*)aData.getStr(),
+                                            aData.getLength() + 1 );
                 return 1;
             }
             else
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index f8b0a9cf51b7..146ff58dff78 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -342,9 +342,9 @@ sal_Bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt )
     if ( nFmt != FORMAT_STRING )
     {
         rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
-        ByteString aTmp;
+        rtl::OString aTmp;
         sal_Bool bOk = ExportByteString( aTmp, eEnc, nFmt );
-        rText = UniString( aTmp, eEnc );
+        rText = rtl::OStringToOUString( aTmp, eEnc );
         return bOk;
     }
     //  nSizeLimit not needed for OUString
@@ -368,7 +368,7 @@ sal_Bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt )
 }
 
 
-sal_Bool ScImportExport::ExportByteString( ByteString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt )
+sal_Bool ScImportExport::ExportByteString( rtl::OString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt )
 {
     OSL_ENSURE( eEnc != RTL_TEXTENCODING_UNICODE, "ScImportExport::ExportByteString: Unicode not supported" );
     if ( eEnc == RTL_TEXTENCODING_UNICODE )
@@ -392,7 +392,7 @@ sal_Bool ScImportExport::ExportByteString( ByteString& rText, rtl_TextEncoding e
             return sal_True;
         }
     }
-    rText.Erase();
+    rText = rtl::OString();
     return false;
 }
 
@@ -534,8 +534,8 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rS
     }
     else
     {
-        ByteString aByteStr( rString, eEnc );
-        rStrm << aByteStr.GetBuffer();
+        rtl::OString aByteStr(rtl::OUStringToOString(rString, eEnc));
+        rStrm << aByteStr.getStr();
         if ( bZero )
             rStrm << sal_Char(0);
     }
@@ -1560,7 +1560,7 @@ sal_Bool ScImportExport::Sylk2Doc( SvStream& rStrm )
     {
         String aLine;
         String aText;
-        ByteString aByteLine;
+        rtl::OString aByteLine;
         SCCOL nCol = nStartCol;
         SCROW nRow = nStartRow;
         SCCOL nRefCol = 1;
@@ -1570,7 +1570,7 @@ sal_Bool ScImportExport::Sylk2Doc( SvStream& rStrm )
         {
             //! allow unicode
             rStrm.ReadLine( aByteLine );
-            aLine = String( aByteLine, rStrm.GetStreamCharSet() );
+            aLine = rtl::OStringToOUString(aByteLine, rStrm.GetStreamCharSet());
             if( rStrm.IsEof() )
                 break;
             const sal_Unicode* p = aLine.GetBuffer();
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 6bd9f6d629bf..d5422549fd32 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -188,12 +188,12 @@ sal_Bool ScServerObject::GetData(
         if( aDdeTextFmt.EqualsAscii( "SYLK" ) ||
             aDdeTextFmt.EqualsAscii( "FSYLK" ) )
         {
-            ByteString aByteData;
+            rtl::OString aByteData;
             if( aObj.ExportByteString( aByteData, gsl_getSystemTextEncoding(), SOT_FORMATSTR_ID_SYLK ) )
             {
                 rData <<= ::com::sun::star::uno::Sequence< sal_Int8 >(
-                                        (sal_Int8*)aByteData.GetBuffer(),
-                                        aByteData.Len() + 1 );
+                                        (const sal_Int8*)aByteData.getStr(),
+                                        aByteData.getLength() + 1 );
                 return 1;
             }
             return 0;
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index a4c28b1150e7..302cf4e5c627 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -136,7 +136,7 @@ public:
 
     sal_Bool ImportString( const ::rtl::OUString&, sal_uLong=FORMAT_STRING );
     sal_Bool ExportString( ::rtl::OUString&, sal_uLong=FORMAT_STRING );
-    sal_Bool ExportByteString( ByteString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING );
+    sal_Bool ExportByteString( ::rtl::OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING );
 
     sal_Bool ImportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING );
     sal_Bool ExportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING );