3 files changed, 6 insertions, 7 deletions
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 321f282c4a48..d5b7030c1215 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -88,11 +88,11 @@ void Organize( sal_Int16 tabId )
 
 //----------------------------------------------------------------------------
 
-bool IsValidSbxName( const String& rName )
+bool IsValidSbxName( const OUString& rName )
 {
-    for ( sal_uInt16 nChar = 0; nChar < rName.Len(); nChar++ )
+    for ( sal_uInt16 nChar = 0; nChar < rName.getLength(); nChar++ )
     {
-        sal_Unicode c = rName.GetChar(nChar);
+        sal_Unicode c = rName[nChar];
         bool bValid = (
             ( c >= 'A' && c <= 'Z' ) ||
             ( c >= 'a' && c <= 'z' ) ||
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 89f9f450eaf9..f6b787797963 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -72,7 +72,7 @@ extern "C" {
 
 //----------------------------------------------------------------------------
 
-SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
+SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName )
 {
     SfxDispatcher* pDispatcher = GetDispatcher();
     if( pDispatcher )
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 99bd6b099046..cc53d9f69f81 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -27,7 +27,6 @@ class SbMethod;
 class SbModule;
 class SbxVariable;
 class StarBASIC;
-class String;
 class SfxUInt16Item;
 class SfxBindings;
 class SfxDispatcher;
@@ -39,7 +38,7 @@ namespace basctl
 
 
     // help methods for the general use:
-    SbMethod*       CreateMacro( SbModule* pModule, const String& rMacroName );
+    SbMethod*       CreateMacro( SbModule* pModule, const OUString& rMacroName );
     void            RunMethod( SbMethod* pMethod );
 
     StarBASIC*      FindBasic( const SbxVariable* pVar );
@@ -48,7 +47,7 @@ namespace basctl
     void            BasicStopped( bool* pbAppWindowDisabled = 0, bool* pbDispatcherLocked = 0, sal_uInt16* pnWaitCount = 0,
                             SfxUInt16Item** ppSWActionCount = 0, SfxUInt16Item** ppSWLockViewCount = 0 );
 
-    bool            IsValidSbxName( const String& rName );
+    bool            IsValidSbxName( const OUString& rName );
 
     BasicManager*   FindBasicManager( StarBASIC* pLib );