diff options
| author | August Sodora <augsod@gmail.com> | 2011-12-10 02:54:11 -0500 |
|---|---|---|
| committer | August Sodora <augsod@gmail.com> | 2011-12-10 15:23:25 -0500 |
| commit | e09a63d4c0e19cf6a23e9db43205709d9763fb66 (patch) | |
| tree | 4516c61124d5c4a1754cbb230f3832eb5d1c1fff /basctl/source/basicide | |
| parent | 53b3df94dbd44b220f6531fe1cf2c83f3b1849d0 (diff) | |
String->OUString
Diffstat (limited to 'basctl/source/basicide')
| -rw-r--r-- | basctl/source/basicide/basobj2.cxx | 12 | ||||
| -rw-r--r-- | basctl/source/basicide/basobj3.cxx | 8 |
2 files changed, 10 insertions, 10 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; } |