String->OUString

3 files changed, 16 insertions, 16 deletions

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index af7e9046e4d8..646c40c5d9ed 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -168,7 +168,7 @@ Sequence< ::rtl::OUString > GetMergedLibraryNames( const Reference< script::XLib
 
 //----------------------------------------------------------------------------
 
-bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const String& rLibName, const String& rOldName, const String& rNewName )
+bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rOldName, const ::rtl::OUString& rNewName )
 {
     if ( !rDocument.hasModule( rLibName, rOldName ) )
     {
@@ -178,15 +178,15 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
 
     if ( rDocument.hasModule( rLibName, rNewName ) )
     {
-        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) );
+        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) );
         aError.Execute();
         return false;
     }
 
     // #i74440
-    if ( rNewName.Len() == 0 )
+    if ( rNewName.isEmpty() )
     {
-        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) );
+        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) );
         aError.Execute();
         return false;
     }
@@ -394,7 +394,7 @@ namespace
 
 //----------------------------------------------------------------------------
 
-Sequence< ::rtl::OUString > GetMethodNames( const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
+Sequence< ::rtl::OUString > GetMethodNames( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
     throw(NoSuchElementException )
 {
     Sequence< ::rtl::OUString > aSeqMethods;
@@ -431,7 +431,7 @@ Sequence< ::rtl::OUString > GetMethodNames( const ScriptDocument& rDocument, con
 
 //----------------------------------------------------------------------------
 
-sal_Bool HasMethod( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, const String& rMethName )
+sal_Bool HasMethod( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName, const ::rtl::OUString& rMethName )
 {
     sal_Bool bHasMethod = sal_False;
 
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 29a4bedac2b1..77e3c8e29545 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -172,7 +172,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
 
 //----------------------------------------------------------------------------
 
-bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const String& rLibName, const String& rOldName, const String& rNewName )
+bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rOldName, const ::rtl::OUString& rNewName )
     throw(ElementExistException, NoSuchElementException)
 {
     if ( !rDocument.hasDialog( rLibName, rOldName ) )
@@ -183,15 +183,15 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
 
     if ( rDocument.hasDialog( rLibName, rNewName ) )
     {
-        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) );
+        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) );
         aError.Execute();
         return false;
     }
 
     // #i74440
-    if ( rNewName.Len() == 0 )
+    if ( rNewName.isEmpty() )
     {
-        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) );
+        ErrorBox aError( pErrorParent, WB_OK | WB_DEF_OK, ResId::toString( IDEResId( RID_STR_BADSBXNAME ) ) );
         aError.Execute();
         return false;
     }
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 8f72305a67f4..009736c8bc17 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -72,7 +72,7 @@ namespace BasicIDE
     // new methods for modules
 
     ::rtl::OUString     GetModule(
-        const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
+        const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
         throw( ::com::sun::star::container::NoSuchElementException );
 
     /** renames a module
@@ -81,7 +81,7 @@ namespace BasicIDE
     */
     bool                 RenameModule(
         Window* pErrorParent, const ScriptDocument& rDocument,
-        const String& rLibName, const String& rOldName, const String& rNewName );
+        const ::rtl::OUString& rLibName, const ::rtl::OUString& rOldName, const ::rtl::OUString& rNewName );
 
     // new methods for macros
 
@@ -89,11 +89,11 @@ namespace BasicIDE
         sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc );
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > GetMethodNames(
-        const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
+        const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
         throw( ::com::sun::star::container::NoSuchElementException );
 
     sal_Bool                    HasMethod(
-        const ScriptDocument& rDocument, const String& rLibName, const String& rModName, const String& rMethName );
+        const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName, const ::rtl::OUString& rMethName );
 
     // new methods for dialogs
 
@@ -106,11 +106,11 @@ namespace BasicIDE
         Will show an error message when renaming fails because the new name is already used.
     */
     bool                 RenameDialog(
-        Window* pErrorParent, const ScriptDocument& rDocument, const String& rLibName, const String& rOldName, const String& rNewName )
+        Window* pErrorParent, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rOldName, const ::rtl::OUString& rNewName )
         throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::container::NoSuchElementException );
 
     bool                 RemoveDialog(
-        const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
+        const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName );
 
     void                MarkDocumentModified( const ScriptDocument& rDocument );
 }