Revert "Replace String with rtl::OUString"

You can't hope to change *some* virtual methods of a hierarchy and
leave others untouched, they all have to be changed together.

This reverts commit 9f46bee92be38f2d59295cabd9f1fdb149708153.

basic/inc/basic/sbdef.hxx

@@ -31,7 +31,6 @@
 
 #include <basic/sbxdef.hxx>
 #include <svl/svarray.hxx>
-#include <rtl/ustring.hxx>
 
 #define _BASIC_TEXTPORTIONS
 
@@ -77,7 +76,7 @@ String getBasicTypeName( SbxDataType eType );
 // important for SbUnoObj instances
 // implementation: basic/source/classes/sbunoobj.cxx
 class SbxObject;
-::rtl::OUString getBasicObjectTypeName( SbxObject* pObj );
+String getBasicObjectTypeName( SbxObject* pObj );
 
 // Allows Basic IDE to set watch mode to suppress errors
 // implementation: basic/source/runtime/runtime.cxx

basic/inc/basic/sbuno.hxx

@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}}
 
 // Returns a SbxObject that wrapps an Uno Interface
 // Implementation in basic/source/classes/sbunoobj.cxx
-SbxObjectRef GetSbUnoObject( const ::rtl::OUString& aName, const com::sun::star::uno::Any& aUnoObj_ );
+SbxObjectRef GetSbUnoObject( const String& aName, const com::sun::star::uno::Any& aUnoObj_ );
 
 // Force creation of all properties for debugging
 void createAllObjectProperties( SbxObject* pObj );

basic/source/app/mybasic.cxx

@@ -99,7 +99,7 @@ MyBasic::MyBasic() : StarBASIC()
     UsrAny aObjAny = getIntrospectionTestObject();
 
     // Box object into SbUnoObject
-    ::rtl:OUString aName( "UnoObject" );
+    String aName( "UnoObject" );
     SbxObjectRef xSbUnoObj = GetSbUnoObject( aName, aObjAny );
     Insert( (SbxObject*)xSbUnoObj );
 #endif

basic/source/classes/sb.cxx

@@ -442,7 +442,7 @@ class SbOLEFactory : public SbxFactory
 {
 public:
     virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
-    virtual SbxObject* CreateObject( const ::rtl::OUString& );
+    virtual SbxObject* CreateObject( const String& );
 };
 
 SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 )
@@ -451,9 +451,9 @@ SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 )
     return NULL;
 }
 
-SbUnoObject* createOLEObject_Impl( const ::rtl::OUString& aType );  // sbunoobj.cxx
+SbUnoObject* createOLEObject_Impl( const String& aType );   // sbunoobj.cxx
 
-SbxObject* SbOLEFactory::CreateObject( const ::rtl::OUString& rClassName )
+SbxObject* SbOLEFactory::CreateObject( const String& rClassName )
 {
     SbxObject* pRet = createOLEObject_Impl( rClassName );
     return pRet;

basic/source/inc/runtime.hxx

@@ -366,7 +366,7 @@ class SbiRuntime
     // #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
     void DimImpl( SbxVariableRef refVar );
 
-    bool implIsClass( SbxObject* pObj, const ::rtl::OUString& aClass );
+    bool implIsClass( SbxObject* pObj, const String& aClass );
 
     void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
 
@@ -398,7 +398,7 @@ class SbiRuntime
     void StepGOSUB( sal_uInt32 ),   StepRETURN( sal_uInt32 );
     void StepTESTFOR( sal_uInt32 ), StepCASETO( sal_uInt32 ),   StepERRHDL( sal_uInt32 );
     void StepRESUME( sal_uInt32 ),  StepSETCLASS( sal_uInt32 ), StepVBASETCLASS( sal_uInt32 ),  StepTESTCLASS( sal_uInt32 ), StepLIB( sal_uInt32 );
-    bool checkClass_Impl( const SbxVariableRef& refVal, const rtl::OUString& aClass, bool bRaiseErrors, bool bDefault = true );
+    bool checkClass_Impl( const SbxVariableRef& refVal, const String& aClass, bool bRaiseErrors, bool bDefault = true );
     void StepCLOSE( sal_uInt32 ),   StepPRCHAR( sal_uInt32 ),   StepARGTYP( sal_uInt32 );
     // Alle Opcodes mit zwei Operanden
     void StepRTL( sal_uInt32, sal_uInt32 ),     StepPUBLIC( sal_uInt32, sal_uInt32 ),   StepPUBLIC_P( sal_uInt32, sal_uInt32 );

basic/source/inc/sbunoobj.hxx

@@ -64,16 +64,16 @@ class SbUnoObject: public SbxObject
     void implCreateAll( void );
 
 public:
-    static bool getDefaultPropName( SbUnoObject* pUnoObj, ::rtl::OUString& sDfltProp );
+    static bool getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp );
     TYPEINFO();
