diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-20 09:54:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-20 16:26:47 +0100 |
| commit | bfe1aa0e79cd1b849721760e89f254870b3f8000 (patch) | |
| tree | 354e42a284d7748d1d8c5f06b375d7b6106f6d05 /basic/source/runtime | |
| parent | 9c497e9ed128f341846072b1c85271d9208290a4 (diff) | |
XubString->rtl::OUString
Change-Id: I584ff580e3c8eee401f07c858ecbd63e5b0bf980
Diffstat (limited to 'basic/source/runtime')
| -rw-r--r-- | basic/source/runtime/stdobj.cxx | 4 | ||||
| -rw-r--r-- | basic/source/runtime/stdobj1.cxx | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index f96c48d7604a..1b3cd81d366f 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -753,7 +753,7 @@ SbiStdObject::~SbiStdObject() // return NULL without error code, so that a whole chain of // objects can be asked for the method/property. -SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t ) +SbxVariable* SbiStdObject::Find( const rtl::OUString& rName, SbxClassType t ) { // entered already? SbxVariable* pVar = SbxObject::Find( rName, t ); @@ -776,7 +776,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t ) { if( ( p->nArgs & nSrchMask ) && ( p->nHash == nHash_ ) - && ( rName.EqualsIgnoreCaseAscii( p->pName ) ) ) + && ( rName.equalsIgnoreAsciiCaseAscii( p->pName ) ) ) { SbiInstance* pInst = GetSbData()->pInst; bFound = sal_True; diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 816c4eb9ff46..0cd55efb3a6f 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -46,12 +46,11 @@ SbStdFactory::SbStdFactory() { } -SbxObject* SbStdFactory::CreateObject( const String& rClassName ) +SbxObject* SbStdFactory::CreateObject( const rtl::OUString& rClassName ) { - if( rClassName.EqualsIgnoreCaseAscii( String( RTL_CONSTASCII_USTRINGPARAM("Picture") ) ) ) + if( rClassName.equalsIgnoreAsciiCase("Picture") ) return new SbStdPicture; - else - if( rClassName.EqualsIgnoreCaseAscii( String( RTL_CONSTASCII_USTRINGPARAM("Font") ) ) ) + else if( rClassName.equalsIgnoreAsciiCase("Font") ) return new SbStdFont; else return NULL; @@ -135,7 +134,7 @@ SbStdPicture::~SbStdPicture() } -SbxVariable* SbStdPicture::Find( const String& rName, SbxClassType t ) +SbxVariable* SbStdPicture::Find( const rtl::OUString& rName, SbxClassType t ) { // entered already? return SbxObject::Find( rName, t ); @@ -258,7 +257,7 @@ SbStdFont::~SbStdFont() } -SbxVariable* SbStdFont::Find( const String& rName, SbxClassType t ) +SbxVariable* SbStdFont::Find( const rtl::OUString& rName, SbxClassType t ) { return SbxObject::Find( rName, t ); } @@ -427,7 +426,7 @@ SbStdClipboard::~SbStdClipboard() } -SbxVariable* SbStdClipboard::Find( const String& rName, SbxClassType t ) +SbxVariable* SbStdClipboard::Find( const rtl::OUString& rName, SbxClassType t ) { return SbxObject::Find( rName, t ); } |