diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-03-22 17:05:42 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-22 17:05:42 +0000 |
commit | 18cf2ccd24740facefc006603a5fc77e51f7d2cc (patch) | |
tree | b74c9361571cd7628e466f88f86607bf878acf67 /basic/source/runtime/step1.cxx | |
parent | 5bac8101407c3c17ae0217f13c9f5f509cb5314b (diff) |
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.
Diffstat (limited to 'basic/source/runtime/step1.cxx')
-rwxr-xr-x | basic/source/runtime/step1.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx index 88661ead396d..53b482b8f22e 100755 --- a/basic/source/runtime/step1.cxx +++ b/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; |