-    SbUnoObject( const ::rtl::OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
+    SbUnoObject( const String& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
     ~SbUnoObject();
 
     // #76470 Introspection on Demand durchfuehren
     void doIntrospection( void );
 
     // Find ueberladen, um z.B. NameAccess zu unterstuetzen
-    virtual SbxVariable* Find( const ::rtl::OUString&, SbxClassType );
+    virtual SbxVariable* Find( const String&, SbxClassType );
 
     // Force creation of all properties for debugging
     void createAllProperties( void  )
@@ -115,7 +115,7 @@ class SbUnoMethod : public SbxMethod
 public:
     TYPEINFO();
 
-    SbUnoMethod( const ::rtl::OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
+    SbUnoMethod( const String& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
         bool bInvocation,
         bool bDirect = false );
     virtual ~SbUnoMethod();
@@ -143,7 +143,7 @@ class SbUnoProperty : public SbxProperty
     virtual ~SbUnoProperty();
 public:
     TYPEINFO();
-    SbUnoProperty( const ::rtl::OUString& aName_, SbxDataType eSbxType,
+    SbUnoProperty( const String& aName_, SbxDataType eSbxType,
         const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation );
 
     bool isInvocationBased( void )
@@ -155,7 +155,7 @@ class SbUnoFactory : public SbxFactory
 {
 public:
     virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
-    virtual SbxObject* CreateObject( const ::rtl::OUString& );
+    virtual SbxObject* CreateObject( const String& );
 };
 
 // Wrapper fuer eine Uno-Klasse
@@ -174,7 +174,7 @@ public:
     {}
 
     // Find ueberladen, um Elemente on Demand anzulegen
-    virtual SbxVariable* Find( const ::rtl::OUString&, SbxClassType );
+    virtual SbxVariable* Find( const String&, SbxClassType );
 
     // Wert rausgeben
     const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass( void ) { return m_xClass; }
@@ -185,7 +185,7 @@ SV_DECL_IMPL_REF(SbUnoClass);
 
 // Funktion, um einen globalen Bezeichner im
 // UnoScope zu suchen und fuer Sbx zu wrappen
-SbUnoClass* findUnoClass( const ::rtl::OUString& rName );
+SbUnoClass* findUnoClass( const String& rName );
 
 
 // Wrapper for UNO Service
@@ -203,13 +203,13 @@ public:
             , m_bNeedsInit( true )
     {}
 
-    virtual SbxVariable* Find( const ::rtl::OUString&, SbxClassType );
+    virtual SbxVariable* Find( const String&, SbxClassType );
 
     void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
 };
 SV_DECL_IMPL_REF(SbUnoService);
 
-SbUnoService* findUnoService( const ::rtl::OUString& rName );
+SbUnoService* findUnoService( const String& rName );
 
 
 void clearUnoServiceCtors( void );
@@ -227,7 +227,7 @@ class SbUnoServiceCtor : public SbxMethod
 public:
     TYPEINFO();
 
-    SbUnoServiceCtor( const::rtl::OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc );
+    SbUnoServiceCtor( const String& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc );
     virtual ~SbUnoServiceCtor();
     virtual SbxInfo* GetInfo();
 
@@ -243,14 +243,14 @@ class SbUnoSingleton : public SbxObject
 
 public:
     TYPEINFO();
-    SbUnoSingleton( const ::rtl::OUString& aName_,
+    SbUnoSingleton( const String& aName_,
         const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
 
     void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
 };
 SV_DECL_IMPL_REF(SbUnoSingleton);
 
-SbUnoSingleton* findUnoSingleton( const ::rtl::OUString& rName );
+SbUnoSingleton* findUnoSingleton( const String& rName );
 
 
 // #105565 Special Object to wrap a strongly typed Uno Any
@@ -348,8 +348,8 @@ private:
     void init();
 public:
     static VBAConstantHelper& instance();
-    SbxVariable* getVBAConstant( const ::rtl::OUString& rName );
-    bool isVBAConstantType( const ::rtl::OUString& rName );
+    SbxVariable* getVBAConstant( const String& rName );
+    bool isVBAConstantType( const String& rName );
 };
 
 #endif

basic/source/runtime/iosys.cxx

@@ -198,7 +198,7 @@ void SbiStream::MapError()
         ::rtl::OUString right = INetURLObject::decode( token.copy(eindex + 1).trim(), '%',
                             INetURLObject::DECODE_WITH_CHARSET );
 
-        if(left.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("user")))
+        if(left.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user"))))
         {
             user = right;
             break;

basic/source/runtime/step1.cxx

@@ -40,7 +40,7 @@
 #include "errobject.hxx"
 
 bool checkUnoObjectType( SbUnoObject* refVal,
-    const ::rtl::OUString& aClass );
+    const String& aClass );
 
 // Laden einer numerischen Konstanten (+ID)
 
@@ -437,15 +437,15 @@ void SbiRuntime::StepPRCHAR( sal_uInt32 nOp1 )
 
 // Check, ob TOS eine bestimmte Objektklasse ist (+StringID)
 
-bool SbiRuntime::implIsClass( SbxObject* pObj, const ::rtl::OUString& aClass )
+bool SbiRuntime::implIsClass( SbxObject* pObj, const String& aClass )
 {
     bool bRet = true;
 
-    if( !aClass.isEmpty() )
+    if( aClass.Len() != 0 )
     {
         bRet = pObj->IsClass( aClass );
         if( !bRet )
-            bRet = aClass.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("object") );
+            bRet = aClass.EqualsIgnoreCaseAscii( String( RTL_CONSTASCII_USTRINGPARAM("object") ) );
         if( !bRet )
         {
             String aObjClass = pObj->GetClassName();
@@ -463,7 +463,7 @@ bool SbiRuntime::implIsClass( SbxObject* pObj, const ::rtl::OUString& aClass )
 }
 
 bool SbiRuntime::checkClass_Impl( const SbxVariableRef& refVal,
-    const ::rtl::OUString& aClass, bool bRaiseErrors, bool bDefault )
+    const String& aClass, bool bRaiseErrors, bool bDefault )
 {
     bool bOk = bDefault;
 

basic/source/uno/namecont.cxx

@@ -448,7 +448,7 @@ sal_Bool SfxLibraryContainer::isModified() throw (RuntimeException)
         SfxLibrary* pImplLib = getImplLib( aName );
         if( pImplLib->isModified() )
         {
-            if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Standard") ) )
+            if ( aName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) ) )
             {
                 // this is a workaround that has to be implemented because
                 // empty standard library should stay marked as modified