basctl/source/basicide/basobj2.cxx | 12 ++++++------
basctl/source/basicide/basobj3.cxx | 8 ++++----
basctl/source/basicide/bastypes.cxx | 4 +---
basctl/source/basicide/scriptdocument.cxx | 20 ++++++++++----------
basctl/source/inc/basobj.hxx | 12 ++++++------
basctl/source/inc/bastypes.hxx | 2 +-
6 files changed, 28 insertions(+), 30 deletions(-)
New commits:
commit 90939a7b3d9d6511a4086deea6b7a11adf30df47
Author: August Sodora <aug...@gmail.com>
Date: Sat Dec 10 03:01:35 2011 -0500
String->OUString
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index a68a0d8..c23b22f 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -58,7 +58,7 @@ const char* pRegName = "BasicIDETabBar";
TYPEINIT0( IDEBaseWindow )
TYPEINIT1( SbxItem, SfxPoolItem );
-IDEBaseWindow::IDEBaseWindow( Window* pParent, const ScriptDocument&
rDocument, String aLibName, String aName )
+IDEBaseWindow::IDEBaseWindow( Window* pParent, const ScriptDocument&
rDocument, ::rtl::OUString aLibName, ::rtl::OUString aName )
:Window( pParent, WinBits( WB_3DLOOK ) )
,m_aDocument( rDocument )
,m_aLibName( aLibName )
@@ -70,8 +70,6 @@ IDEBaseWindow::IDEBaseWindow( Window* pParent, const
ScriptDocument& rDocument,
nStatus = 0;
}
-
-
IDEBaseWindow::~IDEBaseWindow()
{
DBG_DTOR( IDEBaseWindow, 0 );
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index e61f311..ac298cf 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -140,7 +140,7 @@ protected:
public:
TYPEINFO();
- IDEBaseWindow( Window* pParent, const ScriptDocument&
rDocument, String aLibName, String aName );
+ IDEBaseWindow( Window* pParent, const ScriptDocument& rDocument,
::rtl::OUString aLibName, ::rtl::OUString aName );
virtual ~IDEBaseWindow();
void Init();
commit 313deb9782819f68b69d25629aa79476ff98e90a
Author: August Sodora <aug...@gmail.com>
Date: Sat Dec 10 02:59:29 2011 -0500
String->OUString
diff --git a/basctl/source/basicide/scriptdocument.cxx
b/basctl/source/basicide/scriptdocument.cxx
index 2794520..e75affa 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -986,9 +986,9 @@ namespace basctl
::rtl::OUString aSearchURL1( RTL_CONSTASCII_USTRINGPARAM(
"share/basic" ) );
::rtl::OUString aSearchURL2( RTL_CONSTASCII_USTRINGPARAM(
"share/uno_packages" ) );
::rtl::OUString aSearchURL3( RTL_CONSTASCII_USTRINGPARAM(
"share/extensions" ) );
- if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 ||
- aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ||
- aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 )
+ if( aCanonicalFileURL.indexOf( aSearchURL1 ) >= 0 ||
+ aCanonicalFileURL.indexOf( aSearchURL2 ) >= 0 ||
+ aCanonicalFileURL.indexOf( aSearchURL3 ) >= 0 )
bIsShared = true;
}
}
@@ -1315,7 +1315,7 @@ namespace basctl
while ( !bValid )
{
aObjectName = aBaseName;
- aObjectName += String::CreateFromInt32( i );
+ aObjectName += ::rtl::OUString::valueOf( i );
if ( aUsedNamesCheck.find( aObjectName ) == aUsedNamesCheck.end() )
bValid = sal_True;
@@ -1521,9 +1521,9 @@ namespace basctl
{
switch ( _eType )
{
- case LIBRARY_TYPE_MODULE: aTitle = String( IDEResId(
RID_STR_USERMACROS ) ); break;
- case LIBRARY_TYPE_DIALOG: aTitle = String( IDEResId(
RID_STR_USERDIALOGS ) ); break;
- case LIBRARY_TYPE_ALL: aTitle = String( IDEResId(
RID_STR_USERMACROSDIALOGS ) ); break;
+ case LIBRARY_TYPE_MODULE: aTitle = ResId::toString(
IDEResId( RID_STR_USERMACROS ) ); break;
+ case LIBRARY_TYPE_DIALOG: aTitle = ResId::toString(
IDEResId( RID_STR_USERDIALOGS ) ); break;
+ case LIBRARY_TYPE_ALL: aTitle = ResId::toString(
IDEResId( RID_STR_USERMACROSDIALOGS ) ); break;
default:
break;
}
@@ -1532,9 +1532,9 @@ namespace basctl
{
switch ( _eType )
{
- case LIBRARY_TYPE_MODULE: aTitle = String( IDEResId(
RID_STR_SHAREMACROS ) ); break;
- case LIBRARY_TYPE_DIALOG: aTitle = String( IDEResId(
RID_STR_SHAREDIALOGS ) ); break;
- case LIBRARY_TYPE_ALL: aTitle = String( IDEResId(
RID_STR_SHAREMACROSDIALOGS ) ); break;
+ case LIBRARY_TYPE_MODULE: aTitle = ResId::toString(
IDEResId( RID_STR_SHAREMACROS ) ); break;
+ case LIBRARY_TYPE_DIALOG: aTitle = ResId::toString(
IDEResId( RID_STR_SHAREDIALOGS ) ); break;
+ case LIBRARY_TYPE_ALL: aTitle = ResId::toString(
IDEResId( RID_STR_SHAREMACROSDIALOGS ) ); break;
default:
break;
}
commit e09a63d4c0e19cf6a23e9db43205709d9763fb66
Author: August Sodora <aug...@gmail.com>
Date: Sat Dec 10 02:54:11 2011 -0500
String->OUString
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index af7e904..646c40c 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 29a4bed..77e3c8e 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 8f72305..009736c 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
);
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
