summaryrefslogtreecommitdiff
path: root/basic/source/inc
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2011-04-19 18:01:53 +0100
committerNoel Power <noel.power@novell.com>2011-04-19 18:01:53 +0100
commit8a75a1f07d0c575ef08ab8385df3ef45e8552df1 (patch)
tree2e96860ccfbe43ffc79abc791ce76196e6b43f56 /basic/source/inc
parent3437d2196b1ca722a6146b40b4e06912482cedcd (diff)
Replace String with rtl::OUString in various places
Diffstat (limited to 'basic/source/inc')
-rw-r--r--basic/source/inc/runtime.hxx4
-rw-r--r--basic/source/inc/sbunoobj.hxx22
2 files changed, 13 insertions, 13 deletions
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 3ef1c3f849e6..e63f1838e2eb 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -358,7 +358,7 @@ class SbiRuntime
// #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
void DimImpl( SbxVariableRef refVar );
- bool implIsClass( SbxObject* pObj, const String& aClass );
+ bool implIsClass( SbxObject* pObj, const ::rtl::OUString& aClass );
void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
@@ -390,7 +390,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 String& aClass, bool bRaiseErrors, bool bDefault = true );
+ bool checkClass_Impl( const SbxVariableRef& refVal, const ::rtl::OUString& 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 );
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index ea3d62c80e7f..cc0f03903f17 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -64,9 +64,9 @@ class SbUnoObject: public SbxObject
void implCreateAll( void );
public:
- static bool getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp );
+ static bool getDefaultPropName( SbUnoObject* pUnoObj, ::rtl::OUString& sDfltProp );
TYPEINFO();
- SbUnoObject( const String& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
+ SbUnoObject( const ::rtl::OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
~SbUnoObject();
// #76470 Introspection on Demand durchfuehren
@@ -115,7 +115,7 @@ class SbUnoMethod : public SbxMethod
public:
TYPEINFO();
- SbUnoMethod( const String& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
+ SbUnoMethod( const rtl::OUString& 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 String& aName_, SbxDataType eSbxType,
+ SbUnoProperty( const rtl::OUString& aName_, SbxDataType eSbxType,
const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation );
bool isInvocationBased( void )
@@ -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 String& rName );
+SbUnoClass* findUnoClass( const ::rtl::OUString& rName );
// Wrapper for UNO Service
@@ -209,7 +209,7 @@ public:
};
SV_DECL_IMPL_REF(SbUnoService);
-SbUnoService* findUnoService( const String& rName );
+SbUnoService* findUnoService( const ::rtl::OUString& rName );
void clearUnoServiceCtors( void );
@@ -227,7 +227,7 @@ class SbUnoServiceCtor : public SbxMethod
public:
TYPEINFO();
- SbUnoServiceCtor( const String& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc );
+ SbUnoServiceCtor( const::rtl::OUString& 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 String& aName_,
+ SbUnoSingleton( const ::rtl::OUString& 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 String& rName );
+SbUnoSingleton* findUnoSingleton( const ::rtl::OUString& 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 String& rName );
- bool isVBAConstantType( const String& rName );
+ SbxVariable* getVBAConstant( const ::rtl::OUString& rName );
+ bool isVBAConstantType( const ::rtl::OUString& rName );
};
#endif