ByteString->rtl::OString[Buffer]

3 files changed, 13 insertions, 13 deletions

diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 2d9135d3c8f9..07884331e29b 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -202,7 +202,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec
     Reference< XHierarchicalNameContainer > xHierarchyName( xNames, UNO_QUERY );
     if ( xNames.is() )
     {
-        ByteString sDialogPosition;
+        rtl::OString sDialogPosition;
         svtools::QueryDeleteResult_Impl eResult = _bConfirm ? svtools::QUERYDELETE_YES : svtools::QUERYDELETE_ALL;
 
         // The list of elements to delete is allowed to contain related elements: A given element may
@@ -227,7 +227,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec
             {
                 svtools::QueryDeleteDlg_Impl aDlg( getView(), *aThisRound );
 
-                if ( sDialogPosition.Len() )
+                if ( sDialogPosition.getLength() )
                     aDlg.SetWindowState( sDialogPosition );
 
                 if ( nObjectsLeft > 1 )
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 3fb9ff5361fd..ffba407621dd 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::svt;
 
-const ByteString aGroupIdent("dBase III");
+const rtl::OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III"));
 
 //////////////////////////////////////////////////////////////////////////
 // Klasse ODbaseIndexDialog
@@ -377,19 +377,19 @@ void ODbaseIndexDialog::Init()
 
             ///////////////////////////////////////////////////////////////////////////
             // fill the indexes list
-            ByteString aNDX;
+            rtl::OString aNDX;
             sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
-            ByteString aKeyName;
+            rtl::OString aKeyName;
             String aEntry;
 
             for( sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++ )
             {
                 // does the key point to an index file ?
                 aKeyName = aInfFile.GetKeyName( nKey );
-                aNDX = aKeyName.Copy(0,3);
+                aNDX = aKeyName.copy(0,3);
 
                 // yes -> add to the tables index list
-                if (aNDX == "NDX" )
+                if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
                 {
                     aEntry = rtl::OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding());
                     rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) );
@@ -488,18 +488,18 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
     aInfFile.SetGroup( aGroupIdent );
 
     // Erst einmal alle Tabellenindizes loeschen
-    ByteString aNDX;
+    rtl::OString aNDX;
     sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
     sal_uInt16 nKey = 0;
 
     while( nKey < nKeyCnt )
     {
         // Verweist der Key auf ein Indexfile?...
-        ByteString aKeyName = aInfFile.GetKeyName( nKey );
-        aNDX = aKeyName.Copy(0,3);
+        rtl::OString aKeyName = aInfFile.GetKeyName( nKey );
+        aNDX = aKeyName.copy(0,3);
 
         //...wenn ja, Indexfile loeschen, nKey steht dann auf nachfolgendem Key
-        if( aNDX == "NDX" )
+        if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
         {
             aInfFile.DeleteKey(aKeyName);
             nKeyCnt--;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index d13d5f98a7df..ff46e8159228 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -204,8 +204,8 @@ void OSelectionBrowseBox::initialize()
         for (size_t i = 0; i < SAL_N_ELEMENTS(eFunctions); ++i)
         {
             m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
-            m_aFunctionStrings += String(ByteString(rContext.getIntlKeywordAscii(eFunctions[i])),RTL_TEXTENCODING_UTF8);
-
+            m_aFunctionStrings += rtl::OStringToOUString(rContext.getIntlKeywordAscii(eFunctions[i]),
+                RTL_TEXTENCODING_UTF8);
         }
         m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
         m_aFunctionStrings += sGroup;