remove extra string casts

4 files changed, 8 insertions, 9 deletions

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index cfbd311b528c..d4a2579b32f7 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -414,11 +414,11 @@ sal_Bool DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& /*_aSelect
     return m_aEditingHandler.Call(pEntry) != 0;
 }
 // -----------------------------------------------------------------------------
-sal_Bool DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
+sal_Bool DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
 {
     DBTreeEditedEntry aEntry;
     aEntry.pEntry = pEntry;
-    aEntry.aNewText  =rNewText;
+    aEntry.aNewText = rNewText;
     if(m_aEditedHandler.Call(&aEntry) != 0)
     {
         implStopSelectionTimer();
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 10d5c42c7b7f..a4080cde40d1 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -104,7 +104,7 @@ namespace dbaui
 
     extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars);
     //------------------------------------------------------------------
-    sal_Bool DbaIndexList::EditedEntry( SvLBoxEntry* _pEntry, const String& _rNewText )
+    sal_Bool DbaIndexList::EditedEntry( SvLBoxEntry* _pEntry, const rtl::OUString& _rNewText )
     {
         // first check if this is valid SQL92 name
         if ( isSQL92CheckEnabled(m_xConnection) )
@@ -112,13 +112,12 @@ namespace dbaui
             Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
             if ( xMeta.is() )
             {
-                ::rtl::OUString sNewName(_rNewText);
-                ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters());
+                ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters());
                 if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() )
                         ?
-                        sAlias != sNewName
+                        sAlias != _rNewText
                         :
-                !sNewName.equalsIgnoreAsciiCase(sAlias))
+                !_rNewText.equalsIgnoreAsciiCase(sAlias))
                     return sal_False;
             }
         }
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 558c66130893..b216e0828e0f 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -136,7 +136,7 @@ namespace dbaui
 
         // enable editing for tables/views and queries
         virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& );
-        virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+        virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
         virtual sal_Bool    DoubleClickHdl();
 
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 10839459626b..41527b727cb7 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -81,7 +81,7 @@ namespace dbaui
         }
 
     protected:
-        virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+        virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
 
     private:
         using SvTreeListBox::Select;