ByteString->rtl::OString

4 files changed, 45 insertions, 46 deletions

diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 3b0d961a3623..b62a8130f82d 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -569,7 +569,7 @@ public:
     void                CopyString( sal_uInt16 nFmt, const String& rStr );
     void                CopyAny( sal_uInt16 nFmt, const ::com::sun::star::uno::Any& rAny );
 
-    void                CopyByteString( sal_uLong nFormatId, const ByteString& rStr );
+    void                CopyByteString( sal_uLong nFormatId, const rtl::OString& rStr );
     void                CopyAnyData( sal_uLong nFormatId, const sal_Char* pData, sal_uLong nLen );
 
     sal_Bool            HasAnyData() const;
diff --git a/svtools/source/filter/filter2.cxx b/svtools/source/filter/filter2.cxx
index b973c9bdb3b0..f8347c5d825f 100644
--- a/svtools/source/filter/filter2.cxx
+++ b/svtools/source/filter/filter2.cxx
@@ -1318,38 +1318,38 @@ sal_Bool GraphicDescriptor::ImpDetectSVG( SvStream& /*rStm*/, sal_Bool /*bExtend
 
 String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
 {
-    ByteString          aKeyName;
+    const char *pKeyName = 0;
 
     switch( nFormat )
     {
-        case( GFF_BMP ) :   aKeyName = "bmp";   break;
-        case( GFF_GIF ) :   aKeyName = "gif";   break;
-        case( GFF_JPG ) :   aKeyName = "jpg";   break;
-        case( GFF_PCD ) :   aKeyName = "pcd";   break;
-        case( GFF_PCX ) :   aKeyName = "pcx";   break;
-        case( GFF_PNG ) :   aKeyName = "png";   break;
-        case( GFF_XBM ) :   aKeyName = "xbm";   break;
-        case( GFF_XPM ) :   aKeyName = "xpm";   break;
-        case( GFF_PBM ) :   aKeyName = "pbm";   break;
-        case( GFF_PGM ) :   aKeyName = "pgm";   break;
-        case( GFF_PPM ) :   aKeyName = "ppm";   break;
-        case( GFF_RAS ) :   aKeyName = "ras";   break;
-        case( GFF_TGA ) :   aKeyName = "tga";   break;
-        case( GFF_PSD ) :   aKeyName = "psd";   break;
-        case( GFF_EPS ) :   aKeyName = "eps";   break;
-        case( GFF_TIF ) :   aKeyName = "tif";   break;
-        case( GFF_DXF ) :   aKeyName = "dxf";   break;
-        case( GFF_MET ) :   aKeyName = "met";   break;
-        case( GFF_PCT ) :   aKeyName = "pct";   break;
-        case( GFF_SGF ) :   aKeyName = "sgf";   break;
-        case( GFF_SGV ) :   aKeyName = "sgv";   break;
-        case( GFF_SVM ) :   aKeyName = "svm";   break;
-        case( GFF_WMF ) :   aKeyName = "wmf";   break;
-        case( GFF_EMF ) :   aKeyName = "emf";   break;
-        case( GFF_SVG ) :   aKeyName = "svg";   break;
+        case( GFF_BMP ) :   pKeyName = "bmp";   break;
+        case( GFF_GIF ) :   pKeyName = "gif";   break;
+        case( GFF_JPG ) :   pKeyName = "jpg";   break;
+        case( GFF_PCD ) :   pKeyName = "pcd";   break;
+        case( GFF_PCX ) :   pKeyName = "pcx";   break;
+        case( GFF_PNG ) :   pKeyName = "png";   break;
+        case( GFF_XBM ) :   pKeyName = "xbm";   break;
+        case( GFF_XPM ) :   pKeyName = "xpm";   break;
+        case( GFF_PBM ) :   pKeyName = "pbm";   break;
+        case( GFF_PGM ) :   pKeyName = "pgm";   break;
+        case( GFF_PPM ) :   pKeyName = "ppm";   break;
+        case( GFF_RAS ) :   pKeyName = "ras";   break;
+        case( GFF_TGA ) :   pKeyName = "tga";   break;
+        case( GFF_PSD ) :   pKeyName = "psd";   break;
+        case( GFF_EPS ) :   pKeyName = "eps";   break;
+        case( GFF_TIF ) :   pKeyName = "tif";   break;
+        case( GFF_DXF ) :   pKeyName = "dxf";   break;
+        case( GFF_MET ) :   pKeyName = "met";   break;
+        case( GFF_PCT ) :   pKeyName = "pct";   break;
+        case( GFF_SGF ) :   pKeyName = "sgf";   break;
+        case( GFF_SGV ) :   pKeyName = "sgv";   break;
+        case( GFF_SVM ) :   pKeyName = "svm";   break;
+        case( GFF_WMF ) :   pKeyName = "wmf";   break;
+        case( GFF_EMF ) :   pKeyName = "emf";   break;
+        case( GFF_SVG ) :   pKeyName = "svg";   break;
     }
 
-    return String( aKeyName, RTL_TEXTENCODING_ASCII_US );
+    return rtl::OUString::createFromAscii(pKeyName);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 71763b95915a..9e45b8955b60 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -446,7 +446,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
 
 #ifdef DEBUG
             if( maAny.hasValue() && ::com::sun::star::uno::TypeClass_STRING != maAny.getValueType().getTypeClass() )
-                fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", ByteString( String( rFlavor.MimeType), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
+                fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", rtl::OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() );
 #endif
         }
         catch( const ::com::sun::star::uno::Exception& )
@@ -667,7 +667,7 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor )
 
 #ifdef DEBUG
                 fprintf( stderr, "TransferableHelper exchanged objectdescriptor [ %s ]\n",
-                         ByteString( String( aIter->MimeType), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
+                         rtl::OUStringToOString(aIter->MimeType, RTL_TEXTENCODING_ASCII_US).getStr() );
 #endif
             }
 
@@ -780,12 +780,11 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da
         SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) &&
         TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) )
     {
-        const String            aString( rString );
-        const ByteString        aByteStr( aString, osl_getThreadTextEncoding() );
-        Sequence< sal_Int8 >    aSeq( aByteStr.Len() + 1 );
+        const rtl::OString aByteStr(rtl::OUStringToOString(rString, osl_getThreadTextEncoding()));
+        Sequence< sal_Int8 >    aSeq( aByteStr.getLength() + 1 );
 
-        rtl_copyMemory( aSeq.getArray(), aByteStr.GetBuffer(), aByteStr.Len() );
-        aSeq[ aByteStr.Len() ] = 0;
+        rtl_copyMemory( aSeq.getArray(), aByteStr.getStr(), aByteStr.getLength() );
+        aSeq[ aByteStr.getLength() ] = 0;
         maAny <<= aSeq;
     }
     else
@@ -900,9 +899,9 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
 
         case( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ):
         {
-            ByteString sURL( rBmk.GetURL(), eSysCSet );
-            Sequence< sal_Int8 > aSeq( sURL.Len() );
-            memcpy( aSeq.getArray(), sURL.GetBuffer(), sURL.Len() );
+            rtl::OString sURL(rtl::OUStringToOString(rBmk.GetURL(), eSysCSet));
+            Sequence< sal_Int8 > aSeq( sURL.getLength() );
+            memcpy( aSeq.getArray(), sURL.getStr(), sURL.getLength() );
             maAny <<= aSeq;
         }
         break;
@@ -912,8 +911,8 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
             Sequence< sal_Int8 > aSeq( 2048 );
 
             memset( aSeq.getArray(), 0, 2048 );
-            strcpy( reinterpret_cast< char* >( aSeq.getArray() ), ByteString( rBmk.GetURL(), eSysCSet).GetBuffer() );
-            strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, ByteString( rBmk.GetDescription(), eSysCSet ).GetBuffer() );
+            strcpy( reinterpret_cast< char* >( aSeq.getArray() ), rtl::OUStringToOString(rBmk.GetURL(), eSysCSet).getStr() );
+            strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, rtl::OUStringToOString(rBmk.GetDescription(), eSysCSet).getStr() );
 
             maAny <<= aSeq;
         }
@@ -2106,11 +2105,11 @@ sal_Bool TransferableDataHelper::GetFileList(
             {
                 if( aFlavor.MimeType.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/uri-list" )) ) > -1 )
                 {
-                    ByteString aByteString;
+                    rtl::OString aDiskString;
 
-                    while( xStm->ReadLine( aByteString ) )
-                        if( aByteString.Len() && aByteString.GetChar( 0 ) != '#' )
-                            rFileList.AppendFile( String( aByteString, RTL_TEXTENCODING_UTF8 ) );
+                    while( xStm->ReadLine( aDiskString ) )
+                        if( aDiskString.getLength() && aDiskString[0] != '#' )
+                            rFileList.AppendFile( rtl::OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) );
 
                     bRet = sal_True;
                  }
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index fe8921061f8f..d8ffe9ec9697 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -511,9 +511,9 @@ void TransferDataContainer::CopyAnyData( sal_uLong nFormatId,
 // -----------------------------------------------------------------------------
 
 void TransferDataContainer::CopyByteString( sal_uLong nFormatId,
-                                            const ByteString& rStr )
+                                            const rtl::OString& rStr )
 {
-    CopyAnyData( nFormatId, rStr.GetBuffer(), rStr.Len() );
+    CopyAnyData( nFormatId, rStr.getStr(), rStr.getLength() );
 }
 
 // -----------------------------------------------------------------------------