diff options
| author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 19:49:53 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 20:03:42 +0200 |
| commit | d6bc02f8c4cd0f50f0a2631ac7634dab408efc1f (patch) | |
| tree | b5a12df1fcae025715633469b75ab4c9b6f6d279 | |
| parent | 0e1c0587617e0a6e4295a13599e97cdf6d1d2ea9 (diff) | |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
329 files changed, 1082 insertions, 2004 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 39b332c5590e..865a31d59f5e 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1248,15 +1248,13 @@ void Document::changeParagraphAttributes( // they do not replace the old attributes as required by // XAccessibleEditableText.setAttributes: for (::sal_Int32 i = 0; i < rAttributeSet.getLength(); ++i) - if (rAttributeSet[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("CharColor"))) + if ( rAttributeSet[i].Name == "CharColor" ) m_rEngine.SetAttrib(::TextAttribFontColor( mapFontColor(rAttributeSet[i].Value)), nNumber, static_cast< ::sal_uInt16 >(nBegin), static_cast< ::sal_uInt16 >(nEnd)); // XXX numeric overflow (2x) - else if (rAttributeSet[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("CharWeight"))) + else if ( rAttributeSet[i].Name == "CharWeight" ) m_rEngine.SetAttrib(::TextAttribFontWeight( mapFontWeight(rAttributeSet[i].Value)), nNumber, static_cast< ::sal_uInt16 >(nBegin), diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index d6ce0def323f..a7acc1e72002 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -838,8 +838,7 @@ sal_Bool DialogWindow::SaveDialog() aExtension = aCompleteName.copy( iDot + 1 ); } - if( aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "properties" ) ) || - aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "default" ) ) ) + if( aExtension == "properties" || aExtension == "default" ) { if( aPureName.indexOf( aDialogName_ ) == 0 ) { diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 3703776ef9ef..986efa392a93 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -760,8 +760,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima const beans::PropertyValue* pModuleDescr = aModuleDescr.getConstArray(); for ( sal_Int32 i = 0; i < nCount; ++i ) { - if ( pModuleDescr[ i ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryEmptyDocumentURL" ) ) ) + if ( pModuleDescr[ i ].Name == "ooSetupFactoryEmptyDocumentURL" ) { pModuleDescr[ i ].Value >>= sFactoryURL; break; diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 2395296b3e92..81e006bec1ff 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -758,7 +758,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo ) { Any aLibAny = xScriptCont->getByName( *pScriptLibName ); - if ( pScriptLibName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Standard")) ) + if ( *pScriptLibName == "Standard" ) xScriptCont->loadLibrary( *pScriptLibName ); BasMgrContainerListenerImpl::insertLibraryImpl diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 9bb8782cd016..18bf9739440e 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -1220,7 +1220,7 @@ void SfxLibraryContainer::implScanExtensions( void ) bool bPureDialogLib = false; while ( !(aLibURL = aScriptIt.nextBasicOrDialogLibrary( bPureDialogLib )).isEmpty()) { - if( bPureDialogLib && maInfoFileName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "script" ) ) ) + if( bPureDialogLib && maInfoFileName == "script" ) continue; // Extract lib name @@ -1771,7 +1771,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto if ( bStorage ) { // Don't write if only empty standard lib exists - if ( ( nNameCount == 1 ) && ( aNames[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) ) + if ( ( nNameCount == 1 ) && ( aNames[0] == "Standard" ) ) { Any aLibAny = maNameContainer.getByName( aNames[0] ); Reference< XNameAccess > xNameAccess; diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 9dd01a129b85..fff3a33d1001 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -326,24 +326,20 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement script::ModuleInfo aModInfo; aModInfo.ModuleType = ModuleType::UNKNOWN; - if( aMod.aModuleType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("normal") )) + if( aMod.aModuleType == "normal" ) { aModInfo.ModuleType = ModuleType::NORMAL; } - else if( aMod.aModuleType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("class") )) + else if( aMod.aModuleType == "class" ) { aModInfo.ModuleType = ModuleType::CLASS; } - else if( aMod.aModuleType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("form") )) + else if( aMod.aModuleType == "form" ) { aModInfo.ModuleType = ModuleType::FORM; aModInfo.ModuleObject = mxOwnerDocument; } - else if( aMod.aModuleType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("document") )) + else if( aMod.aModuleType == "document" ) { aModInfo.ModuleType = ModuleType::DOCUMENT; diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 7718c53a8266..50b873f6a70f 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -744,8 +744,7 @@ void Bridge::handleCommitChangeRequest( assert(ok); (void) ok; // avoid warnings for (sal_Int32 i = 0; i != s.getLength(); ++i) { - if (s[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("CurrentContext"))) + if ( s[i].Name == "CurrentContext" ) { ccMode = true; } else { diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index f3e06ab25e8c..de7762f3d6ed 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -142,8 +142,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge( throw css::bridge::BridgeExistsException( sName, static_cast< cppu::OWeakObject * >(this)); } - if (!(sProtocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("urp")) && - aConnection.is())) + if ( sProtocol != "urp" || !aConnection.is() ) { throw css::lang::IllegalArgumentException( rtl::OUString( diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index f5ded2927fea..e1b2291ff28a 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -169,8 +169,7 @@ void Writer::execute() { if (item.request) { sendRequest( item.tid, item.oid, item.type, item.member, item.arguments, - (!item.oid.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("UrpProtocolProperties")) && + (item.oid != "UrpProtocolProperties" && !item.member.equals( css::uno::TypeDescription( rtl::OUString( diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index a4548e17361b..87d210d300c7 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -512,10 +512,7 @@ void SAL_CALL uno_ext_getMapping( try { - if (from_env_typename.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(UNO_LB_JAVA) ) && - to_env_typename.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) )) + if ( from_env_typename == UNO_LB_JAVA && to_env_typename == UNO_LB_UNO ) { Bridge * bridge = new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1 @@ -524,10 +521,7 @@ void SAL_CALL uno_ext_getMapping( &mapping, Bridge_free, pFrom, (uno_Environment *)pTo->pExtEnv, 0 ); } - else if (from_env_typename.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ) && - to_env_typename.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(UNO_LB_JAVA) )) + else if ( from_env_typename == UNO_LB_UNO && to_env_typename == UNO_LB_JAVA ) { Bridge * bridge = new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1 diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx index c3f34edd62d7..1e0378db0850 100644 --- a/bridges/source/jni_uno/jni_info.cxx +++ b/bridges/source/jni_uno/jni_info.cxx @@ -461,8 +461,7 @@ JNI_type_info const * JNI_info::get_type_info( JNI_type_info const * JNI_info::get_type_info( JNI_context const & jni, OUString const & uno_name ) const { - if (uno_name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") )) + if ( uno_name == "com.sun.star.uno.XInterface" ) { return m_XInterface_type_info; } diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index a356be272e04..f890e49f898d 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -66,8 +66,7 @@ inline bool type_equals( inline bool is_XInterface( typelib_TypeDescriptionReference * type ) { return ((typelib_TypeClass_INTERFACE == type->eTypeClass) && - ::rtl::OUString::unacquired( &type->pTypeName ).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") )); + ::rtl::OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface"); } //============================================================================== diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 55674b44dd3d..26b757fa29e5 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -425,8 +425,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( #endif // special IQueryInterface.queryInterface() - if (method_name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("queryInterface") )) + if ( method_name == "queryInterface" ) { // oid JLocalAutoRef jo_oid( diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index ed046fb28fb1..fcf7fde15099 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -119,8 +119,7 @@ private: css::uno::Any Interface::queryInterface(css::uno::Type const & type) throw (css::uno::RuntimeException) { - return type.getTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.uno.XInterface")) + return type.getTypeName() == "com.sun.star.uno.XInterface" ? css::uno::makeAny(css::uno::Reference< css::uno::XInterface >(this)) : css::uno::Any(); } @@ -153,10 +152,8 @@ protected: css::uno::Any Base::queryInterface(css::uno::Type const & type) throw (css::uno::RuntimeException) { - return type.getTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "test.javauno.acquire.XBase")) - ? css::uno::makeAny( - css::uno::Reference< test::javauno::acquire::XBase >(this)) + return type.getTypeName() == "test.javauno.acquire.XBase" + ? css::uno::makeAny(css::uno::Reference< test::javauno::acquire::XBase >(this)) : Interface::queryInterface(type); } @@ -182,8 +179,7 @@ private: css::uno::Any Derived::queryInterface(css::uno::Type const & type) throw (css::uno::RuntimeException) { - return (type.getTypeName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("test.javauno.acquire.XDerived"))) + return ( type.getTypeName() == "test.javauno.acquire.XDerived" ) ? css::uno::makeAny( css::uno::Reference< test::javauno::acquire::XDerived >(this)) : Interface::queryInterface(type); diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 963fd77c5d8c..4a3449cb96d1 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -654,9 +654,8 @@ void DemoApp::Main() { ::rtl::OUString aParam = GetCommandLineParam( i ); - if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) || - aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) ) - bHelp = true; + if( aParam == "--help" || aParam == "-h" ) + bHelp = true; } if( bHelp ) diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 23566699cc0e..7c4595d5def1 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1042,8 +1042,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) { if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() ) { - if( !rTargetFrameName.isEmpty() && - rTargetFrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self"))) + if( !rTargetFrameName.isEmpty() && rTargetFrameName == "_self" ) return m_aDispatchContainer.getDispatchForURL( rURL ); } return uno::Reference< frame::XDispatch > (); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 17d413aee3be..892de4173820 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -118,8 +118,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aBytes )) { ::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes )); - if( aStrings.size() >= 3 && - aStrings[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "soffice" ))) + if( aStrings.size() >= 3 && aStrings[0] == "soffice" ) { OUString aDocName( aStrings[1] ); OUString aRangeString( aStrings[2] ); diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 33af33fd44aa..a9a2d0c5e0b5 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -97,8 +97,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( { uno::Reference< frame::XModel > xModel( m_xModel ); - if( xModel.is() && (rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" )) - || rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Redo" ))) ) + if( xModel.is() && ( rURL.Path == "Undo" || rURL.Path == "Redo" ) ) { CommandDispatch * pDispatch = new UndoCommandDispatch( m_xContext, xModel ); xResult.set( pDispatch ); @@ -107,8 +106,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( m_aCachedDispatches[ C2U(".uno:Redo") ].set( xResult ); m_aToBeDisposedDispatches.push_back( xResult ); } - else if( xModel.is() && (rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Context" )) - || rURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ModifiedStatus" ))) ) + else if( xModel.is() && ( rURL.Path == "Context" || rURL.Path == "ModifiedStatus" ) ) { Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), uno::UNO_QUERY ); CommandDispatch * pDispatch = new StatusBarCommandDispatch( m_xContext, xModel, xSelSupp ); diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index fa85ff3cce5a..6ce80c3fdaee 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -725,7 +725,7 @@ void ControllerCommandDispatch::fireStatusEvent( const OUString & rURL, const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ ) { - bool bIsChartSelectorURL = rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ChartElementSelector") ); + bool bIsChartSelectorURL = rURL == ".uno:ChartElementSelector"; if( rURL.isEmpty() || bIsChartSelectorURL ) { uno::Any aArg; @@ -742,8 +742,7 @@ void ControllerCommandDispatch::fireStatusEvent( // statusbar. Should be handled by base implementation // @todo: remove if Issue 68864 is fixed - if( rURL.isEmpty() || - rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:StatusBarVisible"))) + if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" ) { bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xController )); fireStatusEventForURL( C2U(".uno:StatusBarVisible"), uno::makeAny( bIsStatusBarVisible ), true, xSingleListener ); diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index db5a09ca3a11..bc3d6df79953 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -77,8 +77,8 @@ void StatusBarCommandDispatch::fireStatusEvent( const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ ) { bool bFireAll( rURL.isEmpty() ); - bool bFireContext( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Context"))); - bool bFireModified( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ModifiedStatus"))); + bool bFireContext( bFireAll || rURL == ".uno:Context" ); + bool bFireModified( bFireAll || rURL == ".uno:ModifiedStatus" ); if( bFireContext ) { diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 4c29848813ed..5b9299df9b65 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -92,9 +92,9 @@ void UndoCommandDispatch::fireStatusEvent( aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoActionTitle()); } - if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Undo"))) + if( bFireAll || rURL == ".uno:Undo" ) fireStatusEventForURL( C2U(".uno:Undo"), aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener ); - if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Redo"))) + if( bFireAll || rURL == ".uno:Redo" ) fireStatusEventForURL( C2U(".uno:Redo"), aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener ); } } diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 57c7975b8492..2a6e35b3df84 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -120,13 +120,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage( { // properties understood by storage factory // (see package/source/xstor/xfactory.cxx for details) - if ( rMediaDescriptor[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" )) - || rMediaDescriptor[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Password" )) - || rMediaDescriptor[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "RepairPackage" )) - ) + if ( rMediaDescriptor[i].Name == "InteractionHandler" || rMediaDescriptor[i].Name == "Password" || rMediaDescriptor[i].Name == "RepairPackage" ) { aPropertiesForStorage.push_back( rMediaDescriptor[i] ); } @@ -187,19 +181,12 @@ uno::Reference< embed::XStorage > lcl_getReadStorage( ::std::vector< beans::PropertyValue > aPropertiesForStorage; for( sal_Int32 i=rMediaDescriptor.getLength(); i--; ) { - if( rMediaDescriptor[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "InputStream" ))) + if( rMediaDescriptor[i].Name == "InputStream" ) xStream.set( rMediaDescriptor[i].Value, uno::UNO_QUERY ); // properties understood by storage factory // (see package/source/xstor/xfactory.cxx for details) - if ( rMediaDescriptor[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" )) - || rMediaDescriptor[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Password" )) - || rMediaDescriptor[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "RepairPackage" )) - ) + if ( rMediaDescriptor[i].Name == "InteractionHandler" || rMediaDescriptor[i].Name == "Password" || rMediaDescriptor[i].Name == "RepairPackage" ) { aPropertiesForStorage.push_back( rMediaDescriptor[i] ); } @@ -827,7 +814,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes { apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor ); if( aMDHelper.ISSET_FilterName ) - rOutOASIS = aMDHelper.FilterName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("chart8")); + rOutOASIS = aMDHelper.FilterName == "chart8"; } // ----------------------------------------------------------------------------- ::rtl::OUString XMLFilter::getMediaType(bool _bOasis) @@ -843,7 +830,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > { apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor ); if( aMDHelper.ISSET_FilterName ) - rOutOASIS = aMDHelper.FilterName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("StarOffice XML (Base) Report Chart")); + rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart"; } // ----------------------------------------------------------------------------- ::rtl::OUString XMLReportFilterHelper::getMediaType(bool ) diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index f4354c173e75..3ce9acd008fa 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -383,8 +383,7 @@ bool DataInterpreter::HasCategories( GetProperty( rArguments, C2U(("HasCategories"))) >>= bHasCategories; for( sal_Int32 nLSeqIdx=0; ! bHasCategories && nLSeqIdx<rData.getLength(); ++nLSeqIdx ) - bHasCategories = ( rData[nLSeqIdx].is() && - GetRole( rData[nLSeqIdx]->getValues()).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories"))); + bHasCategories = ( rData[nLSeqIdx].is() && GetRole( rData[nLSeqIdx]->getValues() ) == "categories"); return bHasCategories; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 4166b7336b85..4c0b1aecbda9 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -176,8 +176,7 @@ struct StaticErrorBarInfo : public rtl::StaticAggregate< uno::Reference< beans:: bool lcl_isInternalData( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xLSeq, uno::UNO_QUERY ); - return ( xServiceInfo.is() && xServiceInfo->getImplementationName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.chart2.LabeledDataSequence"))); + return ( xServiceInfo.is() && xServiceInfo->getImplementationName() == "com.sun.star.comp.chart2.LabeledDataSequence" ); } } // anonymous namespace diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 4566238cb7b8..3988da4fac95 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -101,29 +101,21 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ Reference< XRegressionCurve > xResult; // todo: use factory methods with service name - if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.LinearRegressionCurve" ))) + if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) { - xResult.set( - new LinearRegressionCurve( xContext )); + xResult.set( new LinearRegressionCurve( xContext ) ); } - else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.LogarithmicRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" ) { - xResult.set( - new LogarithmicRegressionCurve( xContext )); + xResult.set( new LogarithmicRegressionCurve( xContext ) ); } - else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.ExponentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" ) { - xResult.set( - new ExponentialRegressionCurve( xContext )); + xResult.set( new ExponentialRegressionCurve( xContext ) ); } - else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.PotentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" ) { - xResult.set( - new PotentialRegressionCurve( xContext )); + xResult.set( new PotentialRegressionCurve( xContext ) ); } return xResult; @@ -137,30 +129,25 @@ Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionC Reference< XRegressionCurveCalculator > xResult; // todo: use factory methods with service name - if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.MeanValueRegressionCurve" ))) + if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" ) { - xResult.set( new MeanValueRegressionCurveCalculator()); + xResult.set( new MeanValueRegressionCurveCalculator() ); } - if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.LinearRegressionCurve" ))) + if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) { - xResult.set( new LinearRegressionCurveCalculator()); + xResult.set( new LinearRegressionCurveCalculator() ); } - else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.LogarithmicRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" ) { - xResult.set( new LogarithmicRegressionCurveCalculator()); + xResult.set( new LogarithmicRegressionCurveCalculator() ); } - else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.ExponentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" ) { - xResult.set( new ExponentialRegressionCurveCalculator()); + xResult.set( new ExponentialRegressionCurveCalculator() ); } - else if( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.chart2.PotentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" ) { - xResult.set( new PotentialRegressionCurveCalculator()); + xResult.set( new PotentialRegressionCurveCalculator() ); } return xResult; @@ -192,15 +179,12 @@ void RegressionCurveHelper::initializeCurveCalculator( if( xProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole ) { - if( bUseXValuesIfAvailable && - ! bXValuesFound && - aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values-x" ))) + if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" ) { aXValues = DataSequenceToDoubleSequence( xSeq ); bXValuesFound = true; } - else if( ! bYValuesFound && - aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values-y" ))) + else if( !bYValuesFound && aRole == "values-y" ) { aYValues = DataSequenceToDoubleSequence( xSeq ); bYValuesFound = true; @@ -537,28 +521,23 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType( { ::rtl::OUString aServiceName( xServName->getServiceName() ); - if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LinearRegressionCurve" ))) + if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) { eResult = REGRESSION_TYPE_LINEAR; } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LogarithmicRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" ) { eResult = REGRESSION_TYPE_LOG; } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ExponentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" ) { eResult = REGRESSION_TYPE_EXP; } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.PotentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" ) { eResult = REGRESSION_TYPE_POWER; } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" ) { eResult = REGRESSION_TYPE_MEAN_VALUE; } @@ -604,28 +583,23 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR return aResult; OUString aServiceName( xServiceName->getServiceName()); - if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" ))) + if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" ) { aResult = ::chart::SchResId::getResString( STR_REGRESSION_MEAN ); } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LinearRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) { aResult = ::chart::SchResId::getResString( STR_REGRESSION_LINEAR ); } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LogarithmicRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" ) { aResult = ::chart::SchResId::getResString( STR_REGRESSION_LOG ); } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ExponentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" ) { aResult = ::chart::SchResId::getResString( STR_REGRESSION_EXP ); } - else if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.PotentialRegressionCurve" ))) + else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" ) { aResult = ::chart::SchResId::getResString( STR_REGRESSION_POWER ); } diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index d7d20e405f9b..7dace0bb4c37 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -648,13 +648,11 @@ Assembly * TypeEmitter::type_resolve( OUString uno_name( xType->getName() ); if (TypeClass_EXCEPTION == xType->getTypeClass()) { - if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.uno.Exception") )) + if ( uno_name == "com.sun.star.uno.Exception" ) { return get_type_Exception(); } - if (uno_name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.uno.RuntimeException") )) + if ( uno_name == "com.sun.star.uno.RuntimeException" ) { return get_type_RuntimeException(); } @@ -723,8 +721,7 @@ Assembly * TypeEmitter::type_resolve( Reference< reflection::XInterfaceTypeDescription2 > const & xType ) { OUString uno_name( xType->getName() ); - if (uno_name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") )) + if ( uno_name == "com.sun.star.uno.XInterface" ) { return __typeof (::System::Object); } @@ -750,8 +747,7 @@ Assembly * TypeEmitter::type_resolve( Reference<reflection::XInterfaceTypeDescription2> xIfaceTd = resolveInterfaceTypedef(seqBaseTypes[i]); - if (xIfaceTd->getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False) + if ( xIfaceTd->getName() != "com.sun.star.uno.XInterface" ) { vecBaseTypes.push_back(xIfaceTd); } @@ -867,8 +863,7 @@ Assembly * TypeEmitter::type_resolve( Reference<reflection::XInterfaceTypeDescription2> aBaseType = resolveInterfaceTypedef( seqBaseTypes[i]); - if (aBaseType->getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) == sal_False) + if ( aBaseType->getName() != "com.sun.star.uno.XInterface" ) { ::System::String * basetype_name = to_cts_name( aBaseType->getName() ); iface_entry * base_entry = dynamic_cast< iface_entry * >( diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index c910d8e5953f..3fb843b2c41d 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -326,16 +326,14 @@ void SAL_CALL uno_ext_getMapping( try { - if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) ) && - to_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) )) + if ( from_env_typename == UNO_LB_CLI && to_env_typename == UNO_LB_UNO ) { Bridge * bridge = new Bridge( pFrom, pTo->pExtEnv, true ); // ref count = 1 mapping = &bridge->m_cli2uno; uno_registerMapping( &mapping, Bridge_free, pFrom, (uno_Environment *)pTo->pExtEnv, 0 ); } - else if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ) && - to_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) )) + else if ( from_env_typename == UNO_LB_UNO && to_env_typename == UNO_LB_CLI ) { Bridge * bridge = new Bridge( pTo, pFrom->pExtEnv, false ); // ref count = 1 mapping = &bridge->m_uno2cli; diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 64dad4dd87dc..b4eac7855472 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -1587,9 +1587,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o) inc(); sal_Int16 nBases = m_reader.getSuperTypeCount(); OSL_ASSERT(nBases > 0); - if (nBases == 1 - && m_reader.getSuperTypeName(0).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XInterface"))) + if (nBases == 1 && m_reader.getSuperTypeName(0) == "com/sun/star/uno/XInterface" ) { nBases = 0; } @@ -2215,9 +2213,7 @@ void InterfaceType::dumpExceptionSpecification( rtl::OUString name( m_reader.getMethodExceptionTypeName( static_cast< sal_uInt16 >(methodIndex), i)); - if (!name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com/sun/star/uno/RuntimeException"))) + if ( name != "com/sun/star/uno/RuntimeException" ) { if (!first) { out << ", "; @@ -2269,9 +2265,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( sal_uInt16 n = m_reader.getMethodExceptionCount(methodIndex); for (sal_uInt16 i = 0; i < n; ++i) { rtl::OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i)); - if (!name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com/sun/star/uno/RuntimeException"))) + if ( name != "com/sun/star/uno/RuntimeException" ) { dumpExceptionTypeName(out, prefix, count++, name); } diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 1453122ce749..ddbb20ca60dd 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -2198,8 +2198,7 @@ void handleInterfaceType( || mflags == RT_MODE_ATTRIBUTE_SET) && reader.getMethodName(j) == attrNameUtf16) { - if (!reader.getMethodReturnTypeName(j).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("void")) + if (reader.getMethodReturnTypeName(j) != "void" || reader.getMethodParameterCount(j) != 0 || (mflags == RT_MODE_ATTRIBUTE_GET ? getter != SAL_MAX_UINT16 @@ -2895,8 +2894,7 @@ void handleService( reader.getMethodName(i))); bool defaultCtor = name.getLength() == 0; if (reader.getMethodFlags(i) != RT_MODE_TWOWAY - || (!reader.getMethodReturnTypeName(i).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("void"))) + || (reader.getMethodReturnTypeName(i) != "void") || (defaultCtor && (methods != 1 || reader.getMethodParameterCount(i) != 0 || reader.getMethodExceptionCount(i) != 0))) diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index 11786fa00e8b..2dc8a9b378d4 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -291,9 +291,7 @@ void RecursiveTest::disposing(css::lang::EventObject const & Source) void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt) throw (css::uno::RuntimeException) { - CPPUNIT_ASSERT( - evt.Source == properties_ && - evt.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label"))); + CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" ); if (count_ > 0) { --count_; step(); @@ -406,7 +404,7 @@ void Test::testKeySet() { RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>= s); - CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("baa"))); + CPPUNIT_ASSERT( s == "baa" ); } void Test::testKeyReset() { @@ -422,7 +420,7 @@ void Test::testKeyReset() { RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>= s); - CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Foo"))); + CPPUNIT_ASSERT( s == "Foo" ); } } @@ -436,8 +434,7 @@ void Test::testSetSetMemberName() { ".uno:FontworkShapeType")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>= s); - CPPUNIT_ASSERT( - s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Shape"))); + CPPUNIT_ASSERT( s == "Fontwork Shape" ); css::uno::Reference< css::container::XNameAccess > access( createUpdateAccess( @@ -468,8 +465,7 @@ void Test::testSetSetMemberName() { ".uno:FontworkShapeType")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>= s); - CPPUNIT_ASSERT( - s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Gallery"))); + CPPUNIT_ASSERT( s == "Fontwork Gallery" ); } void Test::testReadCommands() { diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 54e20e4fe154..5b40d3013cb0 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -221,7 +221,7 @@ Components & Components::getSingleton( } bool Components::allLocales(rtl::OUString const & locale) { - return locale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*")); + return locale == "*"; } rtl::Reference< Node > Components::resolvePathRepresentation( diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 3f41805b446e..940da36918bd 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -259,12 +259,10 @@ Service::createInstanceWithArguments( } } bool update; - if (ServiceSpecifier.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(accessServiceName))) + if ( ServiceSpecifier == accessServiceName ) { update = false; - } else if (ServiceSpecifier.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(updateAccessServiceName))) + } else if ( ServiceSpecifier == updateAccessServiceName ) { update = true; } else { diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 04ec1b14ddfb..70c39f80dbe9 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -181,7 +181,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException) // -------------------------------------------------------------------------------- sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url ) { - return (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:local")) || url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise"))||url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))&& EApiInit(); + return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit(); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 2021e799dfde..cb8a7499f7a9 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -333,7 +333,7 @@ namespace connectivity { namespace hsqldb { Reference< XRow > xValueAccess( xTableHsqlType, UNO_QUERY_THROW ); ::rtl::OUString sTableType = xValueAccess->getString( 1 ); - bIsTextTable = sTableType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TEXT" ) ); + bIsTextTable = sTableType == "TEXT"; } } catch( const Exception& ) diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 29e1a9e55229..89f5bb98b24a 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -157,7 +157,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV // sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - OSL_ENSURE( url.copy( 0, nLen ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:address" ) ), "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); + OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); ::rtl::OUString aAddrbookURI(url.copy(nLen+1)); // Get Scheme diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index af3eb9e8aa78..32ae159b329b 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -106,7 +106,7 @@ namespace connectivity { sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl) { - return _sUrl.copy(0,16).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:mysql:odbc:")); + return _sUrl.copy(0,16) == "sdbc:mysql:odbc:"; } //-------------------------------------------------------------------- sal_Bool isNativeUrl(const ::rtl::OUString& _sUrl) diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index b0b5d1a9d74e..4cc9b1578cf6 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1475,7 +1475,7 @@ static void columnMetaData2DatabaseTypeDescription( queryBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT oid,typtype,typname FROM pg_TYPE WHERE " ) ); while( rs->next() ) { - if( row->getString( 9 ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) && oidMap.find( row->getInt( 12 ) ) == oidMap.end() ) + if( row->getString( 9 ) == "d" && oidMap.find( row->getInt( 12 ) ) == oidMap.end() ) { oidMap[row->getInt(12)] = DatabaseTypeDescription(); if( domains ) @@ -1646,7 +1646,7 @@ static void columnMetaData2DatabaseTypeDescription( row[1] <<= sNewSchema; row[2] <<= sNewTable; row[3] <<= xRow->getString(3); - if( xRow->getString(8).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) ) + if( xRow->getString(8) == "d" ) { DatabaseTypeDescription desc( domainMap[xRow->getInt(11)] ); type = typeNameToDataType( desc.typeName, desc.typeType ); diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 415f2a402c42..404f1b81e2c2 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -308,9 +308,7 @@ void Test::testVoid() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -408,9 +406,7 @@ void Test::testBoolean() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -509,9 +505,7 @@ void Test::testByte() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -610,9 +604,7 @@ void Test::testShort() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -713,9 +705,7 @@ void Test::testUnsignedShort() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -810,9 +800,7 @@ void Test::testLong() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -907,9 +895,7 @@ void Test::testUnsignedLong() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1004,9 +990,7 @@ void Test::testHyper() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1101,9 +1085,7 @@ void Test::testUnsignedHyper() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1198,9 +1180,7 @@ void Test::testFloat() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1295,9 +1275,7 @@ void Test::testDouble() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1397,9 +1375,7 @@ void Test::testChar() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1494,9 +1470,7 @@ void Test::testString() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - (a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1591,9 +1565,7 @@ void Test::testType() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1689,9 +1661,7 @@ void Test::testSequence() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1792,9 +1762,7 @@ void Test::testEnum() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1893,9 +1861,7 @@ void Test::testStruct() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -1949,10 +1915,7 @@ void Test::testStruct() { void Test::testPoly() { css::uno::Any a; a <<= Poly< css::uno::Sequence< ::sal_Unicode > >(); - CPPUNIT_ASSERT_MESSAGE( - "type name", - a.getValueType().getTypeName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("Poly<[]char>"))); + CPPUNIT_ASSERT_MESSAGE( "type name", a.getValueType().getTypeName() == "Poly<[]char>" ); CPPUNIT_ASSERT_MESSAGE( "constructor", a == css::uno::Any(Poly< css::uno::Sequence< ::sal_Unicode > >())); @@ -2018,9 +1981,7 @@ void Test::testException() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -2136,9 +2097,7 @@ void Test::testInterface() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); @@ -2252,9 +2211,7 @@ void Test::testNull() { } { rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2")); - CPPUNIT_ASSERT_MESSAGE( - "rtl::OUString", - !(a >>= b) && b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2"))); + CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(getCppuType< rtl::OUString >()); diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 7a4d493ccc76..47ca98f3158e 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -217,8 +217,7 @@ inline InterfaceEntry * ObjectEntry::find( OUString const & type_name = OUString::unacquired( &((typelib_TypeDescription *) pTypeDescr_)->pTypeName ); - if (type_name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") )) + if ( type_name == "com.sun.star.uno.XInterface" ) { return &aInterfaces[ 0 ]; } diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 0dab9016732c..f7aad32d6062 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -427,7 +427,7 @@ static Mapping loadExternalMapping( oslModule hModule = 0; OUString aName; - if (EnvDcp::getTypeName(rFrom.getTypeName()).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) )) + if ( EnvDcp::getTypeName(rFrom.getTypeName()) == UNO_LB_UNO ) hModule = loadModule( aName = getBridgeName( rTo, rFrom, rAddPurpose ) ); if (! hModule) hModule = loadModule( aName = getBridgeName( rFrom, rTo, rAddPurpose ) ); diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 2e5e9523eb3a..1759c4a72af4 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -72,7 +72,7 @@ static inline void checkInterface( Type const & rType ) //-------------------------------------------------------------------------------------------------- static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(()) { - return (((OUString const *)&pStr)->equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XInterface") ) != sal_False); + return (*((OUString const *)&pStr) == "com.sun.star.uno.XInterface"); } //-------------------------------------------------------------------------------------------------- static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(()) diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index e4cddeb2add4..85a4d80a1d35 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -219,9 +219,7 @@ void Data::initProperties( // works if the specified exceptions are of the exact type, not // of a supertype: for (sal_Int32 j = 0; j < excs.getLength(); ++j) { - if (excs[j]->getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.beans.UnknownPropertyException"))) + if ( excs[j]->getName() == "com.sun.star.beans.UnknownPropertyException" ) { getUnknown = true; break; @@ -229,15 +227,10 @@ void Data::initProperties( } excs = attr->getSetExceptions(); for (sal_Int32 j = 0; j < excs.getLength(); ++j) { - if (excs[j]->getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.beans.UnknownPropertyException"))) + if ( excs[j]->getName() == "com.sun.star.beans.UnknownPropertyException" ) { setUnknown = true; - } else if (excs[j]->getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.beans." - "PropertyVetoException"))) + } else if ( excs[j]->getName() == "com.sun.star.beans.PropertyVetoException" ) { attrAttribs |= css::beans::PropertyAttribute::CONSTRAINED; diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index ff4f41769b56..db8835f5c9e9 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -256,8 +256,7 @@ static void add_access_control_entries( "single-user-id"); entry.value <<= ac_user; context_values.push_back( entry ); - if (! ac_mode.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("single-user") )) + if ( ac_mode != "single-user" ) { throw SecurityException( OUSTR("set UNO_AC=single-user " @@ -267,8 +266,7 @@ static void add_access_control_entries( } else { - if (! ac_mode.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("single-default-user") )) + if ( ac_mode != "single-default-user" ) { throw SecurityException( OUSTR("set UNO_AC=single-default-user " diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 2dd1d57b47da..ac976be57740 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -113,14 +113,14 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA OSL_VERIFY( n == 13 ); OSL_VERIFY( m_xContext->getValueByName( OUSTR("/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop1") ) >>= val ); - OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("value of serviceprop1") ) ); + OSL_VERIFY( val == "value of serviceprop1" ); // impl properties OSL_VERIFY( m_xContext->getValueByName( OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop0") ) >>= n ); OSL_VERIFY( n == 15 ); OSL_VERIFY( m_xContext->getValueByName( OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop1") ) >>= val ); - OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("value of implprop1") ) ); + OSL_VERIFY( val == "value of implprop1" ); } // XInitialization //__________________________________________________________________________________________________ @@ -131,11 +131,11 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs ) OUString val; OSL_VERIFY( rArgs.getLength() == 3 ); OSL_VERIFY( rArgs[ 0 ] >>= val ); - OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("first argument") ) ); + OSL_VERIFY( val == "first argument" ); OSL_VERIFY( rArgs[ 1 ] >>= val ); - OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("second argument") ) ); + OSL_VERIFY( val == "second argument" ); OSL_VERIFY( rArgs[ 2 ] >>= val ); - OSL_VERIFY( val.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("third argument") ) ); + OSL_VERIFY( val == "third argument" ); } // XServiceInfo //__________________________________________________________________________________________________ diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index cfeeb51c403e..f38f2610b40b 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -349,24 +349,24 @@ static void dotest( const Reference< XInterface > & xOriginal ) } Reference< A > xa( xOriginal, UNO_QUERY ); - OSL_ENSURE( xa->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### A failed!" ); + OSL_ENSURE( xa->a() == "a", "### A failed!" ); Reference< BA > xba( xa, UNO_QUERY ); - OSL_ENSURE( xba->ba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ba") ), "### BA failed!" ); - OSL_ENSURE( xba->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### BA failed!" ); + OSL_ENSURE( xba->ba() == "ba", "### BA failed!" ); + OSL_ENSURE( xba->a() == "a" ), "### BA failed!" ); Reference< CA > xca( xba, UNO_QUERY ); - OSL_ENSURE( xca->ca().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ca") ), "### CA failed!" ); - OSL_ENSURE( xca->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### CA failed!" ); + OSL_ENSURE( xca->ca() == "ca", "### CA failed!" ); + OSL_ENSURE( xca->a() == "a", "### CA failed!" ); Reference< DBA > xdba( xca, UNO_QUERY ); - OSL_ENSURE( xdba->dba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dba") ), "### DBA failed!" ); - OSL_ENSURE( xdba->ba().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ba") ), "### DBA failed!" ); - OSL_ENSURE( xdba->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### DBA failed!" ); + OSL_ENSURE( xdba->dba() == "dba", "### DBA failed!" ); + OSL_ENSURE( xdba->ba() == "ba", "### DBA failed!" ); + OSL_ENSURE( xdba->a() == "a", "### DBA failed!" ); Reference< E > xe( xdba, UNO_QUERY ); - OSL_ENSURE( xe->e().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("e") ), "### E failed!" ); + OSL_ENSURE( xe->e() == "e", "### E failed!" ); Reference< FE > xfe( xe, UNO_QUERY ); - OSL_ENSURE( xfe->fe().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("fe") ), "### FE failed!" ); + OSL_ENSURE( xfe->fe() == "fe", "### FE failed!" ); Reference< G > xg( xfe, UNO_QUERY ); - OSL_ENSURE( xg->g().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("g") ), "### G failed!" ); - OSL_ENSURE( xg->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### G failed!" ); + OSL_ENSURE( xg->g() == "g", "### G failed!" ); + OSL_ENSURE( xg->a() == "a", "### G failed!" ); // type provider Reference< lang::XTypeProvider > xProv( xg, UNO_QUERY ); @@ -466,16 +466,16 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) dotest( xWeakImpl ); Reference< H > xH( xWeakImpl, UNO_QUERY ); Reference< I > xI( xH, UNO_QUERY ); - OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h") ) ); - OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i") ) ); + OSL_ASSERT( xH->h() == "h" ); + OSL_ASSERT( xI->i() == "i" ); xWeakAggImpl = (OWeakObject *)new TestAggImplInh(); Reference< lang::XTypeProvider > xTP7( xWeakAggImpl, UNO_QUERY ); dotest( xWeakAggImpl ); xH.set( xWeakAggImpl, UNO_QUERY ); xI.set( xH, UNO_QUERY ); - OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h2") ) ); - OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i2") ) ); + OSL_ASSERT( xH->h() == "h2" ); + OSL_ASSERT( xI->i() == "i2" ); // OSL_ASSERT( @@ -545,8 +545,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) } catch (RuntimeException & rExc) { - OSL_ENSURE( rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("runtime exc") ) && rExc.Context == xImpl, - "### unexpected exception content!" ); + OSL_ENSURE( rExc.Message == "runtime exc" && rExc.Context == xImpl, "### unexpected exception content!" ); try { throwException( makeAny( Exception( @@ -558,8 +557,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) } catch (Exception & rExc2) { - OSL_ENSURE( rExc2.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("exc") ) && rExc2.Context == xImpl, - "### unexpected exception content!" ); + OSL_ENSURE( rExc2.Message == "exc" && rExc2.Context == xImpl, "### unexpected exception content!" ); try { throwException( makeAny( lang::IllegalAccessException( @@ -567,8 +565,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) } catch (lang::IllegalAccessException & rExc3) { - OSL_ENSURE( rExc3.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("axxess exc") ) && rExc3.Context == xImpl, - "### unexpected exception content!" ); + OSL_ENSURE( rExc3.Message == "axxess exc" && rExc3.Context == xImpl, "### unexpected exception content!" ); return; } } diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index a3ea100c3014..a522f2de53b7 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -534,9 +534,7 @@ Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName ) if (_aImplName.isEmpty() && _aServiceName.isEmpty()) { - OSL_ASSERT( - rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("uno.ComponentContext") ) ); + OSL_ASSERT( rName == "uno.ComponentContext" ); xRet = _xContext; } else if (_bSingleInstance) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index cf277504688b..5624c734d2b9 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -404,9 +404,7 @@ SvxConfigPage::CanConfig( const OUString& aModuleId ) { OSL_TRACE("SupportsDocumentConfig: %s", PRTSTR(aModuleId)); - if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.script.BasicIDE" ) ) - || aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.frame.Bibliography" ) ) - ) + if ( aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography" ) { return sal_False; } diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 02055ae59142..f626d9e6992b 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -801,9 +801,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( moduleDescr.getConstArray(); for ( sal_Int32 pos = moduleDescr.getLength(); pos--; ) { - if (pmoduleDescr[ pos ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "ooSetupFactoryEmptyDocumentURL") )) + if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" ) { pmoduleDescr[ pos ].Value >>= factoryURL; OSL_TRACE("factory url for doc images is %s", diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index de928ddc37d1..6343692a850c 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -315,7 +315,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows Sequence< Reference< browse::XBrowseNode > > children = _rxRootNode->getChildNodes(); - sal_Bool bIsRootNode = _rxRootNode->getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Root")); + sal_Bool bIsRootNode = _rxRootNode->getName() == "Root"; /* To mimic current starbasic behaviour we need to make sure that only the current document @@ -586,7 +586,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( Image aImage; if ( bIsRootNode ) { - if ( node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) || node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "share" ) ) ) + if ( node->getName() == "user" || node->getName() == "share" ) { aImage = m_hdImage; } @@ -619,9 +619,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( moduleDescr.getConstArray(); for ( sal_Int32 pos = moduleDescr.getLength(); pos--; ) { - if (pmoduleDescr[ pos ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "ooSetupFactoryEmptyDocumentURL") )) + if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" ) { pmoduleDescr[ pos ].Value >>= factoryURL; break; diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index f0bfdef0aaab..3ee3e8fad261 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -169,10 +169,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : rtl::OUStringBuffer sText(m_aVendorTextStr); sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n")); - sal_uInt32 nCopyrightId = - utl::ConfigManager::getProductName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("LibreOffice")) - ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED; + sal_uInt32 nCopyrightId = utl::ConfigManager::getProductName() == "LibreOffice" ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED; String aProductCopyrightTextStr(ResId(nCopyrightId, *rId.GetResMgr())); sText.append(aProductCopyrightTextStr); sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n")); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 3531a203b230..0e3af3134610 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -197,15 +197,15 @@ void SvxHyperlinkNewDocTp::FillDocumentList () rDynamicMenuEntry[e].Value >>= aTargetName; } //#i96822# business cards, labels and database should not be inserted here - if( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21051" ) ) || - aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21052" )) || - aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/sdatabase?Interactive" ))) + if( aDocumentUrl == "private:factory/swriter?slot=21051" || + aDocumentUrl == "private:factory/swriter?slot=21052" || + aDocumentUrl == "private:factory/sdatabase?Interactive" ) continue; // Insert into listbox if ( !aDocumentUrl.isEmpty() ) { - if ( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/simpress?slot=6686" ) ) ) // SJ: #106216# do not start + if ( aDocumentUrl == "private:factory/simpress?slot=6686" ) // SJ: #106216# do not start aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress // insert private-url and default-extension as user-data diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 09709513a5af..30be39a6782e 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -243,9 +243,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) moduleDescr.getConstArray(); for ( sal_Int32 pos = moduleDescr.getLength(); pos--; ) { - if (pmoduleDescr[ pos ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "ooSetupFactoryEmptyDocumentURL") )) + if ( pmoduleDescr[ pos ].Name == "ooSetupFactoryEmptyDocumentURL" ) { pmoduleDescr[ pos ].Value >>= factoryURL; break; diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 62f38c2eafab..ef344864afef 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -131,7 +131,7 @@ String ConvertToUIName_Impl( SvxMacro *pMacro ) { String aName( pMacro->GetMacName() ); String aEntry; - if ( ! pMacro->GetLanguage().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("JavaScript")) ) + if ( pMacro->GetLanguage() != "JavaScript" ) { sal_uInt16 nCount = comphelper::string::getTokenCount(aName, '.'); aEntry = aName.GetToken( nCount-1, '.' ); diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 8fb0d6ac9103..fe3a2b1c1e7a 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -360,7 +360,7 @@ void OKeySet::executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OU for(;pAnd != pAndEnd;++pAnd) { ::rtl::OUString sValue; - if ( !(pAnd->Value >>= sValue) || !(sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("?")) || sValue.matchAsciiL(":",1,0)) ) + if ( !(pAnd->Value >>= sValue) || !( sValue == "?" || sValue.matchAsciiL( ":",1,0 ) ) ) { // we have a criteria which has to be taken into account for updates m_aFilterColumns.push_back(pAnd->Name); } diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index e80093ebc464..2e69373e0a01 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -681,9 +681,7 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createInstance" ); Reference< XServiceInfo > xRet; - if ( ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier ) - || ( _sServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) ) ) - ) + if ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier || _sServiceSpecifier == "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) { xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext ); m_aComposers.push_back(WeakReferenceHelper(xRet)); diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 27dbacc5419d..f533642e158f 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -2046,7 +2046,7 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewControlle Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const ::rtl::OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException) { - if ( !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Default" ) ) && !_ViewName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) ) ) + if ( _ViewName != "Default" && _ViewName != "Preview" ) throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); if ( !_Frame.is() ) throw IllegalArgumentException( ::rtl::OUString(), *this, 3 ); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index bf95e7cf18c1..fa818936bf12 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -614,7 +614,7 @@ void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { ClearableMutexGuard aGuard(m_aMutex); - if(evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) )) + if( evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName == "Title" ) { m_bInPropertyChange = sal_True; try @@ -641,7 +641,7 @@ void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& a { MutexGuard aGuard(m_aMutex); - if(aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + if( aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" ) { ::rtl::OUString sNewName; aEvent.NewValue >>= sNewName; diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index 9d5420f1b8cd..df1a60f5a34b 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -190,10 +190,7 @@ namespace dbaccess // no script is assigned to this event return; - bool bDispatchScriptURL = - ( sEventType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) ) - || sEventType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Service" ) ) - ); + bool bDispatchScriptURL = ( sEventType == "Script" || sEventType == "Service" ); bool bNonEmptyScript = !sScript.isEmpty(); OSL_ENSURE( bDispatchScriptURL && bNonEmptyScript, diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 255fd9339247..541c92137383 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -278,7 +278,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum ::rtl::OUString aRole; if ( xSeqProp.is() && ( xSeqProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ) ) ) >>= aRole ) - && aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "categories" ) ) + && aRole == "categories" ) { bHasCategories = sal_True; diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 965c2f88d768..1490f2a99095 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -231,7 +231,7 @@ namespace dbaccess continue; // the only section we support so far is "storages" - if ( !sCurrentSection.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "storages" ) ) ) + if ( sCurrentSection != "storages" ) { bCurrentSectionIsKnownToBeUnsupported = true; continue; diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 3b22a201d377..dab60369c9b0 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -117,7 +117,7 @@ namespace dbaccess o_rLocalName = i_rElementName.copy( nSeparatorPos + 1 ); } - OSL_ENSURE( o_rNamespace.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config" ) ), "SettingsImport::split: unexpected namespace!" ); + OSL_ENSURE( o_rNamespace == "config", "SettingsImport::split: unexpected namespace!" ); // our recovery file is kind of hand-made, so there shouldn't be anything else than "config". // If there is, then just ignore it ... } diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 5da4555fd2aa..1013551b167f 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -332,7 +332,7 @@ namespace dbmm bool bCausedByNewStyleReport = ( _rDocument.eType == eReport ) && ( aError.isExtractableTo( ::cppu::UnoType< WrongFormatException >::get() ) ) - && ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.sun.xml.report" ) ) ); + && ( lcl_getMimeType_nothrow( _rDocument.xCommandProcessor ) == "application/vnd.sun.xml.report" ); if ( bCausedByNewStyleReport ) { @@ -1636,9 +1636,7 @@ namespace dbmm Any aException; try { - if ( !_rScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) ) - || _rScriptType.isEmpty() - ) + if ( _rScriptType != "Script" || _rScriptType.isEmpty() ) { OSL_FAIL( "MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: no or unknown script type!" ); @@ -1669,7 +1667,7 @@ namespace dbmm ::rtl::OUString sLocation = xUri->getParameter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "location" ) ) ); - if ( !sLocation.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "document" ) ) ) + if ( sLocation != "document" ) { // only document libraries must be migrated, of course return false; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 1e5aa44e2fd7..df140ed3e71d 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -165,7 +165,7 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac { ::rtl::OUString sMediaType; xStorageProperties->getPropertyValue( INFO_MEDIATYPE ) >>= sMediaType; - if ( sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII)) || sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_VND_SUN_XML_BASE_ASCII)) ) + if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII || sMediaType == MIMETYPE_VND_SUN_XML_BASE_ASCII ) { if ( bStreamFromDescr && sURL.compareTo( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ), 14 ) != COMPARE_EQUAL ) { @@ -346,7 +346,7 @@ namespace URL aURL; aURL.Complete = _rURL; xTransformer->parseStrict( aURL ); - bDoesAllow = aURL.Arguments.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Interactive" ) ); + bDoesAllow = aURL.Arguments == "Interactive"; } } catch( const Exception& ) diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 8916e2f205d3..5cbaaf602669 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -90,7 +90,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport m_sHelpMessage = sValue; break; case XML_TOK_COLUMN_VISIBILITY: - m_bHidden = !sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("visible")); + m_bHidden = sValue != "visible"; break; case XML_TOK_COLUMN_TYPE_NAME: sType = sValue; @@ -101,7 +101,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport m_aDefaultValue <<= sValue; break; case XML_TOK_COLUMN_VISIBLE: - m_bHidden = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false")); + m_bHidden = sValue == "false"; break; case XML_TOK_DEFAULT_CELL_STYLE_NAME: m_sCellStyleName = sValue; diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index bbe086fe87ec..5147b34af921 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -72,7 +72,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport switch( rTokenMap.Get( nPrefix, sLocalName ) ) { case XML_TOK_DATA_SOURCE_SETTING_IS_LIST: - m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); + m_bIsList = sValue == "true"; break; case XML_TOK_DATA_SOURCE_SETTING_TYPE: { diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 1b93b9fb8df1..3b011eb7a1d5 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -76,7 +76,7 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport m_sCommand = sValue; break; case XML_TOK_ESCAPE_PROCESSING: - m_bEscapeProcessing = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); + m_bEscapeProcessing = sValue == "true"; break; } } diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index b2dfb3339491..d3460f58b210 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -90,10 +90,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport, if ( !sType.isEmpty() ) { ::rtl::OUStringBuffer sURL; - if ( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysql:jdbc" ) ) - || sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysqlc" ) ) - || sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "sdbc:mysql:mysqlc" ) ) - ) + if ( sType == "sdbc:mysql:jdbc" || sType == "sdbc:mysqlc" || sType == "sdbc:mysql:mysqlc" ) { sURL.append( sType ); sURL.append( sal_Unicode( ':' ) ); diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 8f5ae4005321..47d0b234d3f2 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -91,10 +91,10 @@ OXMLTable::OXMLTable( ODBFilter& _rImport m_sStyleName = sValue; break; case XML_TOK_APPLY_FILTER: - m_bApplyFilter = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); + m_bApplyFilter = sValue == "true"; break; case XML_TOK_APPLY_ORDER: - m_bApplyOrder = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); + m_bApplyOrder = sValue == "true"; break; } } diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 30cbad8bfa0a..36dacbc1810a 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -151,7 +151,7 @@ bool ObjectCopySource::isView() const { ::rtl::OUString sObjectType; OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_TYPE ) >>= sObjectType ); - bIsView = sObjectType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VIEW" ) ); + bIsView = sObjectType == "VIEW"; } } catch( const Exception& ) diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 92da668d101a..4c27e53ca983 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -136,8 +136,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) "system.desktop-environment" ) ) ); rtl::OUString aDesktopEnvironment; - if ((aValue >>= aDesktopEnvironment) - && aDesktopEnvironment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME"))) + if ( (aValue >>= aDesktopEnvironment) && aDesktopEnvironment == "GNOME" ) { Reference<XContentProviderManager> xCPM = cb->getContentProviderManagerInterface(); diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index e62315b08780..60d40af145c1 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -596,56 +596,56 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& { AddStringListParam_Impl( CMD_STRINGPARAM_LANGUAGE, oArg.copy(RTL_CONSTASCII_LENGTH("language=")) ); } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "writer" )) == sal_True ) + else if ( oArg == "writer" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WRITER ); if ( !bAlreadySet ) SetBoolParam_Impl( CMD_BOOLPARAM_WRITER, sal_True ); m_bDocumentArgs = true; } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "calc" )) == sal_True ) + else if ( oArg == "calc" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_CALC ); if ( !bAlreadySet ) SetBoolParam_Impl( CMD_BOOLPARAM_CALC, sal_True ); m_bDocumentArgs = true; } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "draw" )) == sal_True ) + else if ( oArg == "draw" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_DRAW ); if ( !bAlreadySet ) SetBoolParam_Impl( CMD_BOOLPARAM_DRAW, sal_True ); m_bDocumentArgs = true; } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "impress" )) == sal_True ) + else if ( oArg == "impress" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_IMPRESS ); if ( !bAlreadySet ) SetBoolParam_Impl( CMD_BOOLPARAM_IMPRESS, sal_True ); m_bDocumentArgs = true; } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "base" )) == sal_True ) + else if ( oArg == "base" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_BASE ); if ( !bAlreadySet ) SetBoolParam_Impl( CMD_BOOLPARAM_BASE, sal_True ); m_bDocumentArgs = true; } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "global" )) == sal_True ) + else if ( oArg == "global" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_GLOBAL ); if ( !bAlreadySet ) SetBoolParam_Impl( CMD_BOOLPARAM_GLOBAL, sal_True ); m_bDocumentArgs = true; } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "math" )) == sal_True ) + else if ( oArg == "math" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_MATH ); if ( !bAlreadySet ) SetBoolParam_Impl( CMD_BOOLPARAM_MATH, sal_True ); m_bDocumentArgs = true; } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "web" )) == sal_True ) + else if ( oArg == "web" ) { sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WEB ); if ( !bAlreadySet ) diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 572b91e884cf..ec2c40a61860 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -139,14 +139,9 @@ void PackageManagerImpl::initActivationLayer( Reference<sdbc::XRow> xRow( xResultSet, UNO_QUERY_THROW ); OUString title( xRow->getString( 1 /* Title */ ) ); // xxx todo: remove workaround for tdoc - if (title.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "this_is_a_dummy_stream_just_there_" - "as_a_workaround_for_a_" - "temporary_limitation_of_the_" - "storage_api_implementation") )) + if ( title == "this_is_a_dummy_stream_just_there_as_a_workaround_for_a_temporary_limitation_of_the_storage_api_implementation" ) continue; - if (title.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "META-INF") ) ) + if ( title == "META-INF" ) continue; ::ucbhelper::Content sourceContent( diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 710eea88adf9..e7de531dd995 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -118,28 +118,19 @@ check(dp_misc::DescriptionInfoset const & infoset) { css::uno::Reference< css::xml::dom::XElement > e( deps->item(i), css::uno::UNO_QUERY_THROW); bool sat = false; - if (e->getNamespaceURI().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg)) - && e->getTagName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(minimalVersionOpenOfficeOrg))) + if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == minimalVersionOpenOfficeOrg ) { sat = satisfiesMinimalVersion( getReferenceOpenOfficeOrgMajorMinor(), e->getAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); - } else if (e->getNamespaceURI().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg)) - && e->getTagName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(maximalVersionOpenOfficeOrg))) + } else if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName() == maximalVersionOpenOfficeOrg ) { sat = satisfiesMaximalVersion( getReferenceOpenOfficeOrgMajorMinor(), e->getAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); - } else if (e->getNamespaceURI().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(namespaceLibreOffice)) - && e->getTagName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(minimalVersionLibreOffice))) + } else if (e->getNamespaceURI() == namespaceLibreOffice && e->getTagName() == minimalVersionLibreOffice ) { sat = satisfiesMinimalVersion( getLibreOfficeMajorMinorMicro(), @@ -173,30 +164,21 @@ rtl::OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency) { OSL_ASSERT(dependency.is()); - if (dependency->getNamespaceURI().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg)) - && dependency->getTagName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(minimalVersionOpenOfficeOrg))) + if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg ) { return produceErrorText( ResId::toString( dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN)), dependency->getAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); - } else if (dependency->getNamespaceURI().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(namespaceOpenOfficeOrg)) - && dependency->getTagName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(maximalVersionOpenOfficeOrg))) + } else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg ) { return produceErrorText( ResId::toString( dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX)), dependency->getAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")))); - } else if (dependency->getNamespaceURI().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(namespaceLibreOffice)) - && dependency->getTagName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(minimalVersionLibreOffice))) + } else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice ) { return produceErrorText( ResId::toString( diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 37957e560233..9ec87c0f123f 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -133,9 +133,7 @@ bool create_folder( { // make sure the only required bootstrap property is "Title": Sequence<beans::Property> const & rProps = info.Properties; - if (rProps.getLength() != 1 || - !rProps[ 0 ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("Title") )) + if ( rProps.getLength() != 1 || rProps[ 0 ].Name != "Title" ) continue; try { diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index b28d0a0b5a5d..1d4b86ad9f87 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -407,8 +407,7 @@ BackendImpl::ComponentPackageImpl::getRDB() const that->initServiceRdbFiles(); } } - if (m_loader.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.SharedLibrary") )) + if ( m_loader == "com.sun.star.loader.SharedLibrary" ) return that->m_xNativeRDB; else return that->m_xCommonRDB; @@ -420,8 +419,7 @@ BackendImpl::ComponentPackageImpl::getRDB_RO() const { BackendImpl * that = getMyBackend(); - if (m_loader.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.SharedLibrary") )) + if ( m_loader == "com.sun.star.loader.SharedLibrary" ) return that->m_xNativeRDB_RO; else return that->m_xCommonRDB_RO; @@ -498,9 +496,7 @@ void BackendImpl::initServiceRdbFiles() &oldRDB, makeURL( getCachePath(), m_commonRDB_RO), xCmdEnv, false /* no throw */ ); } - m_commonRDB = m_commonRDB_RO.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("common.rdb") ) - ? OUSTR("common_.rdb") : OUSTR("common.rdb"); + m_commonRDB = m_commonRDB_RO == "common.rdb" ? OUSTR("common_.rdb") : OUSTR("common.rdb"); if (oldRDB.get().is()) { if (! cacheDir.transferContent( @@ -729,13 +725,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( Reference<XCommandEnvironment> const & xCmdEnv ) { OUString mediaType(mediaType_); - if (mediaType.isEmpty() || - mediaType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "application/vnd.sun.star.uno-component") ) || - mediaType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "application/vnd.sun.star.uno-typelibrary") )) + if ( mediaType.isEmpty() || mediaType == "application/vnd.sun.star.uno-component" || mediaType == "application/vnd.sun.star.uno-typelibrary" ) { // detect exact media-type: ::ucbhelper::Content ucbContent; @@ -961,11 +951,7 @@ void BackendImpl::unorc_verify_init( RTL_CONSTASCII_LENGTH("?$ORIGIN/")); state = 2; } - else if (state <= 2 && - token.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "${$ORIGIN/${_OS}_${_ARCH}rc:" - "UNO_SERVICES}"))) + else if ( state <= 2 && token == "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}" ) { state = 3; } @@ -1605,9 +1591,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( m_loader, url, getRDB()); // Only write to unorc after successful registration; it may fail if // there is no suitable java - if (m_loader.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2")) && - !jarManifestHeaderPresent(url, OUSTR("UNO-Type-Path"), xCmdEnv)) + if (m_loader == "com.sun.star.loader.Java2" && !jarManifestHeaderPresent(url, OUSTR("UNO-Type-Path"), xCmdEnv)) { that->addToUnoRc(RCITEM_JAR_TYPELIB, url, xCmdEnv); data.javaTypeLibrary = true; diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 528c413806db..587946a69489 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -235,10 +235,7 @@ void PackageRegistryImpl::insertBackend( //The package backend shall also be called to determine the mediatype //(XPackageRegistry.bindPackage) when the URL points to a directory. const bool bExtension = mediaType.equals(OUSTR("application/vnd.sun.star.package-bundle")); - if (fileFilter.isEmpty() || - fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*.*") ) || - fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ) || - bExtension) + if (fileFilter.isEmpty() || fileFilter == "*.*" || fileFilter == "*" || bExtension) { m_ambiguousBackends.insert( xBackend ); } diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 23f583e16823..81b88058b609 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1458,17 +1458,13 @@ void BackendImpl::PackageImpl::scanBundle( { if (!(fullPath.isEmpty() || mediaType.isEmpty())) break; - if (attribs[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("FullPath") )) + if ( attribs[i].Name == "FullPath" ) attribs[i].Value >>= fullPath; - else if (attribs[i].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("MediaType") )) + else if ( attribs[i].Name == "MediaType" ) attribs[i].Value >>= mediaType; } - if (fullPath.isEmpty() || mediaType.isEmpty() || - mediaType.equalsAsciiL( // opt: exclude common text/xml - RTL_CONSTASCII_STRINGPARAM("text/xml") )) + if ( fullPath.isEmpty() || mediaType.isEmpty() || mediaType == "text/xml" )// opt: exclude common text/xml continue; String type, subType; diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index bc2fda67839c..2bd4d1b99214 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -284,10 +284,8 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() osl_getCommandArg( nPos, &subCommand.pData ); ++nPos; subCommand = subCommand.trim(); - subcmd_add = subCommand.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("add") ); - subcmd_gui = subCommand.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("gui") ); + subcmd_add = subCommand == "add"; + subcmd_gui = subCommand == "gui"; // sun-command options and packages: while (nPos < nCount) @@ -345,8 +343,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() } else { - if (repository.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("shared") )) { + if ( repository == "shared" ) { option_shared = true; } else if (option_shared) { @@ -437,9 +434,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() && ! dp_misc::office_is_running()) dp_misc::syncRepositories(xCmdEnv); - if (subcmd_add || - subCommand.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("remove") )) + if ( subcmd_add || subCommand == "remove" ) { for ( ::std::size_t pos = 0; pos < cmdPackages.size(); ++pos ) { diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index eaa6d07f66c1..0ef211a3cbeb 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -359,9 +359,7 @@ OUString implReadBootstrapKey( const OUString& _rKey ) void SplashScreen::loadConfig() { - _bShowLogo = !implReadBootstrapKey( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Logo"))). - equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")); + _bShowLogo = implReadBootstrapKey( "Logo" ) != "0"; OUString sProgressFrameColor = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressFrameColor" ) ) ); diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 526688a6c521..5e62a9376e77 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -76,21 +76,15 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< for ( sal_Int32 nInd = 0; nInd < aMedDescr.getLength(); nInd++ ) { - if ( aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ComponentData" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentTitle" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JumpMark" ) ) - // || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) makes no sence for embedded objects - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Preview" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StartPresentation" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ViewData" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ViewId" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MacroExecutionMode" ) ) - || aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UpdateDocMode" ) ) - || (aMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentBaseURL" ) ) && bCanUseDocumentBaseURL) ) + if ( aMedDescr[nInd].Name == "ComponentData" || aMedDescr[nInd].Name == "DocumentTitle" + || aMedDescr[nInd].Name == "InteractionHandler" || aMedDescr[nInd].Name == "JumpMark" + // || aMedDescr[nInd].Name == "Password" // makes no sence for embedded objects + || aMedDescr[nInd].Name == "Preview" || aMedDescr[nInd].Name == "ReadOnly" + || aMedDescr[nInd].Name == "StartPresentation" || aMedDescr[nInd].Name == "RepairPackage" + || aMedDescr[nInd].Name == "StatusIndicator" || aMedDescr[nInd].Name == "ViewData" + || aMedDescr[nInd].Name == "ViewId" || aMedDescr[nInd].Name == "MacroExecutionMode" + || aMedDescr[nInd].Name == "UpdateDocMode" + || (aMedDescr[nInd].Name == "DocumentBaseURL" && bCanUseDocumentBaseURL) ) { aResult.realloc( ++nResLen ); aResult[nResLen-1] = aMedDescr[nInd]; diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 8ba9bc039329..f7d04e83d66b 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -1591,7 +1591,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor& // TODO: Investigate if there is already the format name // and whether this format is really required else if ( aFlavor.DataType == getCppuType( ( const uno::Reference< io::XInputStream >* ) 0 ) - && aFlavor.MimeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/x-openoffice-contentstream" ) ) ) + && aFlavor.MimeType == "application/x-openoffice-contentstream" ) { // allow to retrieve stream-representation of the object persistence bSupportedFlavor = sal_True; diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx index 0660fe6ee9a1..06cd02a3e1a1 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx @@ -68,7 +68,7 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na { uno::Reference< task::XJob > xJob; - if ( aArguments.getLength() > 0 && aArguments[0].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) ) + if ( aArguments.getLength() > 0 && aArguments[0].Name == "JobToExecute" ) aArguments[0].Value >>= xJob; if ( !xJob.is() ) diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx index 52d39f72122c..ec64c39245b9 100644 --- a/embedserv/source/embed/guid.cxx +++ b/embedserv/source/embed/guid.cxx @@ -193,7 +193,7 @@ if ( aAnyProp >>= aProperties ) ) { for ( sal_Int32 nInd = 0; nInd < aProperties.getLength; nInd++ ) - if ( aProperties[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) + if ( aProperties[nInd].Name == "UIName" ) { aProperties[nInd].Value >>= aResult; break; diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index eede2cc92c8e..31b6f7e285b6 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -221,10 +221,7 @@ BibFrameController_Impl::~BibFrameController_Impl() sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) { - return ( - sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Bibliography")) || - sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Controller")) - ); + return ( sServiceName == "com.sun.star.frame.Bibliography" || sServiceName == "com.sun.star.frame.Controller" ); } ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException) @@ -574,8 +571,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen { RemoveFilter(); } - else if(_rURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("slot:5503")) || - aCommand.EqualsAscii("CloseDoc")) + else if( _rURL.Complete == "slot:5503" || aCommand.EqualsAscii("CloseDoc") ) { Application::PostUserEvent( STATIC_LINK( this, BibFrameController_Impl, DisposeHdl ), 0 ); @@ -740,10 +736,10 @@ void BibFrameController_Impl::addStatusListener( uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getDataSources(); aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0)); } - else if(aURL.Path == C2U("Bib/sdbsource") || - aURL.Path == C2U("Bib/Mapping") || - aURL.Path == C2U("Bib/autoFilter") || - aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bib/standardFilter"))) + else if( aURL.Path == "Bib/sdbsource" || + aURL.Path == "Bib/Mapping" || + aURL.Path == "Bib/autoFilter" || + aURL.Path == "Bib/standardFilter" ) { aEvent.IsEnabled = sal_True; } diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 4b3ba34b47b1..72438786a6bb 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -133,7 +133,7 @@ namespace logging //---------------------------------------------------------------- void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const ::rtl::OUString& _rSettingName, Any& _inout_rSettingValue ) { - if ( !_rSettingName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileURL" ) ) ) + if ( _rSettingName != "FileURL" ) // not interested in this setting return; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 898a971e2816..5b29ee28e0bf 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -271,7 +271,7 @@ namespace pcr aScriptEvent = *pAssignedEvent; - if ( !aScriptEvent.ScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarBasic" ) ) ) + if ( aScriptEvent.ScriptType != "StarBasic" ) continue; // this is an old-style macro specification: diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 20798a32fbbc..d61c058258ac 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -461,8 +461,7 @@ void OFileAccess::createFolder( const rtl::OUString& NewFolderURL ) if ( rProps.getLength() != 1 ) continue; - if ( !rProps[ 0 ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + if ( rProps[ 0 ].Name != "Title" ) continue; Sequence<rtl::OUString> aNames(1); @@ -735,8 +734,7 @@ bool OFileAccess::createNewFile( const rtl::OUString & rParentURL, if ( rProps.getLength() != 1 ) continue; - if ( !rProps[ 0 ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + if ( rProps[ 0 ].Name != "Title" ) continue; Sequence<rtl::OUString> aNames(1); diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 4ac6f7f0487c..9c2481a48816 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -435,7 +435,7 @@ CacheItem FilterCache::getItem( EItemType eType, // In Standalone-Impress the module WriterWeb is not installed // but it is there to load help pages - bool bIsHelpFilter = sItem.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_web_HTML_help")); + bool bIsHelpFilter = sItem == "writer_web_HTML_help"; if ( !bIsHelpFilter && !impl_isModuleInstalled(sDocService) ) { diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index 3d4492206b5c..4a4cddb52821 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -80,11 +80,7 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE // a) indicate completed open of the first document in which case launch thread // b) indicate close of application without any documents opened, in which case skip launching thread but drop references break cyclic dependencies in // case of e.g. cancel from open/new database wizard or impress wizard - if ( - (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnNew"))) || - (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnLoad"))) || - (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnCloseApp"))) - ) + if ( aEvent.EventName == "OnNew" || aEvent.EventName == "OnLoad" || aEvent.EventName == "OnCloseApp" ) { // this thread must be started one times only ... // cancel listener connection before! @@ -108,7 +104,7 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE aLock.clear(); // <- SAFE - if (!aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnCloseApp"))) + if ( aEvent.EventName != "OnCloseApp" ) { rtl::Reference< LateInitThread >(new LateInitThread())->launch(); //TODO: a protocol is missing how to join with the launched diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 974cdac983e3..5b57dc90414b 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -251,21 +251,13 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip // one type TextAscii and two filters registered for these one type. // But then we loose automatic opening of CSV files in calc instead of opening these files // inside writer. - if ( - (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))) && - ( - (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_Text"))) || - (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_Text_encoded"))) - ) - ) + if ( sDocumentService == "com.sun.star.sheet.SpreadsheetDocument" + && ( sRealType == "writer_Text" || sRealType == "writer_Text_encoded" ) ) { sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_Text_txt_csv_StarCalc" )); } else - if ( - (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument"))) && - (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc_Text_txt_csv_StarCalc"))) - ) + if ( sDocumentService == "com.sun.star.text.TextDocument" && sRealType == "calc_Text_txt_csv_StarCalc" ) { sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_Text" )); } diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 0f3567be4aec..5b9dbcdd2b56 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -517,7 +517,7 @@ void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, b if( xShape.is() ) { Reference< XShapes > xShapes2( xShape, UNO_QUERY ); - if( xShapes2.is() && xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape"))) + if( xShapes2.is() && xShape->getShapeType() == "com.sun.star.drawing.GroupShape" ) // export the contents of group shapes, but we only ever stream at the top // recursive level anyway, so pass false for streaming. exportShapes( xShapes2, false, bMaster); @@ -605,8 +605,7 @@ void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster ) GDIMetaFile aMtf; Reference< XComponent > xComponent( xShape, UNO_QUERY ); - bool bIsOleObject = xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape")) - || xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape")); + bool bIsOleObject = xShape->getShapeType() == "com.sun.star.presentation.OLE2Shape" || xShape->getShapeType() == "com.sun.star.drawing.OLE2Shape"; getMetaFile( xComponent, aMtf ); diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 08ef01dd6a97..ebb7367c8c2d 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -248,7 +248,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, rtl::OUString sCustomShapeType; MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType ); - if ( sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-502ad400" ) ) || sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-60da8460" ) ) ) + if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" ) { ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 ); if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) ) diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index c9413a69fdd3..6c38cedc7c69 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1434,9 +1434,9 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) OUString aShapeClass = implGetClassFromShape( rxShape ); if( mbPresentation ) { - sal_Bool bIsPageNumber = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Slide_Number" ) ); - sal_Bool bIsFooter = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Footer" ) ); - sal_Bool bIsDateTime = aShapeClass.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Date/Time" ) ); + sal_Bool bIsPageNumber = aShapeClass == "Slide_Number"; + sal_Bool bIsFooter = aShapeClass == "Footer"; + sal_Bool bIsDateTime = aShapeClass == "Date/Time"; if( bIsPageNumber || bIsDateTime || bIsFooter ) { // to notify to the SVGActionWriter::ImplWriteActions method diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index cc0e950a8383..f6dc66844429 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -181,7 +181,7 @@ struct AnnotatingVisitor { const rtl::OUString sValue(xNode->getNodeValue()); ElementRefMapType::iterator aFound=maGradientIdMap.end(); - if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#"))) + if ( sValue.copy(0,1) == "#" ) aFound = maGradientIdMap.find(sValue.copy(1)); else aFound = maGradientIdMap.find(sValue); @@ -219,7 +219,7 @@ struct AnnotatingVisitor { const rtl::OUString sValue(xNode->getNodeValue()); ElementRefMapType::iterator aFound=maGradientIdMap.end(); - if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#"))) + if ( sValue.copy(0,1) == "#" ) aFound = maGradientIdMap.find(sValue.copy(1)); else aFound = maGradientIdMap.find(sValue); @@ -826,7 +826,7 @@ struct AnnotatingVisitor case XML_HREF: { ElementRefMapType::iterator aFound=maStopIdMap.end(); - if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#"))) + if ( sValue.copy(0,1) == "#" ) aFound = maStopIdMap.find(sValue.copy(1)); else aFound = maStopIdMap.find(sValue); @@ -2430,7 +2430,7 @@ struct ShapeRenderingVisitor aFont.SetColor(getVclColor(maCurrState.maFillColor)); aFont.SetFillColor(getVclColor(maCurrState.maFillColor)); - if( !maCurrState.maFontStyle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("normal")) ) + if( maCurrState.maFontStyle != "normal" ) aFont.SetItalic(ITALIC_NORMAL); // TODO: discriminate if( maCurrState.mnFontWeight != 400.0 ) aFont.SetWeight(WEIGHT_BOLD); // TODO: discriminate diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 8556e14e1663..78f44f8893af 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -155,19 +155,18 @@ T602ImportFilter::~T602ImportFilter() const PropertyValue * pValue = Descriptor.getConstArray(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= mxInputStream; -/* else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "FilterName" ) ) ) +/* else if ( pValue[i].Name == "FilterName" ) pValue[i].Value >>= aFilterName; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) ) + else if ( pValue[i].Name == "TypeName" ) pValue[i].Value >>= aTypeName; */ } if (!mxInputStream.is()) return ::rtl::OUString(); -/* if ( aFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "T602Document" ) ) || - aTypeName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_T602_Document" ) ) ) +/* if ( aFilterName == "T602Document" || aTypeName == "writer_T602_Document" ) // preselection by type (extension) or filter name: no reason to check type return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_T602_Document" ) ); */ @@ -210,7 +209,7 @@ void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments ) nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; break; @@ -262,7 +261,7 @@ sal_Bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star OUString sURL; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= mxInputStream; } @@ -893,8 +892,7 @@ OUString T602ImportFilter_getImplementationName () sal_Bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName ) throw (RuntimeException) { - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) ); + return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 ); } Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) @@ -1221,7 +1219,7 @@ OUString T602ImportFilterDialog_getImplementationName () sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName ) throw (RuntimeException) { - return ( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) ) ); + return ServiceName == SERVICE_NAME; } Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 0117668f4722..dfa2ca5dbd62 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -391,8 +391,7 @@ OUString XmlFilterAdaptor_getImplementationName () sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName ) throw (RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ); + return ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2; } Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) throw (RuntimeException) diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 8060a6b5c03e..66c07da73102 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -154,15 +154,15 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) sal_Int32 location=nLength; for (sal_Int32 i = 0 ; i < nLength; i++) { - if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) )) + if ( pValue[i].Name == "TypeName" ) { location=i; } - else if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) )) + else if ( pValue[i].Name == "URL" ) { pValue[i].Value >>= sUrl; } - else if (pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) )) + else if ( pValue[i].Name == "InputStream" ) { pValue[i].Value >>= xInStream ; } @@ -207,7 +207,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) { ::rtl::OUString tmpStr; lProps[j].Value >>=tmpStr; - if ((lProps[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipboardFormat"))) && !tmpStr.isEmpty()) + if ( lProps[j].Name == "ClipboardFormat" && !tmpStr.isEmpty() ) { sTypeName = supportedByType(tmpStr,resultString, myTypes[i]); } @@ -248,18 +248,18 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments ) for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; } - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "UserData" ) ) ) + else if ( pValue[i].Name == "UserData" ) { pValue[i].Value >>= msUserData; } - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TemplateName" ) ) ) + else if ( pValue[i].Name == "TemplateName" ) { pValue[i].Value>>=msTemplateName; diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index 1cb2cb41a2d1..3d3b937fe333 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -254,7 +254,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const if( maStack.empty() ) { // #109668# support legacy name as well on import - if( aName == sRootNode || aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oor:node")) ) + if( aName == sRootNode || aName == "oor:node" ) { eNewState = e_Root; } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index d17b0b8b6e4c..4950c47e2d53 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1161,7 +1161,7 @@ void XMLFilterSettingsDialog::initFilterList() continue; // if this is not an XSLTFilter entry, skip it - if( !aUserData[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) ) ) + if( aUserData[0] != "com.sun.star.documentconversion.XSLTFilter" ) continue; // get filter information from userdata diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 4890df71b125..e947184f9197 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -588,16 +588,14 @@ namespace frm if (xVclWindow.is()) { Any aValue; - if ( aText.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ) + if ( aText == "1" || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("TRUE")) || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("IS TRUE")) ) { aValue <<= (sal_Int32)STATE_CHECK; } - else if ( aText.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "0" ) ) - || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("FALSE")) - ) + else if ( aText == "0" || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("FALSE")) ) { aValue <<= (sal_Int32)STATE_NOCHECK; } diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8c61449ebd27..55ab059c33a6 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -524,7 +524,7 @@ namespace { bool lcl_isValidDocumentURL( const ::rtl::OUString& _rDocURL ) { - return ( !_rDocURL.isEmpty() && !_rDocURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:object" ) ) ); + return ( !_rDocURL.isEmpty() && _rDocURL != "private:object" ); } } diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index b5e775123edd..083c8eea345b 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -649,11 +649,7 @@ namespace xforms if ( nInvalidityReason ) return nInvalidityReason; - bool bValid = - sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")) || - sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")) || - sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) || - sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false")); + bool bValid = sValue == "0" || sValue == "1" || sValue == "true" || sValue == "false"; return bValid ? 0 : RID_STR_XFORMS_INVALID_VALUE; } diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index ed830954d7a0..f1e4d53a3c0e 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -1001,7 +1001,7 @@ void xforms::getInstanceData( const PropertyValue& rValue = pValues[n]; #define PROP(NAME) \ if( p##NAME != NULL && \ - rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(#NAME)) ) \ + rValue.Name == #NAME ) \ rValue.Value >>= (*p##NAME) PROP(ID); PROP(Instance); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index b3db6975ccc0..af9dfed3294b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2071,8 +2071,7 @@ void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable ) short SvtFileDialog::PrepareExecute() { rtl::OUString aEnvValue; - if ( getEnvironmentValue( "WorkDirMustContainRemovableMedia", aEnvValue ) && - aEnvValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ) ) + if ( getEnvironmentValue( "WorkDirMustContainRemovableMedia", aEnvValue ) && aEnvValue == "1" ) { try { diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index 65a3400878bc..fdf6fe70fb4c 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -225,7 +225,7 @@ sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUStr // 0 is normaly an error of the called method toInt32() ... // But we must be aware, that the identifier is "0"! rCode = 0; - return sIdentifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")); + return sIdentifier == "0"; } } // namespace framework diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 40f329cd432c..f1e10511cfc4 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -177,9 +177,8 @@ MenuManager::MenuManager( { // Create addon popup menu if there exist elements and this is the tools popup menu - if (( nItemId == SID_ADDONLIST || - aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialToolsMenu)) ) && - AddonMenuManager::HasAddonMenuElements() ) + if ( ( nItemId == SID_ADDONLIST || aItemCommand == aSlotSpecialToolsMenu ) + && AddonMenuManager::HasAddonMenuElements() ) { AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame ); if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 )) @@ -215,8 +214,7 @@ MenuManager::MenuManager( } else { - if ( nItemId == SID_NEWDOCDIRECT || - aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotNewDocDirect)) ) + if ( nItemId == SID_NEWDOCDIRECT || aItemCommand == aSlotNewDocDirect ) { MenuConfiguration aMenuCfg( getServiceFactory() ); BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_NEWMENU ); @@ -230,8 +228,7 @@ MenuManager::MenuManager( pMenu->SetItemImage( nItemId, aImage ); } } - else if ( nItemId == SID_AUTOPILOTMENU || - aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotAutoPilot)) ) + else if ( nItemId == SID_AUTOPILOTMENU || aItemCommand == aSlotAutoPilot ) { MenuConfiguration aMenuCfg( getServiceFactory() ); BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_WIZARDMENU ); @@ -790,14 +787,10 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) aCommand = aCommand.copy(RTL_CONSTASCII_LENGTH(UNO_COMMAND)); } - if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialFileMenu)) || - m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialFileMenu)) || - aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialFileCommand)) ) + if ( m_aMenuItemCommand == aSpecialFileMenu || m_aMenuItemCommand == aSlotSpecialFileMenu || aCommand == aSpecialFileCommand ) UpdateSpecialFileMenu( pMenu ); - else if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowMenu)) || - m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialWindowMenu)) || - aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) ) - UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock ); + else if ( m_aMenuItemCommand == aSpecialWindowMenu || m_aMenuItemCommand == aSlotSpecialWindowMenu || aCommand == aSpecialWindowCommand ) + UpdateSpecialWindowMenu( pMenu, getServiceFactory(), m_aLock ); // Check if some modes have changed so we have to update our menu images if ( bShowMenuImages != m_bShowMenuImages ) diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index eead1818dcfd..9b86bb661986 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -187,7 +187,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp ::sal_Bool lcl_isStartModuleDispatch (const css::util::URL& aURL) { - return (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_UNO_SHOWSTARTMODULE))); + return aURL.Complete == CMD_UNO_SHOWSTARTMODULE; } /** @@ -412,10 +412,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame ) { // There exist a hard coded interception for special URLs. - if ( - (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseDoc"))) || - (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseWin"))) - ) + if ( aURL.Complete == ".uno:CloseDoc" || aURL.Complete == ".uno:CloseWin" ) { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); // In case the frame is not a top one, is not based on system window and has a parent, diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 3da7cc6d7899..ba54467ca4cb 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -291,17 +291,17 @@ throw( SAXException, RuntimeException ) case SB_ATTRIBUTE_ALIGN: { - if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ALIGN_LEFT )) ) + if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_ALIGN_LEFT ) { nItemBits |= ItemStyle::ALIGN_LEFT; nItemBits &= ~ItemStyle::ALIGN_CENTER; } - else if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ALIGN_CENTER )) ) + else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_ALIGN_CENTER ) { nItemBits |= ItemStyle::ALIGN_CENTER; nItemBits &= ~ItemStyle::ALIGN_LEFT; } - else if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ALIGN_RIGHT )) ) + else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_ALIGN_RIGHT ) { nItemBits |= ItemStyle::ALIGN_RIGHT; } @@ -316,17 +316,17 @@ throw( SAXException, RuntimeException ) case SB_ATTRIBUTE_STYLE: { - if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE_IN )) ) + if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_STYLE_IN ) { nItemBits |= ItemStyle::DRAW_IN3D; nItemBits &= ~ItemStyle::DRAW_OUT3D; } - else if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE_OUT )) ) + else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_STYLE_OUT ) { nItemBits |= ItemStyle::DRAW_OUT3D; nItemBits &= ~ItemStyle::DRAW_IN3D; } - else if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE_FLAT )) ) + else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_STYLE_FLAT ) { nItemBits |= ItemStyle::DRAW_FLAT; } @@ -341,9 +341,9 @@ throw( SAXException, RuntimeException ) case SB_ATTRIBUTE_AUTOSIZE: { - if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_BOOLEAN_TRUE )) ) + if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_TRUE ) nItemBits |= ItemStyle::AUTO_SIZE; - else if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_BOOLEAN_FALSE )) ) + else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_FALSE ) nItemBits &= ~ItemStyle::AUTO_SIZE; else { @@ -356,9 +356,9 @@ throw( SAXException, RuntimeException ) case SB_ATTRIBUTE_OWNERDRAW: { - if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_BOOLEAN_TRUE )) ) + if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_TRUE ) nItemBits |= ItemStyle::OWNER_DRAW; - else if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_BOOLEAN_FALSE )) ) + else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_FALSE ) nItemBits &= ~ItemStyle::OWNER_DRAW; else { diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 58ee88f09e13..6a0e32b5e994 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -353,9 +353,9 @@ throw( SAXException, RuntimeException ) case TB_ATTRIBUTE_VISIBLE: { - if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_BOOLEAN_TRUE )) ) + if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_TRUE ) bVisible = sal_True; - else if ( xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_BOOLEAN_FALSE )) ) + else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_FALSE ) bVisible = sal_False; else { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index ff6ea0b04513..0845c00bbd98 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -782,8 +782,7 @@ bool ToolbarLayoutManager::dockAllToolbars() UIElementVector::iterator pIter; for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { - if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) && pIter->m_xUIElement.is() && - pIter->m_bFloating && pIter->m_bVisible ) + if ( pIter->m_aType == "toolbar" && pIter->m_xUIElement.is() && pIter->m_bFloating && pIter->m_bVisible ) aToolBarNameVector.push_back( pIter->m_aName ); } aReadLock.unlock(); diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx index b31335102fc7..1d39e9df2ba6 100644 --- a/framework/source/lomenubar/FrameHelper.cxx +++ b/framework/source/lomenubar/FrameHelper.cxx @@ -654,7 +654,7 @@ FrameHelper::getLabelFromCommandURL (OUString commandURL) for (sal_Int32 i = 0; i < commandProps.getLength(); i++) { - if ( commandProps[i].Name.equalsAsciiL (RTL_CONSTASCII_STRINGPARAM ("Label"))) + if ( commandProps[i].Name == "Label" ) { commandProps[i].Value >>= label; label = label.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 38b14b1d8114..f1075e9611fe 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -518,11 +518,8 @@ throw ( RuntimeException ) #ifdef UNIX //enable some slots hardly, because UNIX clipboard does not notify all changes // Can be removed if follow up task will be fixed directly within applications. - if ( - ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Paste"))) || - ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteSpecial"))) || - ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteClipboard"))) // special for draw/impress - ) + if ( pMenuItemHandler->aMenuItemURL == ".uno:Paste" || pMenuItemHandler->aMenuItemURL == ".uno:PasteSpecial" + || pMenuItemHandler->aMenuItemURL == ".uno:PasteClipboard" ) // special for draw/impress bEnabledItem = sal_True; #endif @@ -842,9 +839,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) m_bActive = sal_True; ::rtl::OUString aMenuCommand( m_aMenuItemCommand ); - if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowMenu)) || - m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialWindowMenu)) || - aMenuCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) ) + if ( m_aMenuItemCommand == aSpecialWindowMenu || m_aMenuItemCommand == aSlotSpecialWindowMenu || aMenuCommand == aSpecialWindowCommand ) MenuManager::UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock ); // Check if some modes have changed so we have to update our menu images @@ -1253,8 +1248,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { sal_uInt16 nItemId = pMenu->GetItemId( nPos ); ::rtl::OUString aCommand = pMenu->GetItemCommand( nItemId ); - if ( nItemId == SID_MDIWINDOWLIST || - aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) ) + if ( nItemId == SID_MDIWINDOWLIST || aCommand == aSpecialWindowCommand) { // Retrieve addon popup menus and add them to our menu bar Reference< com::sun::star::frame::XModel > xModel; @@ -1354,13 +1348,13 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF xPopupMenuDispatchProvider = pAttributes->xDispatchProvider; // Check if this is the help menu. Add menu item if needed - if ( nItemId == SID_HELPMENU || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotHelpMenu)) || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpMenu)) ) + if ( nItemId == SID_HELPMENU || aItemCommand == aSlotHelpMenu || aItemCommand == aCmdHelpMenu ) { // Check if this is the help menu. Add menu item if needed CheckAndAddMenuExtension( pPopup ); } - else if (( nItemId == SID_ADDONLIST || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialToolsMenu)) || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdToolsMenu)) ) && - AddonMenuManager::HasAddonMenuElements() ) + else if (( nItemId == SID_ADDONLIST || aItemCommand == aSlotSpecialToolsMenu || aItemCommand == aCmdToolsMenu ) && + AddonMenuManager::HasAddonMenuElements() ) { // Create addon popup menu if there exist elements and this is the tools popup menu AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame ); diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index 62205a7f6a87..262e3f7f33d9 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -351,7 +351,7 @@ extern "C" OUString aImplementationName = OUString::createFromAscii( pImplName ); - if (aImplementationName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( IMPLEMENTATION_NAME )) ) + if (aImplementationName == IMPLEMENTATION_NAME ) { xRet = createSingleFactory( xSMgr, aImplementationName, HwpImportFilter_CreateInstance, diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 1d26968190a8..82014535c6ab 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -132,7 +132,7 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n } static inline sal_Bool SAL_CALL isCJK( const Locale& rLocale ) { - return rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) || rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ja")) || rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")); + return rLocale.Language == "zh" || rLocale.Language == "ja" || rLocale.Language == "ko"; } Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int32 nStartPos, diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index aa5e1d8adf12..0d6df0f5401b 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -134,7 +134,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star:: rbi = new OOoRuleBasedBreakIterator(udata_open("OpenOffice", "brk", OUStringToOString(breakRules[breakType], RTL_TEXTENCODING_ASCII_US).getStr(), &status), status); } - else if (!rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("th"))) //use icu's breakiterator for Thai + else if ( rLocale.Language != "th" ) //use icu's breakiterator for Thai { status = U_ZERO_ERROR; OStringBuffer aUDName(64); diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index c912529e32a7..f726aeb0fc38 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -802,9 +802,9 @@ static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale& nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR) && value >= 100) || nCalendarDisplayCode == CalendarDisplayCode::SHORT_QUARTER || nCalendarDisplayCode == CalendarDisplayCode::LONG_QUARTER; - sal_Bool isChinese = aLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")); - sal_Bool isJapanese = aLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ja")); - sal_Bool isKorean = aLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")); + sal_Bool isChinese = aLocale.Language == "zh"; + sal_Bool isJapanese = aLocale.Language == "ja"; + sal_Bool isKorean = aLocale.Language == "ko"; if (isChinese || isJapanese || isKorean) { switch (nNativeNumberMode) { diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index faf0ae965494..49f193e53328 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -148,9 +148,9 @@ CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) t for (sal_Int32 i = 0; i < option_str.getLength(); i++) option_int[i] = - option_str[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IGNORE_CASE")) ? CollatorOptions::CollatorOptions_IGNORE_CASE : - option_str[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IGNORE_KANA")) ? CollatorOptions::CollatorOptions_IGNORE_KANA : - option_str[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IGNORE_WIDTH")) ? CollatorOptions::CollatorOptions_IGNORE_WIDTH : 0; + option_str[i] == "IGNORE_CASE" ? CollatorOptions::CollatorOptions_IGNORE_CASE : + option_str[i] == "IGNORE_KANA" ? CollatorOptions::CollatorOptions_IGNORE_KANA : + option_str[i] == "IGNORE_WIDTH" ? CollatorOptions::CollatorOptions_IGNORE_WIDTH : 0; return option_int; } @@ -213,9 +213,7 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS // load service with name <base>_<lang>_<country>_<algorithm> createCollator(rLocale, aBuf.append(rLocale.Language).append(under).append(rLocale.Country).append( under).append(rSortAlgorithm).makeStringAndClear(), rSortAlgorithm)) || - (l > 0 && c > 0 && a > 0 && rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) && - (rLocale.Country.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HK")) || - rLocale.Country.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MO"))) && + (l > 0 && c > 0 && a > 0 && rLocale.Language == "zh" && (rLocale.Country == "HK" || rLocale.Country == "MO") && // if the country code is HK or MO, one more step to try TW. createCollator(rLocale, aBuf.append(rLocale.Language).append(under).append(tw).append(under).append( rSortAlgorithm).makeStringAndClear(), rSortAlgorithm)) || diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index b5ce82d80e1f..ae8c32bc7915 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -66,7 +66,7 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry, if (hModule) { OUString get(RTL_CONSTASCII_USTRINGPARAM("get_indexdata_")); sal_uInt16** (*func)(sal_Int16*)=NULL; - if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) && OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) + if ( rLocale.Language == "zh" && OUString( "TW HK MO" ).indexOf(rLocale.Country) >= 0 ) func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString(RTL_CONSTASCII_USTRINGPARAM("_TW_"))+rAlgorithm).pData); if (!func) func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString('_')+rAlgorithm).pData); @@ -135,7 +135,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, sal_uInt16 address = idx[0][ch>>8]; if (address != 0xFFFF) { address = idx[1][address + (ch & 0xFF)]; - if (i > 0 && rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh"))) + if ( i > 0 && rLocale.Language == "zh" ) candidate.appendAscii(" "); if (idx[2]) candidate.append(&idx[2][address]); diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 840bf30529ae..cd021e9335ba 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -234,7 +234,7 @@ void print_node( const LocaleNode* p, int depth=0 ) void LocaleNode :: generateCode (const OFileWriter &of) const { ::rtl::OUString aDTD = getAttr().getValueByName("versionDTD"); - if (!aDTD.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(LOCALE_VERSION_DTD))) + if ( aDTD != LOCALE_VERSION_DTD ) { ++nError; fprintf( stderr, "Error: Locale versionDTD is not %s, see comment in locale.dtd\n", LOCALE_VERSION_DTD); @@ -661,7 +661,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const for (sal_Int16 i = 0; i< getNumberOfChildren() ; i++, formatCount++) { LocaleNode * currNode = getChildAt (i); - if (currNode->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateAcceptancePattern"))) + if ( currNode->getName() == "DateAcceptancePattern" ) { if (mnSection > 0) incError( "DateAcceptancePattern only handled in LC_FORMAT, not LC_FORMAT_1"); @@ -670,7 +670,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const --formatCount; continue; // for } - if (!currNode->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FormatElement"))) + if ( currNode->getName() != "FormatElement" ) { incErrorStr( "Undefined element in LC_FORMAT", currNode->getName()); --formatCount; @@ -690,7 +690,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const of.writeParameter("FormatKey", str, formatCount); str = currNodeAttr.getValueByName("default"); - bool bDefault = str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "true")); + bool bDefault = str == "true"; of.writeDefaultParameter("FormatElement", str, formatCount); aType = currNodeAttr.getValueByName("type"); @@ -1488,7 +1488,7 @@ static void lcl_writeAbbrFullNarrNames( const OFileWriter & of, const LocaleNode OUString aFullName = currNode->getChildAt(2)->getValue(); OUString aNarrName; LocaleNode* p = (currNode->getNumberOfChildren() > 3 ? currNode->getChildAt(3) : 0); - if (p && p->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DefaultNarrowName"))) + if ( p && p->getName() == "DefaultNarrowName" ) aNarrName = p->getValue(); else { @@ -1561,7 +1561,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const LocaleNode * calNode = getChildAt (i); OUString calendarID = calNode -> getAttr().getValueByName("unoid"); of.writeParameter( "calendarID", calendarID, i); - bool bGregorian = calendarID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "gregorian")); + bool bGregorian = calendarID == "gregorian"; if (!bHasGregorian) bHasGregorian = bGregorian; str = calNode -> getAttr().getValueByName("default"); @@ -1595,7 +1595,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const LocaleNode *currNode = daysNode -> getChildAt(j); OUString dayID( currNode->getChildAt(0)->getValue()); of.writeParameter("dayID", dayID, i, j); - if (j == 0 && bGregorian && !dayID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "sun"))) + if ( j == 0 && bGregorian && dayID != "sun" ) incError( "First day of a week of a Gregorian calendar must be <DayID>sun</DayID>"); lcl_writeAbbrFullNarrNames( of, currNode, elementTag, i, j); } @@ -1627,7 +1627,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const LocaleNode *currNode = monthsNode -> getChildAt(j); OUString monthID( currNode->getChildAt(0)->getValue()); of.writeParameter("monthID", monthID, i, j); - if (j == 0 && bGregorian && !monthID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "jan"))) + if ( j == 0 && bGregorian && monthID != "jan" ) incError( "First month of a year of a Gregorian calendar must be <MonthID>jan</MonthID>"); lcl_writeAbbrFullNarrNames( of, currNode, elementTag, i, j); } @@ -1636,7 +1636,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const // Generate genitive Months of Year // Optional, if not present fall back to month nouns. - if (!calNode->getChildAt(nChild)->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GenitiveMonths"))) + if ( calNode->getChildAt(nChild)->getName() != "GenitiveMonths" ) --nChild; LocaleNode * genitiveMonthsNode = NULL; ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref"); @@ -1662,7 +1662,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const LocaleNode *currNode = genitiveMonthsNode -> getChildAt(j); OUString genitiveMonthID( currNode->getChildAt(0)->getValue()); of.writeParameter("genitiveMonthID", genitiveMonthID, i, j); - if (j == 0 && bGregorian && !genitiveMonthID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "jan"))) + if ( j == 0 && bGregorian && genitiveMonthID != "jan" ) incError( "First genitive month of a year of a Gregorian calendar must be <MonthID>jan</MonthID>"); lcl_writeAbbrFullNarrNames( of, currNode, elementTag, i, j); } @@ -1672,7 +1672,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const // Generate partitive Months of Year // Optional, if not present fall back to genitive months, or nominative // months (nouns) if that isn't present either. - if (!calNode->getChildAt(nChild)->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PartitiveMonths"))) + if ( calNode->getChildAt(nChild)->getName() != "PartitiveMonths" ) --nChild; LocaleNode * partitiveMonthsNode = NULL; ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref"); @@ -1698,7 +1698,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const LocaleNode *currNode = partitiveMonthsNode -> getChildAt(j); OUString partitiveMonthID( currNode->getChildAt(0)->getValue()); of.writeParameter("partitiveMonthID", partitiveMonthID, i, j); - if (j == 0 && bGregorian && !partitiveMonthID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "jan"))) + if ( j == 0 && bGregorian && partitiveMonthID != "jan" ) incError( "First partitive month of a year of a Gregorian calendar must be <MonthID>jan</MonthID>"); lcl_writeAbbrFullNarrNames( of, currNode, elementTag, i, j); } @@ -1730,9 +1730,9 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const LocaleNode *currNode = erasNode -> getChildAt(j); OUString eraID( currNode->getChildAt(0)->getValue()); of.writeParameter("eraID", eraID, i, j); - if (j == 0 && bGregorian && !eraID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "bc"))) + if ( j == 0 && bGregorian && eraID != "bc" ) incError( "First era of a Gregorian calendar must be <EraID>bc</EraID>"); - if (j == 1 && bGregorian && !eraID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "ad"))) + if ( j == 1 && bGregorian && eraID != "ad" ) incError( "Second era of a Gregorian calendar must be <EraID>ad</EraID>"); of.writeAsciiString("\n"); of.writeParameter(elementTag, "DefaultAbbrvName",currNode->getChildAt(1)->getValue() ,i, j); diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx index e7658de8e6f6..58a3e1ff81af 100644 --- a/i18npool/source/localedata/filewriter.cxx +++ b/i18npool/source/localedata/filewriter.cxx @@ -142,14 +142,14 @@ void OFileWriter::writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 c bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str, sal_Int16 count) const { - bool bBool = (str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0); + bool bBool = (str == "true" ? 1 : 0); fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr, count, bBool); return bBool; } bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str) const { - bool bBool = (str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0); + bool bBool = (str == "true" ? 1 : 0); fprintf(m_f,"static const sal_Unicode default%s[] = {%d};\n", pAsciiStr, bBool); return bBool; } diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index dd3f7cf5791e..a7d76fd430e0 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -557,7 +557,7 @@ Sequence< CalendarItem2 > LocaleData::getCalendarItems( throw(RuntimeException) { Sequence< CalendarItem2 > aItems; - if (OUString( allCalendars[rnOffset]).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ref"))) + if ( OUString( allCalendars[rnOffset] ) == "ref" ) { aItems = getCalendarItemByName( OUString( allCalendars[rnOffset+1]), rLocale, calendarsSeq, nWhichItem); rnOffset += 2; @@ -1428,10 +1428,7 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale pFunction, &pCachedItem); } - if (!pSymbol && l > 0 && c > 0 && - rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) && - (rLocale.Country.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HK")) || - rLocale.Country.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MO")))) + if (!pSymbol && l > 0 && c > 0 && rLocale.Language == "zh" && (rLocale.Country == "HK" || rLocale.Country == "MO")) { // if the country code is HK or MO, one more step to try TW. pSymbol = rLookupTable.getFunctionSymbolByName( @@ -1575,7 +1572,7 @@ sal_Bool SAL_CALL LocaleData::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(clocaledata)); + return rServiceName == clocaledata; } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index efcbfaa5e5d7..2d72b8017960 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -243,9 +243,7 @@ TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sa const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions) throw( RuntimeException, IllegalArgumentException, NoSupportException ) { - if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) && - ( nConversionType == TextConversionType::TO_SCHINESE || - nConversionType == TextConversionType::TO_TCHINESE) ) { + if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) { aLocale=rLocale; sal_Bool toSChinese = nConversionType == TextConversionType::TO_SCHINESE; @@ -267,9 +265,7 @@ TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nSt const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset) throw( RuntimeException, IllegalArgumentException, NoSupportException ) { - if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) && - ( nConversionType == TextConversionType::TO_SCHINESE || - nConversionType == TextConversionType::TO_TCHINESE) ) { + if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) { aLocale=rLocale; sal_Bool toSChinese = nConversionType == TextConversionType::TO_SCHINESE; diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx index 01d1e3488c76..581009084c50 100644 --- a/i18nutil/source/utility/casefolding.cxx +++ b/i18nutil/source/utility/casefolding.cxx @@ -46,7 +46,7 @@ static Mapping mapping_0049[] = {{0, 2, {0x0069, 0x0307, 0}},{0, 1, {0x0131, 0, static Mapping mapping_0069[] = {{0, 1, {0x0130, 0, 0}},{0, 1, {0x0049, 0, 0}}}; static Mapping mapping_0130[] = {{0, 1, {0x0069, 0, 0}},{0, 1, {0x0130, 0, 0}}}; -#define langIs(lang) (aLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(lang))) +#define langIs(lang) (aLocale.Language == lang) // only check simple case, there is more complicated case need to be checked. #define type_i(ch) ((ch) == 0x0069 || (ch) == 0x006a) diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 62f0e6e4e589..1cdcbefbb6dc 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -160,8 +160,7 @@ namespace io_acceptor try { cppu::UnoUrlDescriptor aDesc(sConnectionDescription); - if (aDesc.getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("pipe"))) + if ( aDesc.getName() == "pipe" ) { rtl::OUString aName( aDesc.getParameter( @@ -184,8 +183,7 @@ namespace io_acceptor throw; } } - else if (aDesc.getName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("socket"))) + else if ( aDesc.getName() == "socket" ) { rtl::OUString aHost; if (aDesc.hasParameter( diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 674fbbb358b4..dea5099b60a0 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -101,8 +101,7 @@ namespace stoc_connector cppu::UnoUrlDescriptor aDesc(sConnectionDescription); Reference< XConnection > r; - if (aDesc.getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "pipe"))) + if ( aDesc.getName() == "pipe" ) { rtl::OUString aName( aDesc.getParameter( @@ -125,8 +124,7 @@ namespace stoc_connector throw NoConnectException( sMessage ,Reference< XInterface > () ); } } - else if (aDesc.getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "socket"))) + else if ( aDesc.getName() == "socket" ) { rtl::OUString aHost; if (aDesc.hasParameter( diff --git a/l10ntools/source/help/HelpIndexer.cxx b/l10ntools/source/help/HelpIndexer.cxx index 38d5639f18cb..341346490608 100644 --- a/l10ntools/source/help/HelpIndexer.cxx +++ b/l10ntools/source/help/HelpIndexer.cxx @@ -57,10 +57,7 @@ bool HelpIndexer::indexDocuments() { } rtl::OUString sLang = d_lang.getToken(0, '-'); - bool bUseCJK = - sLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ja")) || - sLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")) || - sLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")); + bool bUseCJK = sLang == "ja" || sLang == "ko" || sLang == "zh"; // Construct the analyzer appropriate for the given language lucene::analysis::Analyzer *analyzer; diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 5e9fcb9a492b..2279dd9c0bfe 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -423,8 +423,7 @@ void handleDirectory( handleDirectory( stat.getFileURL(), 1, stat.getFileName(), rtl::OUString()); - } else if (stat.getFileName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("clone"))) + } else if ( stat.getFileName() == "clone" ) { handleDirectory( stat.getFileURL(), -1, rtl::OUString(), diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx index 3e85544cfdcb..e31faa452a6b 100644 --- a/l10ntools/source/tagtest.cxx +++ b/l10ntools/source/tagtest.cxx @@ -396,11 +396,11 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList ) sal_Bool TokenInfo::IsPropertyRelevant( const rtl::OString &rName, const rtl::OUString &rValue ) const { - if ( aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("alt")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("xml-lang")) ) + if ( aTagName == "alt" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("xml-lang")) ) return sal_False; - if ( aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ahelp")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("visibility")) && rValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("visible")) ) + if ( aTagName == "ahelp" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("visibility")) && rValue == "visible" ) return sal_False; - if ( aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image")) && (rName.equalsL(RTL_CONSTASCII_STRINGPARAM("width")) || rName.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))) ) + if ( aTagName == "image" && (rName.equalsL(RTL_CONSTASCII_STRINGPARAM("width")) || rName.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))) ) return sal_False; return sal_True; @@ -415,7 +415,7 @@ sal_Bool TokenInfo::IsPropertyValueValid( const rtl::OString &rName, const rtl:: rValue.EqualsAscii("appl") || rValue.EqualsAscii("distrib"); } */ - if ( aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("caseinline")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("select")) ) + if ( aTagName == "caseinline" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("select")) ) { return !rValue.isEmpty(); } @@ -426,9 +426,9 @@ sal_Bool TokenInfo::IsPropertyValueValid( const rtl::OString &rName, const rtl:: sal_Bool TokenInfo::IsPropertyInvariant( const rtl::OString &rName, const rtl::OUString &rValue ) const { - if ( aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("link")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("name")) ) + if ( aTagName == "link" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("name")) ) return sal_False; - if ( aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("link")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href")) ) + if ( aTagName == "link" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href")) ) { // check for external reference return !(rValue.matchIgnoreAsciiCaseAsciiL( @@ -444,12 +444,12 @@ sal_Bool TokenInfo::IsPropertyInvariant( const rtl::OString &rName, const rtl::O sal_Bool TokenInfo::IsPropertyFixable( const rtl::OString &rName ) const { // name everything that is allowed to be fixed automatically here - if ( (aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ahelp")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("hid"))) - || (aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("link")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href"))) - || (aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("alt")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id"))) - || (aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("variable")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id"))) - || (aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("src"))) - || (aTagName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image")) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id")) )) + if ( (aTagName == "ahelp" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("hid"))) + || (aTagName == "link" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href"))) + || (aTagName == "alt" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id"))) + || (aTagName == "variable" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id"))) + || (aTagName == "image" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("src"))) + || (aTagName == "image" && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id")) )) return sal_True; return sal_False; } diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index 31a75540130a..ad5197bafb8d 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -667,7 +667,7 @@ void XMLElement::ChangeLanguageTag( const rtl::OUString &rValue ) { for (size_t i = 0; i < pAttributes->size(); ++i) { - if ( (*pAttributes)[ i ]->GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xml-lang")) ) + if ( (*pAttributes)[ i ]->GetName() == "xml-lang" ) (*pAttributes)[ i ]->setValue(rValue); } } diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 05b3a9bc52fe..85ac0c866bfb 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -650,7 +650,7 @@ sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY_LIST)); + return rServiceName == SN_CONV_DICTIONARY_LIST; } diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 4cda05e0df3f..485d3dc9f6d2 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -216,7 +216,7 @@ SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "text-conversion-dictionary" ) pContext = new ConvDicXMLDictionaryContext_Impl( GetConvDicImport(), nPrefix, rLocalName ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -236,9 +236,9 @@ void ConvDicXMLDictionaryContext_Impl::StartElement( GetKeyByAttrName( aAttrName, &aLocalName ); OUString aValue = rxAttrList->getValueByIndex(i); - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lang"))) + if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "lang" ) nLanguage = MsLangId::convertIsoStringToLanguage( aValue ); - else if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("conversion-type"))) + else if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "conversion-type" ) nConversionType = GetConversionTypeFromText( aValue ); } GetConvDicImport().SetLanguage( nLanguage ); @@ -251,7 +251,7 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("entry"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "entry" ) pContext = new ConvDicXMLEntryTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -264,7 +264,7 @@ SvXMLImportContext * ConvDicXMLEntryTextContext_Impl::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("right-text"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "right-text" ) pContext = new ConvDicXMLRightTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -283,9 +283,9 @@ void ConvDicXMLEntryTextContext_Impl::StartElement( GetKeyByAttrName( aAttrName, &aLocalName ); OUString aValue = rxAttrList->getValueByIndex(i); - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("left-text"))) + if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "left-text" ) aLeftText = aValue; - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("property-type"))) + if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "property-type" ) nPropertyType = (sal_Int16) aValue.toInt32(); } } @@ -426,7 +426,7 @@ SvXMLImportContext * ConvDicXMLImport::CreateContext( const uno::Reference < xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "text-conversion-dictionary" ) pContext = new ConvDicXMLDictionaryContext_Impl( *this, nPrefix, rLocalName ); else pContext = new SvXMLImportContext( *this, nPrefix, rLocalName ); diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index f5488eb2937e..0c8f6bac413f 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -134,8 +134,7 @@ sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName ) { MutexGuard aGuard( GetLinguMutex() ); sal_Bool bRes = sal_False; - if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY)) || - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_HH_CONV_DICTIONARY))) + if ( rServiceName == SN_CONV_DICTIONARY || rServiceName == SN_HH_CONV_DICTIONARY ) bRes = sal_True; return bRes; } diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index 578df7494d75..1bfcc70796a1 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -259,7 +259,7 @@ sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::s for ( sal_Int32 i = 0 ; i < nLength; i++) { //Note, we should attempt to use InputStream here first! - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } @@ -309,11 +309,11 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc uno::Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) ) + if ( pValue[i].Name == "TypeName" ) pValue[i].Value >>= sTypeName; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + else if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } @@ -356,7 +356,7 @@ void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArgu nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; break; @@ -375,8 +375,7 @@ OUString LotusWordProImportFilter_getImplementationName () sal_Bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName ) throw (RuntimeException) { - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) ); + return ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2; } Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) throw (RuntimeException) diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 8080e5638515..dbd11bcecd8a 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -231,8 +231,7 @@ sal_Bool MyService1Impl::supportsService( OUString const & serviceName ) throw (RuntimeException) { // this object only supports one service, so the test is simple - return serviceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "my_module.MyService1") ); + return serviceName == "my_module.MyService1"; } Sequence< OUString > MyService1Impl::getSupportedServiceNames() throw (RuntimeException) diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index 6d498dbe95df..af999111d893 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -158,8 +158,7 @@ sal_Bool MyService2Impl::supportsService( OUString const & serviceName ) throw (RuntimeException) { // this object only supports one service, so the test is simple - return serviceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "my_module.MyService2") ); + return serviceName == "my_module.MyService2"; } Sequence< OUString > MyService2Impl::getSupportedServiceNames() diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 219d028dd4a4..2550faa21570 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -170,13 +170,8 @@ Reference< XDispatch > SAL_CALL MyProtocolHandler::queryDispatch( const URL& a // ohne ein entsprechendes Dokument funktioniert der Handler nicht return xRet; - if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command1" ) ) || - aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command2" ) ) || - aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command3" ) ) || - aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command4" ) ) || - aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command5" ) ) || - aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command6" ) ) || - aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command7" ) ) ) + if ( aURL.Path == "Command1" || aURL.Path == "Command2" || aURL.Path == "Command3" || aURL.Path == "Command4" || aURL.Path == "Command5" + || aURL.Path == "Command6" || aURL.Path == "Command7" ) { xRet = aListenerHelper.GetDispatch( mxFrame, aURL.Path ); if ( !xRet.is() ) @@ -212,10 +207,7 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches( sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) { - return ( - ServiceName.equalsAscii(MYPROTOCOLHANDLER_SERVICENAME ) || - ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.ProtocolHandler")) - ); + return ( ServiceName.equalsAscii(MYPROTOCOLHANDLER_SERVICENAME) || ServiceName == "com.sun.star.frame.ProtocolHandler" ); } Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( ) diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 29a9cb9977df..cd64df06f60e 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -130,8 +130,7 @@ const std::vector<LayoutAtomPtr>& ConditionAtom::getChildren() const { bool bDecisionVar=true; // HACK - if( maCond.mnFunc==XML_var && maCond.mnArg==XML_dir && - maCond.mnOp==XML_equ && !maCond.msVal.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("norm")) ) + if( maCond.mnFunc == XML_var && maCond.mnArg == XML_dir && maCond.mnOp == XML_equ && maCond.msVal != "norm" ) bDecisionVar=false; if( bDecisionVar ) diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index bcbdb41aedd2..2aaee5d286eb 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -953,7 +953,7 @@ ConfigItemBase::LineType ConfigItemBase::readConfigLine( OUStringPair aPair = StringHelper::convertStringToPair( aLine ); orKey = aPair.first; orData = aPair.second; - return (!orKey.isEmpty() && (!orData.isEmpty() || !orKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "end" ) ))) ? + return ( !orKey.isEmpty() && (!orData.isEmpty() || orKey != "end" )) ? LINETYPE_DATA : LINETYPE_END; } diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index d400fe1dc99b..e38170219ee8 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -2157,7 +2157,7 @@ VbaStorageObject::VbaStorageObject( const ObjectBase& rParent, const StorageRef& void VbaStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName ) { - if( rStrgPath.isEmpty() && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "dir" ) ) ) + if( rStrgPath.isEmpty() && rStrmName == "dir" ) VbaDirStreamObject( *this, rxStrm, rSysFileName, mrVbaData ).dump(); else if( mrVbaData.isModuleStream( rStrmName ) ) VbaModuleStreamObject( *this, rxStrm, rSysFileName, mrVbaData, mrVbaData.getStreamOffset( rStrmName ) ).dump(); @@ -2191,7 +2191,7 @@ VbaProjectStorageObject::VbaProjectStorageObject( const ObjectBase& rParent, con void VbaProjectStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName ) { - if( rStrgPath.isEmpty() && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PROJECT" ) ) ) + if( rStrgPath.isEmpty() && rStrmName == "PROJECT" ) TextLineStreamObject( *this, rxStrm, maVbaData.meTextEnc, rSysFileName ).dump(); else OleStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName ); diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index eb10b35f4756..bdf60bb6327b 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -137,7 +137,7 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyN lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FillStyle")) && m_bIsFillColor ) + if( aPropertyName == "FillStyle" && m_bIsFillColor ) { ::com::sun::star::drawing::FillStyle aFillStyle = ::com::sun::star::drawing::FillStyle_SOLID; return uno::makeAny(aFillStyle); diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 4283a48986a8..046c61126840 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -733,9 +733,7 @@ void ChartExport::_ExportContent() // range string, as this is our only indicator for having own or // external data. @todo: fix this in the file format! Reference< lang::XServiceInfo > xDPServiceInfo( xNewDoc->getDataProvider(), uno::UNO_QUERY ); - if( ! (xDPServiceInfo.is() && - xDPServiceInfo->getImplementationName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.comp.chart.InternalDataProvider" )))) + if( ! (xDPServiceInfo.is() && xDPServiceInfo->getImplementationName() == "com.sun.star.comp.chart.InternalDataProvider" )) { bIncludeTable = sal_False; } diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 191c74b024aa..dd9676ede726 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -339,7 +339,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, { if( bWithGuid ) { - bool bIsStdFont = importGuid( rInStrm ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT)); + bool bIsStdFont = importGuid( rInStrm ) == OLE_GUID_STDFONT; OSL_ENSURE( bIsStdFont, "OleHelper::importStdFont - unexpected header GUID, expected StdFont" ); if( !bIsStdFont ) return false; @@ -357,7 +357,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, { if( bWithGuid ) { - bool bIsStdPic = importGuid( rInStrm ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDPIC)); + bool bIsStdPic = importGuid( rInStrm ) == OLE_GUID_STDPIC; OSL_ENSURE( bIsStdPic, "OleHelper::importStdPic - unexpected header GUID, expected StdPic" ); if( !bIsStdPic ) return false; @@ -374,7 +374,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, { if( bWithGuid ) { - bool bIsStdHlink = importGuid( rInStrm ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDHLINK)); + bool bIsStdHlink = importGuid( rInStrm ) == OLE_GUID_STDHLINK; OSL_ENSURE( bIsStdHlink, "OleHelper::importStdHlink - unexpected header GUID, expected StdHlink" ); if( !bIsStdHlink ) return false; diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 14768e12021a..9809b3ba5c5c 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -282,11 +282,11 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl OSL_ENSURE( pGuid, "VbaSiteModel::createControlModel - invalid class table index" ); if( pGuid ) { - if( pGuid->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMCTL_GUID_SCROLLBAR_60)) ) + if( *pGuid == COMCTL_GUID_SCROLLBAR_60 ) xCtrlModel.reset( new ComCtlScrollBarModel( 6 ) ); - else if( pGuid->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMCTL_GUID_PROGRESSBAR_50)) ) + else if( *pGuid == COMCTL_GUID_PROGRESSBAR_50 ) xCtrlModel.reset( new ComCtlProgressBarModel( 5 ) ); - else if( pGuid->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMCTL_GUID_PROGRESSBAR_60)) ) + else if( *pGuid == COMCTL_GUID_PROGRESSBAR_60 ) xCtrlModel.reset( new ComCtlProgressBarModel( 6 ) ); } } diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 19defae81a9a..0dfb1dc4a133 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -486,7 +486,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap for( ::std::vector< OUString >::iterator aIt = aElements.begin(), aEnd = aElements.end(); aIt != aEnd; ++aIt ) { // try to open the element as storage - if( !aIt->equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VBA" ) ) ) + if( *aIt != "VBA" ) { StorageRef xSubStrg = rVbaPrjStrg.openSubStorage( *aIt, false ); if( xSubStrg.get() ) try diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 486cfef0af8f..15a3cbbfba14 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -196,7 +196,7 @@ namespace oox { namespace ppt { if( maTo >>= aString ) { OSL_TRACE( "Magic conversion %s", OUSTRING_TO_CSTR( aString ) ); - maTo = makeAny( aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "visible" ) ) ? sal_True : sal_False ); + maTo = makeAny( aString == "visible" ? sal_True : sal_False ); if( !maTo.has<sal_Bool>() ) OSL_TRACE( "conversion failed" ); } diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 7792a46374d4..579392bc7c73 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -5075,9 +5075,8 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, else throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); } - else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) - || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) ) ) - || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRoot" ) ) ) + else if ( ( m_pData->m_bIsRoot && ( aPropertyName == "URL" || aPropertyName == "RepairPackage") ) + || aPropertyName == "IsRoot" ) throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); else throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); @@ -5106,9 +5105,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa } if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE - && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) - || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MEDIATYPE_FALLBACK_USED_PROPERTY ) ) - || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Version" ) ) ) ) + && ( aPropertyName == "MediaType" || aPropertyName == MEDIATYPE_FALLBACK_USED_PROPERTY || aPropertyName == "Version" ) ) { try { @@ -6071,7 +6068,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aEle throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // TODO/LATER: Currently it is only implemented for MediaType property of substorages, might be changed in future - if ( !pElement->m_bIsStorage || m_pData->m_nStorageType != embed::StorageFormats::PACKAGE || !aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + if ( !pElement->m_bIsStorage || m_pData->m_nStorageType != embed::StorageFormats::PACKAGE || aPropertyName != "MediaType" ) throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); if ( !pElement->m_pStorage ) diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index a1069f004841..f165cc77091f 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -69,7 +69,7 @@ namespace rptui return; Reference< XReportControlModel > xRptControlModel( _rEvent.Source, UNO_QUERY ); - if ( xRptControlModel.is() && _rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) ) + if ( xRptControlModel.is() && _rEvent.PropertyName == "DataField" ) { ::rtl::OUString sOldDataSource, sNewDataSource; OSL_VERIFY( _rEvent.OldValue >>= sOldDataSource ); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 8d52b061d037..4e34f131f08d 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -126,10 +126,7 @@ namespace rptui //-------------------------------------------------------------------- void FormatNormalizer::impl_onDefinitionPropertyChange( const ::rtl::OUString& _rChangedPropName ) { - if ( !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Command" ) ) - && !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandType" ) ) - && !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EscapeProcessing" ) ) - ) + if ( _rChangedPropName != "Command" && _rChangedPropName != "CommandType" && _rChangedPropName != "EscapeProcessing" ) // nothing we're interested in return; m_bFieldListDirty = true; @@ -138,7 +135,7 @@ namespace rptui //-------------------------------------------------------------------- void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const ::rtl::OUString& _rChangedPropName ) { - if ( !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) ) + if ( _rChangedPropName != "DataField" ) // nothing we're interested in return; diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index dd4d19591ad6..85248f11309b 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -83,7 +83,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport switch( rTokenMap.Get( nPrefix, sLocalName ) ) { case XML_TOK_LIST_PROPERTY: - m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); + m_bIsList = sValue == "true"; break; case XML_TOK_VALUE_TYPE: { diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 52f1a9ee3fc4..1aa4480cafc5 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -148,7 +148,7 @@ namespace rptui // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { - if ( !_rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) ) + if ( _rEvent.PropertyName != "DataField" ) // not interested in return; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 9b55494b0c69..ae45e4418a10 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1640,7 +1640,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { openZoomDialog(); } - else if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Zoom")) ) + else if ( aArgs.getLength() == 1 && aArgs[0].Name == "Zoom" ) { SvxZoomItem aZoomItem; aZoomItem.PutValue(aArgs[0].Value); @@ -1650,7 +1650,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > } break; case SID_ATTR_ZOOMSLIDER: - if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ZoomSlider")) ) + if ( aArgs.getLength() == 1 && aArgs[0].Name == "ZoomSlider" ) { SvxZoomSliderItem aZoomSlider; aZoomSlider.PutValue(aArgs[0].Value); @@ -2818,19 +2818,19 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( } else { - if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ShowRuler")) ) + if ( *commandName == "ShowRuler" ) OSL_VERIFY( rCommandValue >>= m_bShowRuler ); - else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HelplinesMove")) ) + else if ( *commandName == "HelplinesMove" ) OSL_VERIFY( rCommandValue >>= m_bHelplinesMove ); - else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GridVisible")) ) + else if ( *commandName == "GridVisible" ) OSL_VERIFY( rCommandValue >>= m_bGridVisible ); - else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GridUse")) ) + else if ( *commandName == "GridUse" ) OSL_VERIFY( rCommandValue >>= m_bGridUse ); - else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ControlProperties")) ) + else if ( *commandName == "ControlProperties" ) OSL_VERIFY( rCommandValue >>= m_bShowProperties ); - else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LastPropertyBrowserPage")) ) + else if ( *commandName == "LastPropertyBrowserPage" ) OSL_VERIFY( rCommandValue >>= m_sLastActivePage ); - else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SplitPosition")) ) + else if ( *commandName == "SplitPosition" ) OSL_VERIFY( rCommandValue >>= m_nSplitPos ); } } @@ -4093,7 +4093,7 @@ void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw ( // ----------------------------------------------------------------------------- bool OReportController::isUiVisible() const { - return !m_sMode.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("remote")); + return m_sMode != "remote"; } // ----------------------------------------------------------------------------- void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 40ad28cdea85..ba21dacef325 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -188,7 +188,7 @@ SAL_IMPLEMENT_MAIN() { while (index < rtl_getAppCommandArgCount()) { rtl::OUString arg = getArgument(index); - if (!arg.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("--protector"))) + if ( arg != "--protector" ) { if (testlib.empty()) { diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index b25fb1612f37..71aa8da979b2 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -678,18 +678,13 @@ namespace rtl_Bootstrap void testRecursion() { rtl::OUString t(RTL_CONSTASCII_USTRINGPARAM("$RECURSIVE")); Bootstrap(t_getSourcePath(TESTSHL2_INI)).expandMacrosFrom(t); - CPPUNIT_ASSERT_MESSAGE( - "recursion detection", - t.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("***RECURSION DETECTED***"))); + CPPUNIT_ASSERT_MESSAGE( "recursion detection", t == "***RECURSION DETECTED***" ); } void testLink() { rtl::OUString t(RTL_CONSTASCII_USTRINGPARAM("$LINKED")); Bootstrap(t_getSourcePath(TESTSHL2_INI)).expandMacrosFrom(t); - CPPUNIT_ASSERT_MESSAGE( - "link file", - t.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("qadev17"))); + CPPUNIT_ASSERT_MESSAGE( "link file", t == "qadev17"); } void testOverride() { @@ -697,16 +692,12 @@ namespace rtl_Bootstrap RTL_CONSTASCII_USTRINGPARAM( "${.override:$ORIGIN/" SAL_CONFIGFILE("rtl") ":ORIGIN}")); Bootstrap(t_getSourcePath("rtl")).expandMacrosFrom(t1); - CPPUNIT_ASSERT_MESSAGE( - "override ORIGIN", - t1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("direct"))); + CPPUNIT_ASSERT_MESSAGE( "override ORIGIN", t1 == "direct" ); rtl::OUString t2( RTL_CONSTASCII_USTRINGPARAM( "${.override:$ORIGIN/" SAL_CONFIGFILE("none") ":MYVAR}")); Bootstrap::expandMacros(t2); - CPPUNIT_ASSERT_MESSAGE( - "override MYVAR", - t2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("src680_test"))); + CPPUNIT_ASSERT_MESSAGE( "override MYVAR", t2 == "src680_test" ); } void testNonexisting() { @@ -714,9 +705,7 @@ namespace rtl_Bootstrap RTL_CONSTASCII_USTRINGPARAM( "${$ORIGIN/" SAL_CONFIGFILE("none") ":MYVAR}")); Bootstrap::expandMacros(t); - CPPUNIT_ASSERT_MESSAGE( - "nonexisting", - t.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("src680_test"))); + CPPUNIT_ASSERT_MESSAGE( "nonexisting", t == "src680_test" ); } void testSection() { @@ -732,10 +721,7 @@ namespace rtl_Bootstrap b.appendAscii(RTL_CONSTASCII_STRINGPARAM(":Other_Section:EXPAND}")); rtl::OUString t(b.makeStringAndClear()); Bootstrap(t_getSourcePath(TESTSHL2_INI)).expandMacrosFrom(t); - CPPUNIT_ASSERT_MESSAGE( - "section expansion", - t.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("$FILE"))); + CPPUNIT_ASSERT_MESSAGE( "section expansion", t == "$FILE" ); // the correct answer would be "testshl2 file" instead, but // expansion including a section currently erroneously does not // recursively expand macros in the resulting replacement text diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 5d4953e040f3..37711cf0dad4 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -1022,7 +1022,7 @@ public: ::rtl::OUString aFoo( RTL_CONSTASCII_USTRINGPARAM("foo") ); ::rtl::OUString aFooIntern = aFoo.intern(); - CPPUNIT_ASSERT_MESSAGE("string contents", aFooIntern.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("foo"))); + CPPUNIT_ASSERT_MESSAGE( "string contents", aFooIntern == "foo" ); CPPUNIT_ASSERT_MESSAGE("string length", aFooIntern.getLength() == 3); // We have to dup due to no atomic 'intern' bit-set operation CPPUNIT_ASSERT_MESSAGE("intern dups", aFoo.pData != aFooIntern.pData); @@ -1246,7 +1246,7 @@ void convertFromString::test() { (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))); - CPPUNIT_ASSERT(t.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("abc"))); + CPPUNIT_ASSERT( t == "abc" ); } // ----------------------------------------------------------------------------- diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx index 454bba9254c6..ae402bb0d911 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx @@ -53,12 +53,12 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString); void test::oustringbuffer::ToString::testToString() { rtl::OUStringBuffer sb(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test string"))); rtl::OUString str = sb.toString(); - CPPUNIT_ASSERT(str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test string"))); + CPPUNIT_ASSERT( str == "test string" ); // returned OUString must be independent from sb sb.append( (sal_Unicode)'a' ); - CPPUNIT_ASSERT(str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test string"))); + CPPUNIT_ASSERT( str == "test string" ); sb.setLength(0); - CPPUNIT_ASSERT(str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test string"))); + CPPUNIT_ASSERT( str == "test string" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx index 0869366e5660..1d3f05209add 100644 --- a/sal/rtl/source/bootstrap.cxx +++ b/sal/rtl/source/bootstrap.cxx @@ -810,8 +810,7 @@ rtl::OUString expandMacros( if (n == 1) { buf.append(lookup(file, mode, false, seg[0], requestStack)); } else if (n == 2) { - if (seg[0].equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(".link"))) + if ( seg[0] == ".link" ) { osl::File f(seg[1]); rtl::ByteSequence seq; @@ -843,8 +842,7 @@ rtl::OUString expandMacros( rtl::Bootstrap(seg[0]).getHandle()), mode, false, seg[1], requestStack)); } - } else if (seg[0].equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(".override"))) + } else if ( seg[0] == ".override" ) { rtl::Bootstrap b(seg[1]); Bootstrap_Impl * f = static_cast< Bootstrap_Impl * >( diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index c8bd00c0cb57..e9b4d9040f41 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -325,11 +325,11 @@ void Test::testInput() m_pDoc->SetString(0, 0, 0, numstr); m_pDoc->GetString(0, 0, 0, test); - bool bTest = test.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("10.5")); + bool bTest = test == "10.5"; CPPUNIT_ASSERT_MESSAGE("String number should have the first apostrophe stripped.", bTest); m_pDoc->SetString(0, 0, 0, str); m_pDoc->GetString(0, 0, 0, test); - bTest = test.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("'apple'")); + bTest = test == "'apple'"; CPPUNIT_ASSERT_MESSAGE("Text content should have retained the first apostrophe.", bTest); m_pDoc->DeleteTab(0); @@ -1870,7 +1870,7 @@ void Test::testPivotTableNamedSource() m_pDoc->MoveTab(1, 0); rtl::OUString aTabName; m_pDoc->GetName(0, aTabName); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet name.", aTabName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Table"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong sheet name.", aTabName == "Table" ); CPPUNIT_ASSERT_MESSAGE("Pivot table output is on the wrong sheet!", pDPObj->GetOutRange().aStart.Tab() == 0); @@ -2603,7 +2603,7 @@ void Test::testSheetMove() CPPUNIT_ASSERT_MESSAGE("copied sheet should also have all rows visible as the original.", !bHidden && nRow1 == 0 && nRow2 == MAXROW); rtl::OUString aName; m_pDoc->GetName(0, aName); - CPPUNIT_ASSERT_MESSAGE("sheets should have changed places", aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TestTab1"))); + CPPUNIT_ASSERT_MESSAGE( "sheets should have changed places", aName == "TestTab1" ); m_pDoc->SetRowHidden(5, 10, 0, true); bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); @@ -2623,7 +2623,7 @@ void Test::testSheetMove() bHidden = m_pDoc->RowHidden(11, 1, &nRow1, &nRow2); CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden && nRow1 == 11 && nRow2 == MAXROW); m_pDoc->GetName(0, aName); - CPPUNIT_ASSERT_MESSAGE("sheets should have changed places", aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TestTab2"))); + CPPUNIT_ASSERT_MESSAGE( "sheets should have changed places", aName == "TestTab2" ); m_pDoc->DeleteTab(1); m_pDoc->DeleteTab(0); } @@ -2873,9 +2873,9 @@ void testExtRefFuncT(ScDocument* pDoc, ScDocument* pExtDoc) pDoc->CalcAll(); rtl::OUString aRes = pDoc->GetString(0, 0, 0); - CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.2"))); + CPPUNIT_ASSERT_MESSAGE( "Unexpected result with T.", aRes == "1.2" ); aRes = pDoc->GetString(0, 1, 0); - CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Foo"))); + CPPUNIT_ASSERT_MESSAGE( "Unexpected result with T.", aRes == "Foo" ); aRes = pDoc->GetString(0, 2, 0); CPPUNIT_ASSERT_MESSAGE("Unexpected result with T.", aRes.isEmpty()); } @@ -3647,22 +3647,22 @@ void Test::testToggleRefFlag() // column relative / row relative -> column absolute / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=$B$100"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=$B$100" ); // column absolute / row absolute -> column relative / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=B$100"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=B$100" ); // column relative / row absolute -> column absolute / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=$B100"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=$B100" ); // column absolute / row relative -> column relative / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=B100"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=B100" ); } { @@ -3678,22 +3678,22 @@ void Test::testToggleRefFlag() // column absolute / row absolute -> column relative / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R2C[-3]"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=R2C[-3]" ); // column relative / row absolute - > column absolute / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R[-4]C1"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=R[-4]C1" ); // column absolute / row relative -> column relative / row relative aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R[-4]C[-3]"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=R[-4]C[-3]" ); // column relative / row relative -> column absolute / row absolute aFinder.ToggleRel(0, aFormula.getLength()); aFormula = aFinder.GetText(); - CPPUNIT_ASSERT_MESSAGE("Wrong conversion.", aFormula.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("=R2C1"))); + CPPUNIT_ASSERT_MESSAGE( "Wrong conversion.", aFormula == "=R2C1" ); } // TODO: Add more test cases esp. for 3D references, Excel A1 syntax, and diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index fbe114e9eab5..8f6397eebe6f 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -804,8 +804,7 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rD // #TODO #FIXME do we have a localisation issue here? rForm.GetFormula( aBuf ); rtl::OUString aVal( aBuf.makeStringAndClear() ); - if ( aVal.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "=TRUE()" ) ) - || aVal.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "=FALSE()" ) ) ) + if ( aVal == "=TRUE()" || aVal == "=FALSE()" ) bForceFormula = true; } if (bForceFormula || bCloneFormula) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 879a08dd35ab..62490f5e0e8e 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -910,13 +910,13 @@ rtl::OUString lclEncodeDosUrl( rtl::OUString aOldUrl = rUrl; aBuf.append(EXC_URLSTART_ENCODED); - if (aOldUrl.getLength() > 2 && aOldUrl.copy(0,2).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\\\"))) + if ( aOldUrl.getLength() > 2 && aOldUrl.copy(0,2) == "\\\\" ) { // UNC aBuf.append(EXC_URL_DOSDRIVE).append(sal_Unicode('@')); aOldUrl = aOldUrl.copy(2); } - else if (aOldUrl.getLength() > 2 && aOldUrl.copy(1,2).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(":\\"))) + else if ( aOldUrl.getLength() > 2 && aOldUrl.copy(1,2) == ":\\" ) { // drive letter sal_Unicode cThisDrive = rBase.isEmpty() ? ' ' : rBase.getStr()[0]; @@ -933,7 +933,7 @@ rtl::OUString lclEncodeDosUrl( sal_Int32 nPos = -1; while((nPos = aOldUrl.indexOf('\\')) != -1) { - if (aOldUrl.copy(0,2).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".."))) + if ( aOldUrl.copy(0,2) == ".." ) // parent dir (NOTE: the MS-XLS spec doesn't mention this, and // Excel seems confused by this token). aBuf.append(EXC_URL_PARENTDIR); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 6c8eb507d626..13b1667a98a4 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2835,7 +2835,7 @@ void XclImpPictureObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal if( (rStrm.GetNextRecId() == EXC_ID3_IMGDATA) && rStrm.StartNextRecord() ) { // page background is stored as hidden picture with name "__BkgndObj" - if (IsHidden() && (GetObjName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("__BkgndObj")))) + if ( IsHidden() && (GetObjName() == "__BkgndObj") ) GetPageSettings().ReadImgData( rStrm ); else maGraphic = XclImpDrawing::ReadImgData( GetRoot(), rStrm ); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 61b686a69067..85ec10243f6d 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -61,7 +61,7 @@ ScMyOLEFixer::~ScMyOLEFixer() sal_Bool ScMyOLEFixer::IsOLE(uno::Reference< drawing::XShape >& rShape) { - return rShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape")); + return rShape->getShapeType() == "com.sun.star.drawing.OLE2Shape"; } void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 82ab2ccabd8e..910c4ee99f60 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -692,8 +692,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic pExport->SetSharedData(pSharedData); // if there are sheets to copy, get the source stream - if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("content.xml")) && lcl_HasValidStream(rDoc) && - ( pExport->getExportFlags() & EXPORT_OASIS ) ) + if ( sName == "content.xml" && lcl_HasValidStream(rDoc) && ( pExport->getExportFlags() & EXPORT_OASIS ) ) { // old stream is still in this file's storage - open read-only diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 9fdaf2ccde43..f879e78e0379 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1406,7 +1406,7 @@ void ScInputHandler::PasteManualTip() // (wenn wir mal Matrix-Konstanten haben, kann das geaendert werden) sal_Int32 nTipLen = aManualTip.getLength(); - if ( nTipLen && ( nTipLen < 3 || !aManualTip.copy( nTipLen-3 ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("...")) ) ) + if ( nTipLen && ( nTipLen < 3 || aManualTip.copy( nTipLen-3 ) != "..." ) ) { DataChanging(); // kann nicht neu sein diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 493b2db9b94a..3221b7dc60af 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -260,7 +260,7 @@ void ScDbNameDlg::Init() && (rEnd.Col() == nCol2) && (rEnd.Row() == nRow2 ) ) { rtl::OUString aDBName = pDBData->GetName(); - if (!aDBName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME))) + if ( aDBName != STR_DB_LOCAL_NONAME ) aEdName.SetText(aDBName); aBtnHeader.Check( pDBData->HasHeader() ); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index bbb1e7eda610..c297ee02bf6d 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -165,7 +165,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe SCCOL nOldCol2; SCROW nOldRow2; pData->GetArea( nDummy, nOldCol1,nOldRow1, nOldCol2,nOldRow2 ); - sal_Bool bIsNoName = ( pData->GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) ); + sal_Bool bIsNoName = ( pData->GetName() == STR_DB_LOCAL_NONAME ); if (!bSelected) { diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 30a26fee657b..6b424e21c48f 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -1717,7 +1717,7 @@ sal_Bool lcl_GetFieldDataByName( ScDPObject* pDPObj, const OUString& rFieldName, // The name "Data" always refers to the data layout field. rFieldId.maFieldName = rFieldName; rFieldId.mnFieldIdx = 0; - rFieldId.mbDataLayout = rFieldName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_DATALAYOUT_NAME ) ); + rFieldId.mbDataLayout = rFieldName == SC_DATALAYOUT_NAME; pDPObj->GetSource(); // IsDimNameInUse doesn't update source data diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index efbce663d2bd..167449ffb6ea 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -276,7 +276,7 @@ sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Po { sal_Bool bReturn = false; rtl::OUString sType(xShape->getShapeType()); - sal_Bool bCaptionShape(sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.CaptionShape"))); + sal_Bool bCaptionShape( sType == "com.sun.star.drawing.CaptionShape" ); if (bCaptionShape) { uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY); diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 8885258f854a..d0201a40d6bd 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1639,7 +1639,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi ::rtl::OUString sFileExtension = aURLObj.GetExtension(); if ( sFileExtension.isEmpty() ) { - sFileExtension = sFirstFilter.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*.*")) ? sFileExtension : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 ); + sFileExtension = sFirstFilter == "*.*" ? sFileExtension : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 ); aPathStr = sFileExtension.isEmpty() ? aPathStr : aPathStr + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension; } else @@ -1667,7 +1667,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi } if ( !bValidFilter ) { - sFileExtension = sFirstFilter.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*.*")) ? rtl::OUString() + sFileExtension = sFirstFilter == "*.*" ? rtl::OUString() : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 ); aPathStr = sFileExtension.isEmpty() ? aPathStr : aPathStr + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension; @@ -1713,33 +1713,33 @@ ConvertCountryCode(const OUString& language) { sal_Int32 nCode = 0; - if( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ar")) ) nCode = 966; // Arabic - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("cs")) ) nCode = 42; // Czech - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("da")) ) nCode = 45; // Danish - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("de")) ) nCode = 49; // German - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("en")) ) nCode = 1; // English - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("es")) ) nCode = 34; // Spanish - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("el")) ) nCode = 30; // Greek - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("fa")) ) nCode = 98; // Persian = Farsi - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("fi")) ) nCode = 358; // Finnish - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("fr")) ) nCode = 33; // French - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("he")) ) nCode = 972; // Hebrew - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hi")) ) nCode = 91; // Indian = Hindi - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hu")) ) nCode = 36; // Hungarian - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("it")) ) nCode = 39; // Italian - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ja")) ) nCode = 81; // Japanese - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")) ) nCode = 82; // Korean - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("nl")) ) nCode = 31; // Dutch - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("no")) ) nCode = 47; // Norwegian - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pl")) ) nCode = 48; // Polish - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pt")) ) nCode = 351; // Portuguese - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ru")) ) nCode = 7; // Russian - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sv")) ) nCode = 46; // Swedish - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("th")) ) nCode = 66; // Thai - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("tk")) ) nCode = 90; // Turkish - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ur")) ) nCode = 92; // Urdu - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vi")) ) nCode = 84; // Vietnamese - else if ( language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) ) nCode = 86; // Simplified Chinese + if( language == "ar" ) nCode = 966; // Arabic + else if ( language == "cs" ) nCode = 42; // Czech + else if ( language == "da" ) nCode = 45; // Danish + else if ( language == "de" ) nCode = 49; // German + else if ( language == "en" ) nCode = 1; // English + else if ( language == "es" ) nCode = 34; // Spanish + else if ( language == "el" ) nCode = 30; // Greek + else if ( language == "fa" ) nCode = 98; // Persian = Farsi + else if ( language == "fi" ) nCode = 358; // Finnish + else if ( language == "fr" ) nCode = 33; // French + else if ( language == "he" ) nCode = 972; // Hebrew + else if ( language == "hi" ) nCode = 91; // Indian = Hindi + else if ( language == "hu" ) nCode = 36; // Hungarian + else if ( language == "it" ) nCode = 39; // Italian + else if ( language == "ja" ) nCode = 81; // Japanese + else if ( language == "ko" ) nCode = 82; // Korean + else if ( language == "nl" ) nCode = 31; // Dutch + else if ( language == "no" ) nCode = 47; // Norwegian + else if ( language == "pl" ) nCode = 48; // Polish + else if ( language == "pt" ) nCode = 351; // Portuguese + else if ( language == "ru" ) nCode = 7; // Russian + else if ( language == "sv" ) nCode = 46; // Swedish + else if ( language == "th" ) nCode = 66; // Thai + else if ( language == "tk" ) nCode = 90; // Turkish + else if ( language == "ur" ) nCode = 92; // Urdu + else if ( language == "vi" ) nCode = 84; // Vietnamese + else if ( language == "zh" ) nCode = 86; // Simplified Chinese return nCode; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 3812183bc7a8..847483fb36f3 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1289,7 +1289,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec nSelPos = pFilterBox->GetEntryPos(rQueryStr); } } - else if (rEntry.eOp == SC_TOPVAL && rQueryStr.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("10"))) + else if ( rEntry.eOp == SC_TOPVAL && rQueryStr == "10" ) nSelPos = SC_AUTOFILTER_TOP10; else nSelPos = SC_AUTOFILTER_CUSTOM; diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 54e8f0e9d59b..f8277d951dfe 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -703,7 +703,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r if (aStrs.size() > 3) pExtra = &aStrs[3]; - if (pExtra && pExtra->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc:extref"))) + if ( pExtra && *pExtra == "calc:extref" ) { // Paste this as an external reference. Note that paste link always // uses Calc A1 syntax even when another formula syntax is specified diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 6ba6d4409a8f..11c9e3da9f50 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -375,8 +375,7 @@ OUString SAL_CALL ScaDateAddIn::getImplementationName() throw( uno::RuntimeExcep sal_Bool SAL_CALL ScaDateAddIn::supportsService( const OUString& aServiceName ) throw( uno::RuntimeException ) { - return aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ADDIN_SERVICE ) ) || - aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MY_SERVICE ) ); + return aServiceName == ADDIN_SERVICE || aServiceName == MY_SERVICE; } uno::Sequence< OUString > SAL_CALL ScaDateAddIn::getSupportedServiceNames() throw( uno::RuntimeException ) diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index bb89385e4946..cbcc6d777950 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -299,7 +299,7 @@ namespace basprov { // Provider has been created with application context for user // or share - if ( !m_sScriptingContext.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) ) + if ( m_sScriptingContext != "user" ) { m_bIsUserCtx = false; } diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index f4274daf085d..6ecd09df6d63 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -1788,7 +1788,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl:: } } } - else if( !bDefaultFound && aExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "default" ) ) ) + else if( !bDefaultFound && aExtension == "default" ) { //rtl::OUString aName = aInetObj.getBase(); Locale aLocale; diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index bb1862c0be3e..d87ab92e9b05 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1322,9 +1322,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA static bool implIsColorAttribute( const OUString& rAttributeName ) { - return rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FillColor") ) || - rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("LineColor") ) || - rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CharColor") ); + return rAttributeName == "FillColor" || rAttributeName == "LineColor" || rAttributeName == "CharColor"; } // -------------------------------------------------------------------- @@ -1824,8 +1822,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres while( nLength-- ) { - if( !p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "text-only" ) ) && - !p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-property" ) ) ) + if( p->Name != "text-only" && p->Name != "preset-property" ) { aNewUserData.push_back( *p ); bFilter = true; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 6e8f8ca83208..1b1aa5bc6b18 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2359,7 +2359,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a sal_uInt32 nMirrorFlags; rtl::OUString sCustomShapeType; MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType ); - if ( sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-502ad400" ) ) || sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-60da8460" ) ) ) + if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" ) { // sj: creating metafile for customshapes that can't be saved to ms format properly ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) ) diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index f4d4d0215760..35aba8c170ce 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -399,7 +399,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su if( !bIsLinked ) xGraphicSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MimeType" ) ) ) >>= aMimeType; - if( bIsLinked || aMimeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "image/x-vclgraphic" ) ) || aMimeType.isEmpty() ) + if( bIsLinked || aMimeType == "image/x-vclgraphic" || aMimeType.isEmpty() ) { // this failed, try to detect it from graphic stream and URL OUString aURL( sGraphicURL ); @@ -421,7 +421,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su } } - if( aMimeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "image/x-vclgraphic" ) ) || aMimeType.isEmpty() ) + if( aMimeType == "image/x-vclgraphic" || aMimeType.isEmpty() ) { // this also failed, now set a mimetype that fits graphic best diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index dcdfbd64455b..1035f5bdae31 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -684,7 +684,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& OUString aAttributeName( xAnimate->getAttributeName() ); - if( (nNodeType == AnimationNodeType::SET) && aAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "fill.on" ) ) ) + if( (nNodeType == AnimationNodeType::SET) && aAttributeName == "fill.on" ) return false; const ImplAttributeNameConversion* p = gImplConversionList; @@ -967,7 +967,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any OUString aString; if( rValue >>= aString ) { - rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "solid" ) ) ? FillStyle_SOLID : FillStyle_NONE; + rValue <<= aString == "solid" ? FillStyle_SOLID : FillStyle_NONE; bRet = true; } } @@ -978,7 +978,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any OUString aString; if( rValue >>= aString ) { - rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "true" ) ) ? ::com::sun::star::drawing::LineStyle_SOLID : ::com::sun::star::drawing::LineStyle_NONE; + rValue <<= aString == "true" ? ::com::sun::star::drawing::LineStyle_SOLID : ::com::sun::star::drawing::LineStyle_NONE; bRet = true; } } @@ -989,7 +989,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any OUString aString; if( rValue >>= aString ) { - rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bold" ) ) ? com::sun::star::awt::FontWeight::BOLD : com::sun::star::awt::FontWeight::NORMAL; + rValue <<= aString == "bold" ? com::sun::star::awt::FontWeight::BOLD : com::sun::star::awt::FontWeight::NORMAL; bRet = true; } } @@ -1000,7 +1000,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any OUString aString; if( rValue >>= aString ) { - rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "italic" ) ) ? com::sun::star::awt::FontSlant_ITALIC : com::sun::star::awt::FontSlant_NONE; + rValue <<= aString == "italic" ? com::sun::star::awt::FontSlant_ITALIC : com::sun::star::awt::FontSlant_NONE; bRet = true; } } @@ -1011,7 +1011,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any OUString aString; if( rValue >>= aString ) { - rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "true" ) ) ? com::sun::star::awt::FontUnderline::SINGLE : com::sun::star::awt::FontUnderline::NONE; + rValue <<= aString == "true" ? com::sun::star::awt::FontUnderline::SINGLE : com::sun::star::awt::FontUnderline::NONE; bRet = true; } } @@ -1034,7 +1034,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any OUString aString; if( rValue >>= aString ) { - rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "visible" ) ) ? sal_True : sal_False; + rValue <<= aString == "visible" ? sal_True : sal_False; bRet = true; } } @@ -1679,7 +1679,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom OUString aContext; if( aSet.getProperty( DFF_ANIM_RUNTIMECONTEXT ) >>= aContext ) { - if( !aContext.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PPT") ) ) + if( aContext != "PPT" ) bWrongContext = true; } } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 56c587b0a6c5..f2ec94b5b562 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1256,10 +1256,8 @@ static sal_Bool hasVisibleShape( const Reference< XShape >& xShape ) { const OUString sShapeType( xShape->getShapeType() ); - if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TitleTextShape") ) || - sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OutlinerShape") ) || - sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.SubtitleShape") ) || - sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TextShape") ) ) + if( sShapeType == "com.sun.star.presentation.TitleTextShape" || sShapeType == "com.sun.star.presentation.OutlinerShape" || + sShapeType == "com.sun.star.presentation.SubtitleShape" || sShapeType == "com.sun.star.drawing.TextShape" ) { const OUString sFillStyle( RTL_CONSTASCII_USTRINGPARAM("FillStyle" ) ); const OUString sLineStyle( RTL_CONSTASCII_USTRINGPARAM("LineStyle" ) ); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 0d3adff367b2..9059672a99d1 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -258,9 +258,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () // XEventListener void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) { - if( aEvent.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnAnnotationInserted") ) || - aEvent.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnAnnotationRemoved") ) || - aEvent.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnAnnotationChanged" )) ) + if( aEvent.EventName == "OnAnnotationInserted" || aEvent.EventName == "OnAnnotationRemoved" || aEvent.EventName == "OnAnnotationChanged" ) { UpdateTags(); } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 3e85d2384000..5384808b731b 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -798,9 +798,7 @@ bool SlideshowImpl::startPreview( const Sequence<OUString> supportedServices( xServiceInfo->getSupportedServiceNames() ); for ( sal_Int32 pos = supportedServices.getLength(); pos--; ) { - if (supportedServices[pos].equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.drawing.MasterPage") )) { + if ( supportedServices[pos] == "com.sun.star.drawing.MasterPage" ) { OSL_FAIL("sd::SlideshowImpl::startPreview() " "not allowed on master page!"); return false; @@ -1355,8 +1353,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Reference< XShape > xShape; xShapes->getByIndex( nShape ) >>= xShape; - if( xShape.is() && - xShape->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape") ) ) + if( xShape.is() && xShape->getShapeType() == "com.sun.star.drawing.GroupShape" ) { Reference< XShapes > xSubShapes( xShape, UNO_QUERY ); if( xSubShapes.is() ) diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 2c4a9299698f..2263f8df1767 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -341,9 +341,7 @@ void TableDesignPane::onSelectionChanged() } Reference< XShapeDescriptor > xDesc( aSel, UNO_QUERY ); - if( xDesc.is() && - ( xDesc->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TableShape" ) ) || - xDesc->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.TableShape" ) ) ) ) + if( xDesc.is() && ( xDesc->getShapeType() == "com.sun.star.drawing.TableShape" || xDesc->getShapeType() == "com.sun.star.presentation.TableShape" ) ) { xNewSelection = Reference< XPropertySet >::query( xDesc ); } diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 3bf776a1102f..9190eb3ccc4c 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1158,19 +1158,15 @@ sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceNa { ::SolarMutexGuard aGuard; - if ( - (ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.OfficeDocument"))) || - (ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GenericDrawingDocument"))) || - (ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentFactory"))) - ) + if ( ServiceName == "com.sun.star.document.OfficeDocument" + || ServiceName == "com.sun.star.drawing.GenericDrawingDocument" + || ServiceName == "com.sun.star.drawing.DrawingDocumentFactory" ) { return sal_True; } - return ( - ( mbImpressDoc && ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument"))) || - (!mbImpressDoc && ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocument"))) - ); + return ( ( mbImpressDoc && ServiceName == "com.sun.star.presentation.PresentationDocument" ) + || ( !mbImpressDoc && ServiceName == "com.sun.star.drawing.DrawingDocument" ) ); } uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() throw(uno::RuntimeException) diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 742407dd0e2d..9c36cf803128 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -1372,7 +1372,7 @@ PDFFileImplData* PDFFile::impl_getData() const m_pData->m_nKeyLength = static_cast<sal_uInt32>(pNum->m_fValue) / 8; } PDFName* pFilter = dynamic_cast<PDFName*>(filter->second); - if( pFilter && pFilter->getFilteredName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) + if( pFilter && pFilter->getFilteredName() == "Standard" ) m_pData->m_bStandardHandler = true; if( o_ent != pDict->m_aMap.end() ) { diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index d917f91031ac..4f7ea3859736 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -228,7 +228,7 @@ void StyleContainer::emit( EmitContext& rContext, { if( it->second.Name.equals( "style:master-page" ) ) aMasterPageSection.push_back( it->first ); - else if( getStyleName( it->first ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "standard" ) ) ) + else if( getStyleName( it->first ) == "standard" ) aOfficeStyleSection.push_back( it->first ); else aAutomaticStyleSection.push_back( it->first ); diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx index 00c5ae88063a..691bfaa44389 100644 --- a/sfx2/inc/sfx2/XmlIdRegistry.hxx +++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx @@ -51,9 +51,7 @@ extern inline bool isValidXmlId(::rtl::OUString const & i_rStreamName, ::rtl::OUString const & i_rIdref) { - return isValidNCName(i_rIdref) && - (i_rStreamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("content.xml")) || - i_rStreamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("styles.xml"))); + return isValidNCName(i_rIdref) && ( i_rStreamName == "content.xml" || i_rStreamName == "styles.xml" ); } diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index f78dd308ec62..005db6e6b1a4 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -422,8 +422,7 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet ) // Determine if URL contains a master/slave command which must be handled a little bit different sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) { - if ( aURL.Protocol.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:" ) ) && - ( aURL.Path.indexOf( '.' ) > 0 )) + if ( aURL.Protocol == ".uno:" && ( aURL.Path.indexOf( '.' ) > 0 )) return sal_True; return sal_False; @@ -458,7 +457,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl( , bVisible( sal_True ) , pUnoName( pSlot->pUnoName ) { - if ( aDispatchURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("slot:")) && pUnoName ) + if ( aDispatchURL.Protocol == "slot:" && pUnoName ) { rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:")); aTmp.append(pUnoName); diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index c5ff48061fae..d27df1dece1d 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -108,20 +108,17 @@ static const char s_odfmime [] = "application/vnd.oasis.opendocument."; static bool isContentFile(::rtl::OUString const & i_rPath) { - return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_content)); + return i_rPath == s_content; } static bool isStylesFile (::rtl::OUString const & i_rPath) { - return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_styles)); + return i_rPath == s_styles; } static bool isReservedFile(::rtl::OUString const & i_rPath) { - return isContentFile(i_rPath) - || isStylesFile(i_rPath) - || i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_meta)) - || i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_settings)); + return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == s_meta || i_rPath == s_settings; } @@ -244,8 +241,8 @@ static bool isFileNameValid(const ::rtl::OUString & i_rFileName) const ::rtl::OUString segment( i_rFileName.getToken(0, static_cast<sal_Unicode> ('/'), idx) ); if (segment.isEmpty() || // no empty segments - segment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".")) || // no . segments - segment.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("..")) || // no .. segments + segment == "." || // no . segments + segment == ".." || // no .. segments !::comphelper::OStorageHelper::IsValidZipEntryFileName( segment, sal_False)) // no invalid characters return false; diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index f23e7823ff3f..73374214251b 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -126,12 +126,12 @@ static const char s_prefix [] = "id"; // prefix for generated xml:id static bool isContentFile(::rtl::OUString const & i_rPath) { - return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_content)); + return i_rPath == s_content; } static bool isStylesFile (::rtl::OUString const & i_rPath) { - return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_styles)); + return i_rPath == s_styles; } diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 77caad27b039..2e5ff08e5bea 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -528,10 +528,10 @@ getQualifier(const char* i_name) { DBG_ASSERT(i_qname, "SfxDocumentMetaData: getNameSpace: argument is null"); const char * ns = ""; ::rtl::OUString n = getQualifier(i_qname).first; - if (n.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xlink"))) ns = s_nsXLink; - if (n.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dc"))) ns = s_nsDC; - if (n.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office"))) ns = s_nsODF; - if (n.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("meta"))) ns = s_nsODFMeta; + if ( n == "xlink" ) ns = s_nsXLink; + if ( n == "dc" ) ns = s_nsDC; + if ( n == "office" ) ns = s_nsODF; + if ( n == "meta" ) ns = s_nsODFMeta; DBG_ASSERT(*ns, "SfxDocumentMetaData: unknown namespace prefix"); return ::rtl::OUString::createFromAscii(ns); } @@ -1110,8 +1110,7 @@ void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes() static_cast<const char*>("office:target-frame-name"), m_DefaultTarget)); // xlink:show: _blank -> new, any other value -> replace - const sal_Char* show = m_DefaultTarget.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_blank")) - ? "new" : "replace"; + const sal_Char* show = m_DefaultTarget == "_blank" ? "new" : "replace"; attributes.push_back(std::make_pair( static_cast<const char*>("xlink:show"), ::rtl::OUString::createFromAscii(show))); @@ -1209,8 +1208,7 @@ void SAL_CALL SfxDocumentMetaData::init( while (xNode.is()) { if (css::xml::dom::NodeType_ELEMENT_NODE ==xNode->getNodeType()) { - if (xNode->getNamespaceURI().equalsAscii(s_nsODF) && - xNode->getLocalName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document-meta"))) + if ( xNode->getNamespaceURI().equalsAscii(s_nsODF) && xNode->getLocalName() == "document-meta" ) { xRElem.set(xNode, css::uno::UNO_QUERY_THROW); break; @@ -1362,7 +1360,7 @@ void SAL_CALL SfxDocumentMetaData::init( OUStringToOString(text, RTL_TEXTENCODING_UTF8).getStr()); continue; } - } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("string")) || true) { // default + } else if ( type == "string" || true) { // default any <<= text; } try { diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index ac66b5d96fd8..cdf6397e389d 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1156,10 +1156,7 @@ bool SfxURLRelocator_Impl::propertyCanContainOfficeDir( // with a predefined semantic). Additional Core properties introduced // be a client app must be handled by the client app itself, because // the UCB does not know the semantics of those properties. - return ( rPropName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TARGET_DIR_URL ) ) || - rPropName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PROPERTY_DIRLIST ) ) ); + return ( rPropName == TARGET_DIR_URL || rPropName == PROPERTY_DIRLIST ); } //----------------------------------------------------------------------------- @@ -2595,8 +2592,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, OUString aType; OUString aHierURL; - if ( aChildTitle.compareToAscii( "sfx.tlx" ) == 0 - || aChildTitle.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "groupuinames.xml" ) ) ) + if ( aChildTitle.compareToAscii( "sfx.tlx" ) == 0 || aChildTitle == "groupuinames.xml" ) continue; // only StarOffice templates are accepted diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 3276a0800430..b258ed83ea99 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2211,7 +2211,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) pNewValue[i] = pOldValue[i]; if ( pOldValue [i].Name == sInputStream ) bHasInputStream = sal_True; - else if ( pOldValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "DocumentBaseURL" ) ) ) + else if ( pOldValue[i].Name == "DocumentBaseURL" ) bHasBaseURL = sal_True; } @@ -2308,13 +2308,13 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) for ( i = 0; i < nEnd; i++ ) { pNewValue[i] = pOldValue[i]; - if ( pOldValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "FileName" ) ) ) + if ( pOldValue[i].Name == "FileName" ) pNewValue[i].Value <<= OUString ( rMedium.GetName() ); else if ( pOldValue[i].Name == sOutputStream ) bHasOutputStream = sal_True; else if ( pOldValue[i].Name == sStream ) bHasStream = sal_True; - else if ( pOldValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "DocumentBaseURL" ) ) ) + else if ( pOldValue[i].Name == "DocumentBaseURL" ) bHasBaseURL = sal_True; } @@ -3418,9 +3418,8 @@ sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< e default: { - OSL_ENSURE( - aSubElements[nInd].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Configurations2" ) ) || !xTarget->hasByName( aSubElements[nInd] ), - "The target storage is an output storage, the element should not exist in the target!\n" ); + OSL_ENSURE( aSubElements[nInd] == "Configurations2" || !xTarget->hasByName( aSubElements[nInd] ), + "The target storage is an output storage, the element should not exist in the target!\n" ); if ( !xTarget->hasByName( aSubElements[nInd] ) ) { diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 1e23fada1260..2a30dad35305 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -988,7 +988,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const ::rtl::OUString& throw(::com::sun::star::uno::RuntimeException) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); - if ( rURL.isEmpty() && rArgs.getLength() == 1 && rArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SetEmbedded")) ) + if ( rURL.isEmpty() && rArgs.getLength() == 1 && rArgs[0].Name == "SetEmbedded" ) { // allows to set a windowless document to EMBEDDED state // but _only_ before load() or initNew() methods @@ -2029,7 +2029,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor ) if ( m_pData->m_pObjectShell.Is() ) { - if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"")) ) + if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ) { if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) { diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 7added399fff..7a2441bfe1e8 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -147,9 +147,7 @@ namespace sfx2 { static bool isSpecialArgumentName( const ::rtl::OUString& _rValueName ) { - return _rValueName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedObject" ) ) - || _rValueName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedScriptSupport" ) ) - || _rValueName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentRecoverySupport" ) ); + return _rValueName == "EmbeddedObject" || _rValueName == "EmbeddedScriptSupport" || _rValueName == "DocumentRecoverySupport"; } bool operator()( const Any& _rArgument ) const diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 0c22e263a76c..ec198973c59a 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -200,7 +200,7 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a { SolarMutexGuard aGuard; - if ( m_pClient && aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnVisAreaChanged")) && m_nAspect != embed::Aspects::MSOLE_ICON ) + if ( m_pClient && aEvent.EventName == "OnVisAreaChanged" && m_nAspect != embed::Aspects::MSOLE_ICON ) { m_pClient->FormatChanged(); // for Writer when format of the object is changed with the area m_pClient->ViewChanged(); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index d939c7eb55fa..531f7d128c15 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2382,7 +2382,7 @@ sal_Bool impl_maxOpenDocCountReached() continue; // a) do not count the help window - if (xFrame->getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OFFICE_HELP_TASK"))) + if ( xFrame->getName() == "OFFICE_HELP_TASK" ) continue; // b) count all other frames diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 23641cbbe2fa..41937a3bca61 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -127,8 +127,7 @@ static String _getTabString() Sequence< NamedValue > sMaterial; if (xHolder->getMaterial() >>= sMaterial) { for (int i=0; i < sMaterial.getLength(); i++) { - if ((sMaterial[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("title"))) && - (sMaterial[i].Value >>= aTabString)) + if (( sMaterial[i].Name == "title" ) && ( sMaterial[i].Value >>= aTabString )) { result += ' '; result += String(aTabString); diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 7c59762cb01b..9b859c98b2d9 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -169,32 +169,11 @@ css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName) css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) + if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight" + || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName" + || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort" + || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy" + || PropertyName == "ooInetProxyType" ) { return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); } diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 8d1feb2802c6..3d9542b1f23f 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -422,7 +422,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati { rtl::OUString aCompleteName( rtl::OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); - if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) ) + if( aCompleteName != "Unknown" ) return sal_True; } break; @@ -431,7 +431,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati { rtl::OUString aCompleteName( rtl::OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); - if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) ) + if( aCompleteName != "Unknown" ) { if( aCompleteName.trim().indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")), 0) != -1 ) return sal_True; diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index ac5e93635fca..57a1a4e198a6 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -165,9 +165,7 @@ Service::Service(): enabled_(false) { rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= desktop; - enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")) && - ((orbit_major_version == 2 && orbit_minor_version >= 8) || - orbit_major_version > 2); + enabled_ = desktop == "GNOME" && ((orbit_major_version == 2 && orbit_minor_version >= 8) || orbit_major_version > 2); // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin } } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 2503e9bafe91..1c87c48a02ec 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -164,8 +164,7 @@ Service::Service(): enabled_(false) { rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= desktop; - enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE4")) && - KApplication::kApplication() != 0; + enabled_ = desktop == "KDE4" && KApplication::kApplication() != 0; } } @@ -186,32 +185,11 @@ css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) + if (PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight" + || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName" + || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort" + || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy" + || PropertyName == "ooInetProxyType" ) { return css::uno::makeAny( enabled_ diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 1a2fb2d49575..64321545111b 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -164,8 +164,7 @@ Service::Service(): enabled_(false) { rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= desktop; - enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE")) && - KApplication::kApplication() != 0; + enabled_ = desktop == "KDE" && KApplication::kApplication() != 0; } } @@ -186,32 +185,11 @@ css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) || - PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) + if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight" + || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName" + || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort" + || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy" + || PropertyName == "ooInetProxyType" ) { return css::uno::makeAny( enabled_ diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx index e19b9717d517..055628f936bf 100644 --- a/shell/source/backends/macbe/macbackend.cxx +++ b/shell/source/backends/macbe/macbackend.cxx @@ -227,8 +227,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) + if ( PropertyName == "WorkPathVariable" ) { rtl::OUString aDocDir; NSArray* pPaths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, true ); @@ -254,8 +253,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( OSL_TRACE( "Got nil or empty list of user document directories" ); } return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName"))) + } else if ( PropertyName == "ooInetFTPProxyName" ) { ProxyEntry aFtpProxy; @@ -278,8 +276,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( true, uno::makeAny( aFtpProxy.Server ) ) ); } return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort"))) + } else if ( PropertyName == "ooInetFTPProxyPort" ) { ProxyEntry aFtpProxy; @@ -302,8 +299,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( true, uno::makeAny( aFtpProxy.Port ) ) ); } return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName"))) + } else if ( PropertyName == "ooInetHTTPProxyName" ) { ProxyEntry aHttpProxy; @@ -326,8 +322,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( true, uno::makeAny( aHttpProxy.Server ) ) ); } return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort"))) + } else if ( PropertyName == "ooInetHTTPProxyPort" ) { ProxyEntry aHttpProxy; @@ -350,8 +345,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( true, uno::makeAny( aHttpProxy.Port ) ) ); } return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName"))) + } else if ( PropertyName == "ooInetHTTPSProxyName" ) { ProxyEntry aHttpsProxy; @@ -374,8 +368,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( true, uno::makeAny( aHttpsProxy.Server ) ) ); } return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort"))) + } else if ( PropertyName == "ooInetHTTPSProxyPort" ) { ProxyEntry aHttpsProxy; @@ -398,16 +391,14 @@ css::uno::Any MacOSXBackend::getPropertyValue( true, uno::makeAny( aHttpsProxy.Port ) ) ); } return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) + } else if ( PropertyName == "ooInetProxyType" ) { // override default for ProxyType, which is "0" meaning "No proxies". sal_Int32 nProperties = 1; return css::uno::makeAny( css::beans::Optional< css::uno::Any >( true, uno::makeAny( nProperties ) ) ); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) + } else if ( PropertyName == "ooInetNoProxy" ) { rtl::OUString aProxyBypassList; diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index fb14831dfdf0..7b0a9ed0b80a 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -317,36 +317,28 @@ css::uno::Any WinInetBackend::getPropertyValue( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName"))) + if ( PropertyName == "ooInetFTPProxyName" ) { return css::uno::makeAny(valueFtpProxyName_); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort"))) + } else if ( PropertyName == "ooInetFTPProxyPort" ) { return css::uno::makeAny(valueFtpProxyPort_); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName"))) + } else if ( PropertyName == "ooInetHTTPProxyName" ) { return css::uno::makeAny(valueHttpProxyName_); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort"))) + } else if ( PropertyName == "ooInetHTTPProxyPort" ) { return css::uno::makeAny(valueHttpProxyPort_); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName"))) + } else if ( PropertyName == "ooInetHTTPSProxyName" ) { return css::uno::makeAny(valueHttpsProxyName_); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort"))) + } else if ( PropertyName == "ooInetHTTPSProxyPort" ) { return css::uno::makeAny(valueHttpsProxyPort_); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) + } else if ( PropertyName == "ooInetNoProxy" ) { return css::uno::makeAny(valueNoProxy_); - } else if (PropertyName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) + } else if ( PropertyName == "ooInetProxyType" ) { return css::uno::makeAny(valueProxyType_); } else { diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index b01ca3009e0e..40cdef517b55 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -80,9 +80,7 @@ void AnimationCommandNode::activate_st() { double fMediaTime=0.0; beans::PropertyValue aMediaTime; - if( (mxCommandNode->getParameter() >>= aMediaTime) && - aMediaTime.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("MediaTime") )) + if( (mxCommandNode->getParameter() >>= aMediaTime) && aMediaTime.Name == "MediaTime" ) { aMediaTime.Value >>= fMediaTime; } diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 17ac98f6615f..a0ca97a979e0 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -204,7 +204,7 @@ namespace slideshow uno::Reference<beans::XPropertySet> xProp( xSource, uno::UNO_QUERY ); rtl::OUString sCLSID; getPropertyValue( sCLSID, xProp, OUSTR("CLSID")); - if( sCLSID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("12DCAE26-281F-416F-a234-c3086127382e")) && local_getMetafileForChart( xSource, xContainingPage, rMtf ) ) + if( sCLSID == "12DCAE26-281F-416F-a234-c3086127382e" && local_getMetafileForChart( xSource, xContainingPage, rMtf ) ) return true; return getMetaFile( xSource, xContainingPage, rMtf, mtfLoadFlags, rxContext ); } diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 2c45996f18a3..227f4c8cce50 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -283,18 +283,14 @@ ShapeSharedPtr ShapeImporter::createShape( uno::Reference<beans::XPropertySet> const& xPropSet, rtl::OUString const& shapeType ) const { - if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") ) || - shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape") ) ) + if( shapeType == "com.sun.star.drawing.MediaShape" || shapeType == "com.sun.star.presentation.MediaShape" ) { // Media shape (video etc.). This is a special object return createMediaShape(xCurrShape, mnAscendingPrio, mrContext); } - else if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PluginShape") )) + else if( shapeType == "com.sun.star.drawing.PluginShape" ) { // PropertyValues to copy from XShape to plugin static const char* aPropertyValues[] = @@ -314,8 +310,7 @@ ShapeSharedPtr ShapeImporter::createShape( SAL_N_ELEMENTS(aPropertyValues), mrContext ); } - else if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.AppletShape") )) + else if( shapeType == "com.sun.star.drawing.AppletShape" ) { // PropertyValues to copy from XShape to applet static const char* aPropertyValues[] = @@ -337,10 +332,7 @@ ShapeSharedPtr ShapeImporter::createShape( SAL_N_ELEMENTS(aPropertyValues), mrContext ); } - else if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ) || - shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape") ) ) + else if( shapeType == "com.sun.star.drawing.OLE2Shape" || shapeType == "com.sun.star.presentation.OLE2Shape" ) { // #i46224# Mark OLE shapes as foreign content - scan them for // unsupported actions, and fallback to bitmap, if necessary @@ -350,12 +342,7 @@ ShapeSharedPtr ShapeImporter::createShape( true, mrContext ); } - else if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.drawing.GraphicObjectShape") ) || - shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.presentation.GraphicObjectShape") ) ) + else if( shapeType == "com.sun.star.drawing.GraphicObjectShape" || shapeType == "com.sun.star.presentation.GraphicObjectShape" ) { GraphicObject aGraphicObject; @@ -491,12 +478,7 @@ bool ShapeImporter::isSkip( // they can be non empty when user edits the default texts if(mbConvertingMasterPage) { - if(shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation." - "TitleTextShape") ) || - shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation." - "OutlinerShape") )) + if( shapeType == "com.sun.star.presentation.TitleTextShape" || shapeType == "com.sun.star.presentation.OutlinerShape" ) { return true; } @@ -602,9 +584,7 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) // is this shape presentation-invisible? if( !isSkip(xPropSet, shapeType, xDrawnInSlideshow) ) { - bIsGroupShape = shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.drawing.GroupShape") ); + bIsGroupShape = shapeType == "com.sun.star.drawing.GroupShape"; if( rTop.mpGroupShape ) // in group particle mode? { diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index cd04953062da..ca91a6cd3424 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1045,8 +1045,7 @@ public: {} void operator()( beans::PropertyValue const& rProperty ) const { - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("Prefetch") )) + if (rProperty.Name == "Prefetch" ) { uno::Sequence<uno::Any> seq; if ((rProperty.Value >>= seq) && seq.getLength() == 2) @@ -1055,13 +1054,11 @@ public: seq[1] >>= mpSlideShowImpl->mxPrefetchAnimationNode; } } - else if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SkipAllMainSequenceEffects") )) + else if ( rProperty.Name == "SkipAllMainSequenceEffects" ) { rProperty.Value >>= mrbSkipAllMainSequenceEffects; } - else if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SkipSlideTransition") )) + else if ( rProperty.Name == "SkipSlideTransition" ) { rProperty.Value >>= mrbSkipSlideTransition; } @@ -1572,8 +1569,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("AutomaticAdvancement") )) + if ( rProperty.Name == "AutomaticAdvancement" ) { double nTimeout(0.0); mbAutomaticAdvancementMode = (rProperty.Value >>= nTimeout); @@ -1585,8 +1581,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("UserPaintColor") )) + if ( rProperty.Name == "UserPaintColor" ) { sal_Int32 nColor(0); if (rProperty.Value >>= nColor) @@ -1616,8 +1611,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) } //adding support for erasing features in UserPaintOverlay - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("EraseAllInk") )) + if ( rProperty.Name == "EraseAllInk" ) { bool nEraseAllInk(false); if (rProperty.Value >>= nEraseAllInk) @@ -1633,8 +1627,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SwitchPenMode") )) + if ( rProperty.Name == "SwitchPenMode" ) { bool nSwitchPenMode(false); if (rProperty.Value >>= nSwitchPenMode) @@ -1651,8 +1644,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("SwitchEraserMode") )) + if ( rProperty.Name == "SwitchEraserMode" ) { bool nSwitchEraserMode(false); if (rProperty.Value >>= nSwitchEraserMode) @@ -1669,8 +1661,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("EraseInk") )) + if ( rProperty.Name == "EraseInk" ) { sal_Int32 nEraseInk(100); if (rProperty.Value >>= nEraseInk) @@ -1687,8 +1678,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) } // new Property for pen's width - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("UserPaintStrokeWidth") )) + if ( rProperty.Name == "UserPaintStrokeWidth" ) { double nWidth(4.0); if (rProperty.Value >>= nWidth) @@ -1702,8 +1692,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("AdvanceOnClick") )) + if ( rProperty.Name == "AdvanceOnClick" ) { sal_Bool bAdvanceOnClick = sal_False; if (! (rProperty.Value >>= bAdvanceOnClick)) @@ -1712,8 +1701,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("DisableAnimationZOrder") )) + if ( rProperty.Name == "DisableAnimationZOrder" ) { sal_Bool bDisableAnimationZOrder = sal_False; if (! (rProperty.Value >>= bDisableAnimationZOrder)) @@ -1722,8 +1710,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ImageAnimationsAllowed") ) ) + if ( rProperty.Name == "ImageAnimationsAllowed" ) { if (! (rProperty.Value >>= mbImageAnimationsAllowed)) return false; @@ -1740,8 +1727,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("MouseVisible") )) + if ( rProperty.Name == "MouseVisible" ) { if (! (rProperty.Value >>= mbMouseVisible)) return false; @@ -1751,14 +1737,12 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ForceManualAdvance") )) + if ( rProperty.Name == "ForceManualAdvance" ) { return (rProperty.Value >>= mbForceManualAdvance); } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("RehearseTimings") )) + if ( rProperty.Name == "RehearseTimings" ) { bool bRehearseTimings = false; if (! (rProperty.Value >>= bRehearseTimings)) @@ -1788,8 +1772,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("WaitSymbolBitmap") )) + if ( rProperty.Name == "WaitSymbolBitmap" ) { uno::Reference<rendering::XBitmap> xBitmap; if (! (rProperty.Value >>= xBitmap)) diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 315822064a50..a9322fdbfa85 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -522,8 +522,7 @@ void DemoApp::Main() { ::rtl::OUString aParam = GetCommandLineParam( i ); - if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) || - aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) ) + if( aParam == "--help" || aParam == "-h" ) bHelp = true; } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 5de9a68a0b93..0254ef2f446d 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -2189,7 +2189,7 @@ sal_Bool UCBStorage_Impl::Insert( ::ucbhelper::Content *pContent ) if ( rProps.getLength() != 1 ) continue; - if ( !rProps[ 0 ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + if ( rProps[ 0 ].Name != "Title" ) continue; Sequence < ::rtl::OUString > aNames(1); diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 48fa447bdef7..fe987071202e 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2356,7 +2356,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( } else { - if( !aMethName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("queryInterface")) ) + if( aMethName != "queryInterface" ) { rMethodConcept_i |= MethodConcept::DANGEROUS; continue; @@ -2471,7 +2471,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( OUString aMethName2 = rxMethod_k->getName(); OUString aStartStr2 = aMethName2.copy( 0, 3 ); // ACHTUNG: Wegen SDL-Bug NICHT != bei OUString verwenden !!! - if( !( aStartStr2.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("set")) ) ) + if( aStartStr2 != "set" ) continue; // Ist es denn der gleiche Name? diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index d49a8e7e90ea..337bdb1023c9 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -352,9 +352,7 @@ static void handleInvokExc( uno_Any * pDest, uno_Any * pSource ) OUString const & name = *reinterpret_cast< OUString const * >( &pSource->pType->pTypeName ); - if (name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.reflection.InvocationTargetException") )) + if ( name == "com.sun.star.reflection.InvocationTargetException" ) { // unwrap invocation target exception uno_Any * target_exc = diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index c73d2fae4cd4..a1242463a8b8 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -643,9 +643,7 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & "bad call to initialize")), static_cast< cppu::OWeakObject * >(this)); css::beans::NamedValue val; - if (rArguments.getLength() == 1 && (rArguments[0] >>= val) - && val.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "UnoVirtualMachine"))) + if (rArguments.getLength() == 1 && (rArguments[0] >>= val) && val.Name == "UnoVirtualMachine" ) { OSL_ENSURE( sizeof (sal_Int64) >= sizeof (jvmaccess::UnoVirtualMachine *), @@ -1136,15 +1134,13 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( setINetSettingsInVM(value != 0); return; } - else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "ooInetHTTPProxyName"))) + else if ( aAccessor == "ooInetHTTPProxyName" ) { aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "http.proxyHost")); rEvent.Element >>= aPropertyValue; } - else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "ooInetHTTPProxyPort"))) + else if ( aAccessor == "ooInetHTTPProxyPort" ) { aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http.proxyPort")); @@ -1152,15 +1148,13 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( rEvent.Element >>= n; aPropertyValue = rtl::OUString::valueOf(n); } - else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "ooInetHTTPSProxyName"))) + else if ( aAccessor == "ooInetHTTPSProxyName" ) { aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "https.proxyHost")); rEvent.Element >>= aPropertyValue; } - else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "ooInetHTTPSProxyPort"))) + else if ( aAccessor == "ooInetHTTPSProxyPort" ) { aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("https.proxyPort")); @@ -1168,15 +1162,13 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( rEvent.Element >>= n; aPropertyValue = rtl::OUString::valueOf(n); } - else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "ooInetFTPProxyName"))) + else if ( aAccessor == "ooInetFTPProxyName" ) { aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ftp.proxyHost")); rEvent.Element >>= aPropertyValue; } - else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "ooInetFTPProxyPort"))) + else if ( aAccessor == "ooInetFTPProxyPort" ) { aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ftp.proxyPort")); @@ -1184,8 +1176,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( rEvent.Element >>= n; aPropertyValue = rtl::OUString::valueOf(n); } - else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( - "ooInetNoProxy"))) + else if ( aAccessor == "ooInetNoProxy" ) { aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "http.nonProxyHosts")); diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index ed2a254de75f..5b39d9ffe00a 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -349,8 +349,7 @@ ServiceTypeDescriptionImpl::getConstructors() throw (RuntimeException) { for (sal_uInt16 i = 0; i < ctorCount; ++i) { rtl::OUString name(reader.getMethodName(i)); if (reader.getMethodFlags(i) != RT_MODE_TWOWAY - || (!reader.getMethodReturnTypeName(i).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("void"))) + || (reader.getMethodReturnTypeName(i) != "void") || (name.isEmpty() && (ctorCount != 1 || reader.getMethodParameterCount(i) != 0 || reader.getMethodExceptionCount(i) != 0))) diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 00dc8edde9af..15e58ab8475f 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -364,8 +364,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction // avoid ref-counting OUString const & typeName = *reinterpret_cast< OUString const * >( &acc.pType->pTypeName ); - if (typeName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.security.XAccessControlContext") )) + if ( typeName == "com.sun.star.security.XAccessControlContext" ) { return Reference< security::XAccessControlContext >( *reinterpret_cast< security::XAccessControlContext ** const >( acc.pData ) ); diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 1a48ce1d921c..ce4e3ac58e0a 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -467,46 +467,46 @@ void FilePolicy::refresh() OUString token( reader.getToken() ); while (!token.isEmpty()) { - if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_grant))) + if ( token != s_grant ) reader.error( OUSTR("expected >grant< token!") ); OUString userId; token = reader.assureToken(); - if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_user))) // next token is user-id + if ( token == s_user ) // next token is user-id { userId = reader.assureQuotedToken(); token = reader.assureToken(); } - if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_openBrace))) + if ( token != s_openBrace ) reader.error( OUSTR("expected opening brace >{<!") ); token = reader.assureToken(); // permissions list - while (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_closingBrace))) + while ( token != s_closingBrace ) { - if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_permission))) + if ( token != s_permission ) reader.error( OUSTR("expected >permission< or closing brace >}<!") ); token = reader.assureToken(); // permission type Any perm; - if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_filePermission))) // FilePermission + if ( token == s_filePermission ) // FilePermission { OUString url( reader.assureQuotedToken() ); reader.assureToken( ',' ); OUString actions( reader.assureQuotedToken() ); perm <<= io::FilePermission( url, actions ); } - else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_socketPermission))) // SocketPermission + else if ( token == s_socketPermission ) // SocketPermission { OUString host( reader.assureQuotedToken() ); reader.assureToken( ',' ); OUString actions( reader.assureQuotedToken() ); perm <<= connection::SocketPermission( host, actions ); } - else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_runtimePermission))) // RuntimePermission + else if ( token == s_runtimePermission ) // RuntimePermission { OUString name( reader.assureQuotedToken() ); perm <<= security::RuntimePermission( name ); } - else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_allPermission))) // AllPermission + else if ( token == s_allPermission ) // AllPermission { perm <<= security::AllPermission(); } diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index d98cf3e33150..6f8c0887774f 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -775,14 +775,12 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina case TypeClass_STRING: { const OUString & aStr = *(const OUString *)rVal.getValue(); - if (aStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("0") ) || - aStr.equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) )) + if ( aStr == "0" || aStr.equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) )) { sal_Bool bFalse = sal_False; aRet.setValue( &bFalse, getCppuBooleanType() ); } - else if (aStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("1") ) || - aStr.equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) )) + else if ( aStr == "1" || aStr.equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) )) { sal_Bool bTrue = sal_True; aRet.setValue( &bTrue, getCppuBooleanType() ); diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index 505fceb9bd35..416929364989 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -242,10 +242,10 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->createObject(aAny); - TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]ModuleA.StructA")), "test_RegCoreReflection(): error 54"); + TEST_ENSHURE( aAny.getValueTypeName() == "[]ModuleA.StructA", "test_RegCoreReflection(): error 54" ); xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")))->createObject(aAny); - TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[][]ModuleA.StructA") ), "test_RegCoreReflection(): error 56"); + TEST_ENSHURE( aAny.getValueTypeName() == "[][]ModuleA.StructA", "test_RegCoreReflection(): error 56" ); // xClass = xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.XIntroTest") )); @@ -254,7 +254,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) // TEST_ENSHURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("string")), "test_RegCoreReflection(): error 60"); // xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->createObject(aAny); -// TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[]string") ), "test_RegCoreReflection(): error 61"); +// TEST_ENSHURE( aAny.getValueTypeName() == "[]string", "test_RegCoreReflection(): error 61" ); TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][][]unsigned long")))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62"); diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx index ba0897d629a9..490ac5b906c8 100644 --- a/stoc/test/testloader.cxx +++ b/stoc/test/testloader.cxx @@ -118,7 +118,7 @@ SAL_IMPLEMENT_MAIN() TEST_ENSHURE( xServInfo.is(), "testloader error4"); - TEST_ENSHURE( xServInfo->getImplementationName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.stoc.DLLComponentLoader") ), "testloader error5"); + TEST_ENSHURE( xServInfo->getImplementationName() == "com.sun.star.comp.stoc.DLLComponentLoader", "testloader error5"); TEST_ENSHURE( xServInfo->supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")) ), "testloader error6"); TEST_ENSHURE( xServInfo->getSupportedServiceNames().getLength() == 1, "testloader error7"); diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx index 40e8c60d97f4..e92fabecb130 100644 --- a/stoc/test/testproxyfac.cxx +++ b/stoc/test/testproxyfac.cxx @@ -227,8 +227,7 @@ static void test_proxyfac_( } catch (const lang::DisposedException & exc) { - if (! exc.Message.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("my test exception") )) + if ( exc.Message != "my test exception" ) throw; } } diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index 5eddcf6aa7e3..df0cc7dec556 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -206,7 +206,7 @@ void test_SimpleRegistry( TEST_ENSHURE( xServInfo.is(), "test_SimpleRegistry error2"); - TEST_ENSHURE( xServInfo->getImplementationName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.stoc.SimpleRegistry") ), "test_SimpleRegistry error3"); + TEST_ENSHURE( xServInfo->getImplementationName() == "com.sun.star.comp.stoc.SimpleRegistry", "test_SimpleRegistry error3"); TEST_ENSHURE( xServInfo->supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry"))), "test_SimpleRegistry error4"); TEST_ENSHURE( xServInfo->getSupportedServiceNames().getLength() == 1, "test_SimpleRegistry error5"); xServInfo.clear(); @@ -356,10 +356,7 @@ void test_SimpleRegistry( xRootKey = xReg->getRootKey(); xKey = xRootKey->openKey( OUString( RTL_CONSTASCII_USTRINGPARAM("LinkTest") ) ); - TEST_ENSHURE( - xKey.is() && xKey->isValid() && - xKey->getKeyName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("/ThirdKey/FirstSubKey/WithSubSubKey") ), - "test_SimpleRegistry error 1213" ); + TEST_ENSHURE( xKey.is() && xKey->isValid() && xKey->getKeyName() == "/ThirdKey/FirstSubKey/WithSubSubKey", "test_SimpleRegistry error 1213" ); xKey->closeKey(); TEST_ENSHURE( xRootKey->getKeyType( OUString( RTL_CONSTASCII_USTRINGPARAM("LinkTest") ) ) == diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 380cbf56e645..117c2db02d3c 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -154,8 +154,7 @@ css::uno::Any Content::execute( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException) { - if (!command.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("getCasePreservingURL"))) + if ( command.Name != "getCasePreservingURL" ) { throw css::uno::RuntimeException(); } diff --git a/svl/qa/unit/test_lngmisc.cxx b/svl/qa/unit/test_lngmisc.cxx index 86e871beb325..becce8988e4f 100644 --- a/svl/qa/unit/test_lngmisc.cxx +++ b/svl/qa/unit/test_lngmisc.cxx @@ -78,7 +78,7 @@ namespace // Note that '-' isn't a hyphen to RemoveHyphens. bModified = linguistic::RemoveHyphens(str2); CPPUNIT_ASSERT(!bModified); - CPPUNIT_ASSERT(str2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("a-b--c---"))); + CPPUNIT_ASSERT( str2 == "a-b--c---" ); bModified = linguistic::RemoveHyphens(str3); CPPUNIT_ASSERT(bModified); @@ -86,7 +86,7 @@ namespace bModified = linguistic::RemoveHyphens(str4); CPPUNIT_ASSERT(!bModified); - CPPUNIT_ASSERT(str4.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("asdf"))); + CPPUNIT_ASSERT( str4 == "asdf" ); } void LngMiscTest::testRemoveControlChars() @@ -109,15 +109,15 @@ namespace bModified = linguistic::RemoveControlChars(str2); CPPUNIT_ASSERT(!bModified); - CPPUNIT_ASSERT(str2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("asdf"))); + CPPUNIT_ASSERT( str2 == "asdf" ); bModified = linguistic::RemoveControlChars(str3); CPPUNIT_ASSERT(bModified); - CPPUNIT_ASSERT(str3.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("asdfasdf"))); + CPPUNIT_ASSERT( str3 == "asdfasdf" ); bModified = linguistic::RemoveControlChars(str4); CPPUNIT_ASSERT(bModified); - CPPUNIT_ASSERT(str4.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(" "))); + CPPUNIT_ASSERT( str4 == " " ); } void LngMiscTest::testReplaceControlChars() @@ -140,11 +140,11 @@ namespace bModified = linguistic::ReplaceControlChars(str2); CPPUNIT_ASSERT(!bModified); - CPPUNIT_ASSERT(str2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("asdf"))); + CPPUNIT_ASSERT( str2 == "asdf" ); bModified = linguistic::ReplaceControlChars(str3); CPPUNIT_ASSERT(bModified); - CPPUNIT_ASSERT(str3.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("asdf asdf"))); + CPPUNIT_ASSERT( str3 == "asdf asdf" ); bModified = linguistic::ReplaceControlChars(str4); CPPUNIT_ASSERT(bModified); diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 36093fa011e9..66d1aaa07fe5 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -1332,7 +1332,7 @@ void SAL_CALL FSStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, if ( !m_pImpl ) throw lang::DisposedException(); - if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) || aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OpenMode")) ) + if ( aPropertyName == "URL" || aPropertyName == "OpenMode" ) throw beans::PropertyVetoException(); // TODO else throw beans::UnknownPropertyException(); // TODO diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index aa7a2438dac8..5efeb3efd8fa 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3118,8 +3118,7 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( String& rOrgCalendar, doubl if ( rCal.getUniqueID() != rGregorian ) { sal_Int16 nVal = rCal.getValue( CalendarFieldIndex::ERA ); - if ( nVal == 0 && rCal.getLoadedCalendar().Eras[0].ID.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Dummy" ) ) ) + if ( nVal == 0 && rCal.getLoadedCalendar().Eras[0].ID == "Dummy" ) { if ( !rOrgCalendar.Len() ) { @@ -3172,7 +3171,7 @@ void SvNumberformat::ImpAppendEraG( String& OutString, const CalendarWrapper& rCal, sal_Int16 nNatNum ) { using namespace ::com::sun::star::i18n; - if ( rCal.getUniqueID().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gengou" ) ) ) + if ( rCal.getUniqueID() == "gengou" ) { sal_Unicode cEra; sal_Int16 nVal = rCal.getValue( CalendarFieldIndex::ERA ); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 3eaf165b0bf3..f612aabd2fe1 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -324,7 +324,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) if ( m_sLoadedScheme.isEmpty() ) m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")); - if ( !sScheme.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("default")) ) + if ( sScheme != "default" ) { ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("default")); if ( ExistsScheme(sDefault) ) diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 384dd5dd01c8..16360fec7848 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -2337,7 +2337,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList ) pEntry->maDisplayText = aDisplayText; // detect the image - if( !aValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SEPARATOR_STR)) ) + if( aValue != SEPARATOR_STR ) { INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL ); pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False ); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 1d05ea616f68..065615848939 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1156,9 +1156,7 @@ String SvtURLBox::GetURL() success = UCBContentHelper::GetTitle(aURL,&aTitle); - if( success && - !(aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/")) - || aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) ) + if( success && aTitle != "/" && aTitle != "." ) { aObj.SetName( aTitle ); if ( bSlash ) diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index dce88f41558a..fb86d9bdab32 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -1353,7 +1353,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, sal_Int32 i; for ( i = 0; i < pFilterData->getLength(); i++ ) { - if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PreviewSizeHint")) ) + if ( (*pFilterData)[ i ].Name == "PreviewSizeHint" ) { awt::Size aSize; if ( (*pFilterData)[ i ].Value >>= aSize ) @@ -1365,7 +1365,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, nImportFlags &=~GRFILTER_I_FLAGS_FOR_PREVIEW; } } - else if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AllowPartialStreamRead")) ) + else if ( (*pFilterData)[ i ].Name == "AllowPartialStreamRead" ) { (*pFilterData)[ i ].Value >>= bAllowPartialStreamRead; if ( bAllowPartialStreamRead ) @@ -1373,7 +1373,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, else nImportFlags &=~GRFILTER_I_FLAGS_ALLOW_PARTIAL_STREAMREAD; } - else if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CreateNativeLink")) ) + else if ( (*pFilterData)[ i ].Name == "CreateNativeLink" ) { (*pFilterData)[ i ].Value >>= bCreateNativeLink; } @@ -1928,7 +1928,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& sal_Int32 k, j, i = 0; for ( i = 0; i < pFilterData->getLength(); i++ ) { - if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AdditionalChunks")) ) + if ( (*pFilterData)[ i ].Name == "AdditionalChunks" ) { com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence; if ( (*pFilterData)[ i ].Value >>= aAdditionalChunkSequence ) diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 824fa10cad82..2ca04746395c 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -191,7 +191,7 @@ void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& { SolarMutexGuard aGuard; - if ( pObject && aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnVisAreaChanged")) && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON && !pObject->IsChart() ) + if ( pObject && aEvent.EventName == "OnVisAreaChanged" && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON && !pObject->IsChart() ) { pObject->UpdateReplacement(); } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 75e9138f6867..294ba3c33e25 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -460,8 +460,7 @@ void SvxRubyDialog::Update() const PropertyValue* pProps = rProps.getConstArray(); for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) { - if(nAdjust > -2 && - pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust))) + if(nAdjust > -2 && pProps[nProp].Name == cRubyAdjust ) { sal_Int16 nTmp = sal_Int16(); pProps[nProp].Value >>= nTmp; @@ -470,8 +469,7 @@ void SvxRubyDialog::Update() else if(nAdjust != nTmp) nAdjust = -2; } - if(nPosition > -2 && - pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove))) + if(nPosition > -2 && pProps[nProp].Name == cRubyIsAbove ) { sal_Bool bTmp = *(sal_Bool*)pProps[nProp].Value.getValue(); if(!nRuby) @@ -479,8 +477,7 @@ void SvxRubyDialog::Update() else if( (!nPosition && !bTmp) || (nPosition == 1 && bTmp) ) nPosition = -2; } - if(bCharStyleEqual && - pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyCharStyleName))) + if(bCharStyleEqual && pProps[nProp].Name == cRubyCharStyleName ) { pProps[nProp].Value >>= sTmp; if(!nRuby) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 3b1c131b4757..0a0fb37fe89f 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -730,10 +730,10 @@ void SvxSearchDialog::CalculateDelta_Impl() try { ::rtl::OUString aModuleIdentifier = xModuleManager->identify( xFrame ); - bCalcApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ); - bDrawApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ); - bImpressApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ); - bWriterApp = aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ); + bCalcApp = aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument"; + bDrawApp = aModuleIdentifier == "com.sun.star.drawing.DrawingDocument"; + bImpressApp = aModuleIdentifier == "com.sun.star.presentation.PresentationDocument"; + bWriterApp = aModuleIdentifier == "com.sun.star.text.TextDocument"; } catch ( uno::Exception& ) { diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 1f7b5bf3351a..22d3bf6999f1 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -455,7 +455,7 @@ namespace svxform // the script to execute PScript pScript; - if ( !_rEvent.ScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarBasic" ) ) ) + if ( _rEvent.ScriptType != "StarBasic" ) { pScript.reset( new NewStyleUNOScript( *xObjectShell, _rEvent.ScriptCode ) ); } diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 35e8c4c8b886..574628bfaa55 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1493,10 +1493,9 @@ namespace sdr { namespace contact { { SolarMutexGuard aSolarGuard; - DBG_ASSERT( _rSource.NewMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "design" ) ) || _rSource.NewMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "alive" ) ), - "ViewObjectContactOfUnoControl_Impl::modeChanged: unexpected mode!" ); + DBG_ASSERT( _rSource.NewMode == "design" || _rSource.NewMode == "alive", "ViewObjectContactOfUnoControl_Impl::modeChanged: unexpected mode!" ); - m_eControlDesignMode = _rSource.NewMode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "design" ) ) ? eDesign : eAlive; + m_eControlDesignMode = _rSource.NewMode == "design" ? eDesign : eAlive; impl_switchDesignModeListening_nothrow( impl_isControlDesignMode_nothrow() ); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index caca3f577d5c..62adfb72a9d0 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -184,7 +184,7 @@ static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape ) MSO_SPT eRetValue = mso_sptNil; rtl::OUString aEngine( ( (SdrCustomShapeEngineItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() ); - if ( aEngine.isEmpty() || aEngine.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.EnhancedCustomShapeEngine" ) ) ) + if ( aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" ) { rtl::OUString sShapeType; const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index f2f42820f09f..e768ca88cc9a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -234,7 +234,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj SolarMutexGuard aGuard; // the code currently makes sense only in case there is no other client - if ( mpObj && mpObj->GetAspect() != embed::Aspects::MSOLE_ICON && aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnVisAreaChanged")) + if ( mpObj && mpObj->GetAspect() != embed::Aspects::MSOLE_ICON && aEvent.EventName == "OnVisAreaChanged" && mpObj->GetObjRef().is() && mpObj->GetObjRef()->getClientSite() == uno::Reference< embed::XEmbeddedClient >( this ) ) { try diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index d8a5fdfbb488..f87e9765e8c0 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -597,7 +597,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), aAny ); } - const sal_Bool bCompressed = aMimeType.isEmpty() || ( aMimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image/tiff")) ) ; + const sal_Bool bCompressed = aMimeType.isEmpty() || aMimeType == "image/tiff"; aAny <<= bCompressed; xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny ); diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 8f7f122fb9c1..6396f7c30f32 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -63,10 +63,7 @@ OUString SwAccessiblePreview::getImplementationName( ) sal_Bool SwAccessiblePreview::supportsService( const OUString& rServiceName ) throw( RuntimeException ) { - return rServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( sServiceName) ) || - rServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( sAccessibleServiceName ) ); + return rServiceName == sServiceName || rServiceName == sAccessibleServiceName; } Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( ) diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 0d9211bdcd0e..66d43b98ae1b 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -744,7 +744,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const sw::mark::IFieldmark* pFieldmark = pMarksAccess->getFieldmarkFor( *GetPoint() ); if ( pFieldmark ) - bUnhandledMark = pFieldmark->GetFieldname( ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ODF_UNHANDLED ) ); + bUnhandledMark = pFieldmark->GetFieldname( ) == ODF_UNHANDLED; } if (!bRet) diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 5a4d71242de4..3932f3754b0f 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -807,13 +807,13 @@ void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const if ( pBM != NULL ) { - if ( pBM->GetFieldname( ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ODF_FORMCHECKBOX ) ) ) + if ( pBM->GetFieldname( ) == ODF_FORMCHECKBOX ) { // a checkbox... ICheckboxFieldmark* pCheckboxFm = dynamic_cast< ICheckboxFieldmark* >(pBM); bool checked = pCheckboxFm->IsChecked(); rInf.DrawCheckBox(*this, checked); } - else if ( pBM->GetFieldname( ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ODF_FORMDROPDOWN ) ) ) + else if ( pBM->GetFieldname( ) == ODF_FORMDROPDOWN ) { // a list... rtl::OUString aTxt; getCurrentListIndex( pBM, &aTxt ); @@ -838,13 +838,13 @@ sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf ) OSL_ENSURE( pBM != NULL, "Where is my form field bookmark???" ); if ( pBM != NULL ) { - if ( pBM->GetFieldname( ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ODF_FORMCHECKBOX ) ) ) + if ( pBM->GetFieldname( ) == ODF_FORMCHECKBOX ) { Width( rInf.GetTxtHeight( ) ); Height( rInf.GetTxtHeight( ) ); SetAscent( rInf.GetAscent( ) ); } - else if ( pBM->GetFieldname( ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ODF_FORMDROPDOWN ) ) ) + else if ( pBM->GetFieldname( ) == ODF_FORMDROPDOWN ) { ::rtl::OUString aTxt; getCurrentListIndex( pBM, &aTxt ); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 276a336127e8..75253bd9d7b7 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2381,8 +2381,7 @@ OUString SwXTextFieldMasters::getImplementationName(void) throw( uno::RuntimeExc sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { - return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.text.TextFieldMasters" )); + return rServiceName == "com.sun.star.text.TextFieldMasters"; } uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames(void) throw( uno::RuntimeException ) @@ -2600,8 +2599,7 @@ OUString SwXTextFieldTypes::getImplementationName(void) throw( uno::RuntimeExcep sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { - return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.text.TextFields" )); + return rServiceName == "com.sun.star.text.TextFields"; } uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames(void) throw( uno::RuntimeException ) @@ -2691,8 +2689,7 @@ OUString SwXFieldEnumeration::getImplementationName(void) throw( uno::RuntimeExc sal_Bool SwXFieldEnumeration::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { - return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.text.FieldEnumeration" )); + return rServiceName == "com.sun.star.text.FieldEnumeration"; } uno::Sequence< OUString > SwXFieldEnumeration::getSupportedServiceNames(void) throw( uno::RuntimeException ) diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index de9d4331f5f9..1382a034abc3 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -464,20 +464,13 @@ throw (uno::RuntimeException) SolarMutexGuard g; return C2U("com.sun.star.text.BaseIndex") == rServiceName - || ((TOX_INDEX == m_pImpl->m_eTOXType) && - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.DocumentIndex"))) - || ((TOX_CONTENT == m_pImpl->m_eTOXType) && - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.ContentIndex"))) - || ((TOX_USER == m_pImpl->m_eTOXType) && - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.UserDefinedIndex"))) - || ((TOX_ILLUSTRATIONS == m_pImpl->m_eTOXType) && - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.IllustrationsIndex"))) - || ((TOX_TABLES == m_pImpl->m_eTOXType) && - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TableIndex"))) - || ((TOX_OBJECTS == m_pImpl->m_eTOXType) && - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.ObjectIndex"))) - || ((TOX_AUTHORITIES == m_pImpl->m_eTOXType) && - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.Bibliography"))); + || ((TOX_INDEX == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.DocumentIndex") + || ((TOX_CONTENT == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.ContentIndex") + || ((TOX_USER == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.UserDefinedIndex") + || ((TOX_ILLUSTRATIONS == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.IllustrationsIndex") + || ((TOX_TABLES == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.TableIndex") + || ((TOX_OBJECTS == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.ObjectIndex") + || ((TOX_AUTHORITIES == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.Bibliography"); } uno::Sequence< OUString > SAL_CALL @@ -2790,8 +2783,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, SwFormToken aToken(TOKEN_END); for(sal_Int32 j = 0; j < nProperties; j++) { - if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("TokenType"))) + if ( pProperties[j].Name == "TokenType" ) { const OUString sTokenType = lcl_AnyToString(pProperties[j].Value); @@ -2805,8 +2797,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, } } } - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("CharacterStyleName"))) + else if ( pProperties[j].Name == "CharacterStyleName" ) { String sCharStyleName; SwStyleNameMapper::FillUIName( @@ -2818,15 +2809,13 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, aToken.nPoolId = SwStyleNameMapper::GetPoolIdFromUIName ( sCharStyleName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); } - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("TabStopRightAligned"))) + else if ( pProperties[j].Name == "TabStopRightAligned" ) { const sal_Bool bRight = lcl_AnyToBool(pProperties[j].Value); aToken.eTabAlign = bRight ? SVX_TAB_ADJUST_END : SVX_TAB_ADJUST_LEFT; } - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("TabStopPosition"))) + else if ( pProperties[j].Name == "TabStopPosition" ) { sal_Int32 nPosition = 0; if (!(pProperties[j].Value >>= nPosition)) @@ -2840,8 +2829,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, } aToken.nTabStopPosition = nPosition; } - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("TabStopFillCharacter"))) + else if ( pProperties[j].Name == "TabStopFillCharacter" ) { const OUString sFillChar = lcl_AnyToString(pProperties[j].Value); @@ -2852,14 +2840,12 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, aToken.cTabFillChar = sFillChar.isEmpty() ? ' ' : sFillChar[0]; } - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("Text"))) + else if ( pProperties[j].Name == "Text" ) { const OUString sText = lcl_AnyToString(pProperties[j].Value); aToken.sText = sText; } - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ChapterFormat"))) + else if ( pProperties[j].Name == "ChapterFormat" ) { sal_Int16 nFormat = lcl_AnyToInt16(pProperties[j].Value); switch(nFormat) @@ -2885,8 +2871,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, aToken.nChapterFormat = nFormat; } // #i53420# - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ChapterLevel"))) + else if ( pProperties[j].Name == "ChapterLevel" ) { const sal_Int16 nLevel = lcl_AnyToInt16(pProperties[j].Value); if( nLevel < 1 || nLevel > MAXLEVEL ) @@ -2895,8 +2880,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, } aToken.nOutlineLevel = nLevel; } - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("BibliographyDataField"))) + else if ( pProperties[j].Name == "BibliographyDataField" ) { sal_Int16 nType = 0; pProperties[j].Value >>= nType; @@ -2910,8 +2894,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, aToken.nAuthorityField = nType; } // #i21237# - else if (pProperties[j].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("WithTab"))) + else if ( pProperties[j].Name == "WithTab" ) { aToken.bWithTab = lcl_AnyToBool(pProperties[j].Value); } diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 3262b35f7a09..306117727d4f 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1311,7 +1311,7 @@ throw (uno::RuntimeException) { SolarMutexGuard g; - if (!rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextContent"))) + if ( rServiceName != "com.sun.star.text.TextContent" ) { throw uno::RuntimeException(); } diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index c4e9d6144633..69865551ca30 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -1283,7 +1283,7 @@ throw (uno::RuntimeException) { SolarMutexGuard g; - if (!rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextContent"))) + if ( rServiceName != "com.sun.star.text.TextContent" ) { throw uno::RuntimeException(); } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 74bc40dcf905..2de82b2d3af8 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1681,9 +1681,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( break; } } - if(bExcept && - (rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BulletRelSize")) || - rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BulletColor")) ) ) + if(bExcept && (rProp.Name == "BulletRelSize" || rProp.Name == "BulletColor" ) ) { bExcept = sal_False; } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 952616037a20..cf02450203a5 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -3615,13 +3615,10 @@ OUString SwXCellRange::getImplementationName(void) throw( uno::RuntimeException sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.text.CellRange" ) ) || - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.style.CharacterProperties" ) ) || - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.style.CharacterPropertiesAsian" ) ) || - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.style.CharacterPropertiesComplex") ) || - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.style.ParagraphProperties" ) ) || - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.style.ParagraphPropertiesAsian" ) ) || - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.style.ParagraphPropertiesComplex" ) ); + rServiceName == "com.sun.star.text.CellRange" || rServiceName == "com.sun.star.style.CharacterProperties" + || rServiceName == "com.sun.star.style.CharacterPropertiesAsian" || rServiceName == "com.sun.star.style.CharacterPropertiesComplex" + || rServiceName == "com.sun.star.style.ParagraphProperties" || rServiceName == "com.sun.star.style.ParagraphPropertiesAsian" + || rServiceName == "com.sun.star.style.ParagraphPropertiesComplex"; } uno::Sequence< OUString > SwXCellRange::getSupportedServiceNames(void) throw( uno::RuntimeException ) diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index cd7d061cfebe..08e6ce57d7bd 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1982,8 +1982,7 @@ lcl_ApplyRowProperties( for (sal_Int32 nProperty = 0; nProperty < rRowProperties.getLength(); ++nProperty) { - if (pProperties[ nProperty ].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("TableColumnSeparators"))) + if ( pProperties[ nProperty ].Name == "TableColumnSeparators" ) { // add the separators to access the cell's positions // for vertical merging later diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index d690dee87125..e50cbb5e8aa4 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -259,7 +259,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( SwFrmFmt *pFrmFmt = 0; SwOLENode *pOLENd = 0; - if( rHRef.copy( 0, nPos ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.ServiceName") ) ) + if( rHRef.copy( 0, nPos ) == "vnd.sun.star.ServiceName" ) { sal_Bool bInsert = sal_False; SvGlobalName aClassName; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index bc8b93b34af2..900ada03d97f 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1310,11 +1310,9 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray(); for( sal_Int32 nOption = 0; nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption) { - if( pPrintOptions[nOption].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CopyCount")) - ||( pPrintOptions[nOption].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName"))) - ||( pPrintOptions[nOption].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Collate" ))) - ||( pPrintOptions[nOption].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Pages"))) - ||( pPrintOptions[nOption].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Wait")))) + if( pPrintOptions[nOption].Name == "CopyCount" || pPrintOptions[nOption].Name == "FileName" + || pPrintOptions[nOption].Name == "Collate" || pPrintOptions[nOption].Name == "Pages" + || pPrintOptions[nOption].Name == "Wait" ) { aOptions.realloc( nOpts + 1 ); aOptions[ nOpts ].Name = pPrintOptions[nOption].Name; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 5aabb0843b5e..d56f9075f9f2 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -4221,13 +4221,13 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if ( aCntntAtPos.aFnd.pFldmark != NULL) { IFieldmark *fieldBM = const_cast< IFieldmark* > ( aCntntAtPos.aFnd.pFldmark ); - if (fieldBM->GetFieldname( ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ODF_FORMCHECKBOX ) ) ) + if ( fieldBM->GetFieldname( ) == ODF_FORMCHECKBOX ) { ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(fieldBM); pCheckboxFm->SetChecked(!pCheckboxFm->IsChecked()); pCheckboxFm->Invalidate(); rSh.InvalidateWindows( rView.GetVisArea() ); - } else if (fieldBM->GetFieldname().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ODF_FORMDROPDOWN ) ) ) { + } else if ( fieldBM->GetFieldname() == ODF_FORMDROPDOWN ) { rView.ExecFieldPopup( aDocPt, fieldBM ); fieldBM->Invalidate(); rSh.InvalidateWindows( rView.GetVisArea() ); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 2f9a6900ec57..1404d2d701f6 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1770,21 +1770,16 @@ OUString SwXTextDocument::getImplementationName(void) throw( RuntimeException ) sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - if ( - (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.document.OfficeDocument" ))) || - (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.text.GenericTextDocument"))) - ) - return sal_True; + if ( rServiceName == "com.sun.star.document.OfficeDocument" || rServiceName == "com.sun.star.text.GenericTextDocument" ) + return sal_True; sal_Bool bWebDoc = (0 != PTR_CAST(SwWebDocShell, pDocShell)); sal_Bool bGlobalDoc = (0 != PTR_CAST(SwGlobalDocShell, pDocShell)); sal_Bool bTextDoc = (!bWebDoc && !bGlobalDoc); - return ( - (bWebDoc && rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument" ))) || - (bGlobalDoc && rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument"))) || - (bTextDoc && rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument" ))) - ); + return ( (bWebDoc && rServiceName == "com.sun.star.text.WebDocument") + || (bGlobalDoc && rServiceName == "com.sun.star.text.GlobalDocument") + || (bTextDoc && rServiceName == "com.sun.star.text.TextDocument") ); } Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( RuntimeException ) diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 8660f18bb2fe..d96a47eb4d88 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -1042,8 +1042,7 @@ OUString SwXTextView::getImplementationName(void) throw( RuntimeException ) sal_Bool SwXTextView::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocumentView")) || - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.view.OfficeDocumentView")); + return rServiceName == "com.sun.star.text.TextDocumentView" || rServiceName == "com.sun.star.view.OfficeDocumentView"; } Sequence< OUString > SwXTextView::getSupportedServiceNames(void) throw( RuntimeException ) diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index c05627ff84a9..4e37ecbfb9db 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -77,7 +77,7 @@ public: for( sal_Int32 i = 0; i < nCount; i++ ) { uno::Reference< text::XDocumentIndex > xToc( xDocIndexes->getByIndex(i), uno::UNO_QUERY_THROW ); - if( xToc->getServiceName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.ContentIndex")) ) + if( xToc->getServiceName() == "com.sun.star.text.ContentIndex" ) { maToc.push_back( xToc ); } diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx index 49704a41ad8f..3f6346d33e2b 100644 --- a/test/source/sheet/xdatapilotdescriptor.cxx +++ b/test/source/sheet/xdatapilotdescriptor.cxx @@ -106,7 +106,7 @@ void XDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference< sheet::X CPPUNIT_ASSERT(xNamed.is()); rtl::OUString aName = xNamed->getName(); maFieldNames.push_back(aName); - CPPUNIT_ASSERT( !aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Data")) ); + CPPUNIT_ASSERT( aName != "Data" ); uno::Reference< beans::XPropertySet > xPropSet( xNamed, UNO_QUERY_THROW); CPPUNIT_ASSERT( xPropSet.is() ); diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 5e611da1e4ea..f6d63bbc606c 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -592,9 +592,7 @@ static sal_Bool performTest( bRet &= check(v0 == 33, "transportPolySequence, element 0"); rtl::OUString v1; tps3.member[1] >>= v1; - bRet &= check( - v1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ABC")), - "transportPolySequence, element 1"); + bRet &= check( v1 == "ABC", "transportPolySequence, element 1" ); bRet &= check( xLBT->getNullPolyLong().member == 0, "getNullPolyLong"); bRet &= check( @@ -1181,16 +1179,13 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) i = 1; } bool noCurrentContext = false; - if (i < rArgs.getLength() - && rArgs[i].equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("noCurrentContext"))) + if ( i < rArgs.getLength() && rArgs[i] == "noCurrentContext" ) { noCurrentContext = true; ++i; } bool stress = false; - if (i < rArgs.getLength() - && rArgs[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("stress"))) + if ( i < rArgs.getLength() && rArgs[i] == "stress" ) { stress = true; ++i; diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 48435782781e..8208aa5465b7 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -140,7 +140,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments) && (*static_cast< ::sal_Unicode const * >(arguments[10].getValue()) == 'X') && (arguments[11] >>= arg11) - && arg11.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg11 == "test" && (arguments[12] >>= arg12) && arg12 == ::cppu::UnoType< css::uno::Any >::get() && (arguments[13] >>= arg13) && arg13 @@ -177,7 +177,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments) arguments[24].getValue()))[0] == 'X') && (arguments[25] >>= arg25) && arg25.getLength() == 1 - && arg25[0].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg25[0] == "test" && (arguments[26] >>= arg26) && arg26.getLength() == 1 && arg26[0] == ::cppu::UnoType< css::uno::Any >::get() && (arguments[27] >>= arg27) && arg27.getLength() == 1 @@ -312,7 +312,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) && (arguments[5] >>= arg5) && arg5.member == SAL_MIN_INT32 && (arguments[6] >>= arg6) && arg6.member == SAL_MIN_INT64 && (arguments[7] >>= arg7) && arg7.member == 'X' - && (arguments[8] >>= arg8) && arg8.member.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && (arguments[8] >>= arg8) && arg8.member == "test" && (arguments[9] >>= arg9) && arg9.member == 0.123f && (arguments[10] >>= arg10) && arg10.member == 0.456 && (arguments[11] >>= arg11) @@ -321,8 +321,8 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) && (arguments[14] >>= arg14) && arg14.member.member1 == 'X' && arg14.member.member2 == arg1b && (arguments[15] >>= arg15) && arg15.member.member1.member1 == 'X' && arg15.member.member1.member2 == arg1b - && arg15.member.member2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) - && (arguments[16] >>= arg16) && arg16.member1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg15.member.member2 == "test" + && (arguments[16] >>= arg16) && arg16.member1 == "test" && arg16.member2.member1 == 'X' && arg16.member2.member2.member == arg1b && (arguments[17] >>= arg17) && arg17.member1.member1 == 'X' @@ -348,7 +348,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) && (static_cast< ttb::TestPolyStruct<css::uno::Sequence< ::sal_Unicode> > const *>(arguments[25].getValue())->member[0]) == 'X' && (arguments[26] >>= arg26) && arg26.member.getLength() == 1 - && arg26.member[0].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg26.member[0] == "test" && (arguments[27] >>= arg27) && arg27.member.getLength() == 1 && arg27.member[0] == 0.123f && (arguments[28] >>= arg28) && arg28.member.getLength() == 1 @@ -377,9 +377,9 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) && (arguments[37] >>= arg37) && arg37.getLength() == 1 && arg37[0].member.member1.member1 == 'X' && arg37[0].member.member1.member2 == arg1b - && arg37[0].member.member2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg37[0].member.member2 == "test" && (arguments[38] >>= arg38) && arg38.getLength() == 1 - && arg38[0].member1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg38[0].member1 == "test" && arg38[0].member2.member1 == 'X' && arg38[0].member2.member2.member == arg1b && (arguments[39] >>= arg39) && arg39.getLength() == 1 @@ -397,10 +397,10 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) && arg42[0].getLength() == 1 && arg42[0][0].member.member1.member1 == 'X' && arg42[0][0].member.member1.member2 == arg1b - && arg42[0][0].member.member2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg42[0][0].member.member2 == "test" && (arguments[43] >>= arg43) && arg43.getLength() == 1 && arg43[0].getLength() == 1 - && arg43[0][0].member1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test")) + && arg43[0][0].member1 == "test" && arg43[0][0].member2.member1 == 'X' && arg43[0][0].member2.member2.member == arg1b && (arguments[44] >>= arg44) && arg44.getLength() == 1 diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index a562cfaab6c5..0cbd686d1dd9 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -76,7 +76,7 @@ CurrentContext::~CurrentContext() {} css::uno::Any CurrentContext::getValueByName(::rtl::OUString const & Name) throw (css::uno::RuntimeException) { - return Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(KEY)) + return Name == KEY ? css::uno::makeAny(::rtl::OUString::createFromAscii(VALUE)) : css::uno::Any(); } @@ -120,7 +120,7 @@ bool testtools::bridgetest::CurrentContextChecker::performCheck( } ::rtl::OUString s; OSL_VERIFY(a >>= s); - return s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(VALUE)); + return s == VALUE; } else { return other->perform( this, setSteps >= 0 ? setSteps - 1 : -1, checkSteps - 1); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index bc4e4ad65119..5a70c10e95f1 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -266,11 +266,7 @@ namespace { bool isAlreadyPureenUS(const com::sun::star::lang::Locale &rLocale) { - return ( - rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("en")) && - rLocale.Country.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("US")) && - rLocale.Variant.isEmpty() - ); + return ( rLocale.Language == "en" && rLocale.Country == "US" && rLocale.Variant.isEmpty() ); } } diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index cbe7b2ba7669..9e339ee09b92 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -632,9 +632,7 @@ Any SAL_CALL UniversalContentBroker::execute( // ctor in ucbcmds.cxx when adding new commands! ////////////////////////////////////////////////////////////////////// - if ( ( aCommand.Handle == GETCOMMANDINFO_HANDLE ) || - aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( GETCOMMANDINFO_NAME ) ) ) + if ( ( aCommand.Handle == GETCOMMANDINFO_HANDLE ) || aCommand.Name == GETCOMMANDINFO_NAME ) { ////////////////////////////////////////////////////////////////// // getCommandInfo @@ -642,9 +640,7 @@ Any SAL_CALL UniversalContentBroker::execute( aRet <<= getCommandInfo(); } - else if ( ( aCommand.Handle == GLOBALTRANSFER_HANDLE ) || - aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(GLOBALTRANSFER_NAME ) ) ) + else if ( ( aCommand.Handle == GLOBALTRANSFER_HANDLE ) || aCommand.Name == GLOBALTRANSFER_NAME ) { ////////////////////////////////////////////////////////////////// // globalTransfer diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 86236f04d2a5..561e7f8dbf22 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -1974,9 +1974,7 @@ void SAL_CALL shell::insertDefaultProperties( const rtl::OUString& aUnqPath ) sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString& Unq ) { - if (Url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file:///")) || - Url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file://localhost/")) || - Url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file://127.0.0.1/"))) + if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" ) { Unq = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///")); return false; diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 1de00cd726ee..deba05ec9c1b 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -679,10 +679,7 @@ Reference<XContent > SAL_CALL FTPContent::createNewContent( const ContentInfo& Info ) throw (RuntimeException) { - if(Info.Type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/" - "vnd.sun.staroffice.ftp-file")) || - Info.Type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/" - "vnd.sun.staroffice.ftp-folder"))) + if( Info.Type =="application/vnd.sun.staroffice.ftp-file" || Info.Type == "application/vnd.sun.staroffice.ftp-folder" ) return new FTPContent(m_xSMgr, m_pFCP, m_xIdentifier,Info); diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 60f42e80d90b..17f50e52a845 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -215,9 +215,7 @@ void FTPURL::parse(const rtl::OUString& url) *p1 = 0; if(buffer[0]) { - if(strcmp(buffer,"..") == 0 && - m_aPathSegmentVec.size() && - ! m_aPathSegmentVec.back().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".."))) + if( strcmp(buffer,"..") == 0 && m_aPathSegmentVec.size() && m_aPathSegmentVec.back() != ".." ) m_aPathSegmentVec.pop_back(); else if(strcmp(buffer,".") == 0) ; // Ignore @@ -257,7 +255,7 @@ rtl::OUString FTPURL::ident(bool withslash,bool internal) const rtl::OUStringBuffer bff; bff.appendAscii("ftp://"); - if(!m_aUsername.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("anonymous"))) { + if( m_aUsername != "anonymous" ) { bff.append(m_aUsername); rtl::OUString aPassword,aAccount; @@ -276,7 +274,7 @@ rtl::OUString FTPURL::ident(bool withslash,bool internal) const } bff.append(m_aHost); - if(!m_aPort.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("21"))) + if( m_aPort != "21" ) bff.append(sal_Unicode(':')) .append(m_aPort) .append(sal_Unicode('/')); @@ -303,7 +301,7 @@ rtl::OUString FTPURL::parent(bool internal) const bff.appendAscii("ftp://"); - if(!m_aUsername.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("anonymous"))) { + if( m_aUsername != "anonymous" ) { bff.append(m_aUsername); rtl::OUString aPassword,aAccount; @@ -322,7 +320,7 @@ rtl::OUString FTPURL::parent(bool internal) const bff.append(m_aHost); - if(!m_aPort.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("21"))) + if( m_aPort != "21" ) bff.append(sal_Unicode(':')) .append(m_aPort) .append(sal_Unicode('/')); @@ -504,9 +502,7 @@ std::vector<FTPDirentry> FTPURL::list( osKind = FTP_VMS; } aDirEntry.m_aName = aDirEntry.m_aName.trim(); - if(osKind != int(FTP_UNKNOWN) && - !aDirEntry.m_aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("..")) && - !aDirEntry.m_aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) { + if( osKind != int(FTP_UNKNOWN) && aDirEntry.m_aName != ".." && aDirEntry.m_aName != "." ) { aDirEntry.m_aURL = viewurl + encodePathSegment(aDirEntry.m_aName); sal_Bool isDir = @@ -575,7 +571,7 @@ rtl::OUString FTPURL::net_title() const index1 = 1+aNetTitle.indexOf(sal_Unicode('"'),index1); sal_Int32 index2 = aNetTitle.indexOf(sal_Unicode('"'),index1); aNetTitle = aNetTitle.copy(index1,index2-index1); - if(!aNetTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))) { + if( aNetTitle != "/" ) { index1 = aNetTitle.lastIndexOf(sal_Unicode('/')); aNetTitle = aNetTitle.copy(1+index1); } @@ -621,15 +617,14 @@ FTPDirentry FTPURL::direntry() const FTPDirentry aDirentry; aDirentry.m_aName = nettitle; // init aDirentry - if(nettitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/")) || - nettitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".."))) + if( nettitle == "/" || nettitle == ".." ) aDirentry.m_nMode = INETCOREFTP_FILEMODE_ISDIR; else aDirentry.m_nMode = INETCOREFTP_FILEMODE_UNKNOWN; aDirentry.m_nSize = 0; - if(!nettitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))) { + if( nettitle != "/" ) { // try to open the parent directory FTPURL aURL(parent(),m_pFCP); @@ -781,8 +776,7 @@ rtl::OUString FTPURL::ren(const rtl::OUString& NewTitle) curl_slist_free_all(slist); if(err != CURLE_OK) throw curl_exception(err); - else if(m_aPathSegmentVec.size() && - !m_aPathSegmentVec.back().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".."))) + else if( m_aPathSegmentVec.size() && m_aPathSegmentVec.back() != ".." ) m_aPathSegmentVec.back() = encodePathSegment(NewTitle); return OldTitle; } diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index 72e228124dec..f514c4b6a51a 100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx @@ -172,9 +172,7 @@ int test_ftplist(void) { if(vec.size() != 3) ++number_of_errors; - if(!(vec[0].m_aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dir1")) && - vec[1].m_aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dir2")) && - vec[2].m_aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file1")))) + if(!(vec[0].m_aName == "dir1" && vec[1].m_aName == "dir2" && vec[2].m_aName == "file1" )) ++number_of_errors; TESTEVAL; @@ -234,8 +232,7 @@ int test_ftpproperties(void) { ftp::FTPDirentry ade(url.direntry()); - if(!(ade.m_aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file")) && - ade.isFile())) + if(!(ade.m_aName == "file" && ade.isFile())) ++number_of_errors; TESTEVAL; diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index 51db0a3bd70e..cb1bb50dea5e 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -308,7 +308,7 @@ uno::Any SAL_CALL Content::execute( } #endif -#define COMMAND_IS(cmd,name) ( (cmd).Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( name ) ) ) +#define COMMAND_IS(cmd,name) ( (cmd).Name == name ) if ( COMMAND_IS( aCommand, "getPropertyValues" ) ) { uno::Sequence< beans::Property > Properties; @@ -834,8 +834,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property value has wrong type!")), static_cast< cppu::OWeakObject * >( this ) ); - } else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) || - rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) { + } else if ( rValue.Name == "DateCreated" || rValue.Name == "DateModified" ) { // FIXME: should be able to set the timestamps aRet[ n ] <<= getReadOnlyException( this ); } else { diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 81ac70b94f3c..8cc6cb26ef16 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -114,10 +114,7 @@ HierarchyContent* HierarchyContent::create( if ( Info.Type.isEmpty() ) return 0; - if ( !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ) ) && - !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE ) ) ) + if ( Info.Type != HIERARCHY_FOLDER_CONTENT_TYPE && Info.Type != HIERARCHY_LINK_CONTENT_TYPE ) return 0; return new HierarchyContent( rxSMgr, pProvider, Identifier, Info ); @@ -146,10 +143,7 @@ HierarchyContent::HierarchyContent( const uno::Reference< ucb::XContentIdentifier >& Identifier, const ucb::ContentInfo& Info ) : ContentImplHelper( rxSMgr, pProvider, Identifier ), - m_aProps( Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ) ) - ? HierarchyEntryData::FOLDER - : HierarchyEntryData::LINK ), + m_aProps( Info.Type == HIERARCHY_FOLDER_CONTENT_TYPE ? HierarchyEntryData::FOLDER : HierarchyEntryData::LINK ), m_eState( TRANSIENT ), m_pProvider( pProvider ), m_bCheckedReadOnly( false ), @@ -373,8 +367,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { uno::Any aRet; - if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) ) + if ( aCommand.Name == "getPropertyValues" ) { ////////////////////////////////////////////////////////////////// // getPropertyValues @@ -395,8 +388,7 @@ uno::Any SAL_CALL HierarchyContent::execute( aRet <<= getPropertyValues( Properties ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) ) + else if ( aCommand.Name == "setPropertyValues" ) { ////////////////////////////////////////////////////////////////// // setPropertyValues @@ -429,8 +421,7 @@ uno::Any SAL_CALL HierarchyContent::execute( aRet <<= setPropertyValues( aProperties, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) ) + else if ( aCommand.Name == "getPropertySetInfo" ) { ////////////////////////////////////////////////////////////////// // getPropertySetInfo @@ -438,8 +429,7 @@ uno::Any SAL_CALL HierarchyContent::execute( aRet <<= getPropertySetInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) ) + else if ( aCommand.Name == "getCommandInfo" ) { ////////////////////////////////////////////////////////////////// // getCommandInfo @@ -447,8 +437,7 @@ uno::Any SAL_CALL HierarchyContent::execute( aRet <<= getCommandInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "open" ) ) && isFolder() ) + else if ( aCommand.Name == "open" && isFolder() ) { ////////////////////////////////////////////////////////////////// // open command for a folder content @@ -471,9 +460,7 @@ uno::Any SAL_CALL HierarchyContent::execute( = new DynamicResultSet( m_xSMgr, this, aOpenCommand ); aRet <<= xSet; } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "insert" ) ) && - ( m_eKind != ROOT ) && !isReadOnly() ) + else if ( aCommand.Name == "insert" && ( m_eKind != ROOT ) && !isReadOnly() ) { ////////////////////////////////////////////////////////////////// // insert @@ -498,9 +485,7 @@ uno::Any SAL_CALL HierarchyContent::execute( : ucb::NameClash::ERROR; insert( nNameClash, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "delete" ) ) && - ( m_eKind != ROOT ) && !isReadOnly() ) + else if ( aCommand.Name == "delete" && ( m_eKind != ROOT ) && !isReadOnly() ) { ////////////////////////////////////////////////////////////////// // delete @@ -536,9 +521,7 @@ uno::Any SAL_CALL HierarchyContent::execute( // Remove own and all children's Additional Core Properties. removeAdditionalPropertySet( sal_True ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "transfer" ) ) && - isFolder() && !isReadOnly() ) + else if ( aCommand.Name == "transfer" && isFolder() && !isReadOnly() ) { ////////////////////////////////////////////////////////////////// // transfer @@ -561,9 +544,7 @@ uno::Any SAL_CALL HierarchyContent::execute( transfer( aInfo, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "createNewContent" ) ) && - isFolder() && !isReadOnly() ) + else if ( aCommand.Name == "createNewContent" && isFolder() && !isReadOnly() ) { ////////////////////////////////////////////////////////////////// // createNewContent @@ -638,13 +619,9 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) if ( Info.Type.isEmpty() ) return uno::Reference< ucb::XContent >(); - sal_Bool bCreateFolder = - Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ) ); + sal_Bool bCreateFolder = Info.Type == HIERARCHY_FOLDER_CONTENT_TYPE; - if ( !bCreateFolder && - !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE ) ) ) + if ( !bCreateFolder && Info.Type != HIERARCHY_LINK_CONTENT_TYPE ) return uno::Reference< ucb::XContent >(); rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); @@ -794,10 +771,7 @@ bool HierarchyContent::isReadOnly() sal_Int32 nCount = aNames.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - if ( aNames[ n ].equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.ucb.HierarchyDataReadWriteAccess" - ) ) ) + if ( aNames[ n ] == "com.sun.star.ucb.HierarchyDataReadWriteAccess" ) { m_bIsReadOnly = false; break; @@ -985,34 +959,28 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( // Process Core properties. - if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + if ( rProp.Name == "ContentType" ) { xRow->appendString ( rProp, rData.getContentType() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( rProp.Name == "Title" ) { xRow->appendString ( rProp, rData.getTitle() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rProp.Name == "IsDocument" ) { xRow->appendBoolean( rProp, rData.getIsDocument() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rProp.Name == "IsFolder" ) { xRow->appendBoolean( rProp, rData.getIsFolder() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + else if ( rProp.Name == "CreatableContentsInfo" ) { xRow->appendObject( rProp, uno::makeAny( rData.getCreatableContentsInfo() ) ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "TargetURL" ) ) ) + else if ( rProp.Name == "TargetURL" ) { // TargetURL is only supported by links. @@ -1162,8 +1130,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( { const beans::PropertyValue& rValue = pValues[ n ]; - if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + if ( rValue.Name == "ContentType" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1171,8 +1138,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1180,8 +1146,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1189,8 +1154,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1198,8 +1162,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( rValue.Name == "Title" ) { if ( isReadOnly() ) { @@ -1255,8 +1218,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( } } } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "TargetURL" ) ) ) + else if ( rValue.Name == "TargetURL" ) { if ( isReadOnly() ) { @@ -1830,8 +1792,7 @@ void HierarchyContent::transfer( rValue.Name = rProp.Name; rValue.Handle = rProp.Handle; - if ( !bHadTitle && rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + if ( !bHadTitle && rProp.Name == "Title" ) { // Set new title instead of original. bHadTitle = sal_True; diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index b1a0354c6ea4..334e551ab205 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -392,11 +392,8 @@ HierarchyDataSource::createInstanceWithArguments( osl::Guard< osl::Mutex > aGuard( m_aMutex ); // Check service specifier. - bool bReadOnly = !!ServiceSpecifier.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( READ_SERVICE_NAME ) ); - bool bReadWrite = !bReadOnly && - ServiceSpecifier.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( READWRITE_SERVICE_NAME ) ); + bool bReadOnly = ServiceSpecifier == READ_SERVICE_NAME; + bool bReadWrite = !bReadOnly && ServiceSpecifier == READWRITE_SERVICE_NAME; if ( !bReadOnly && !bReadWrite ) { @@ -419,8 +416,7 @@ HierarchyDataSource::createInstanceWithArguments( beans::PropertyValue aProp; if ( Arguments[ n ] >>= aProp ) { - if ( aProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( CFGPROPERTY_NODEPATH ) ) ) + if ( aProp.Name == CFGPROPERTY_NODEPATH ) { rtl::OUString aPath; if ( aProp.Value >>= aPath ) @@ -452,9 +448,7 @@ HierarchyDataSource::createInstanceWithArguments( return uno::Reference< uno::XInterface >(); } } - else if ( aProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - CFGPROPERTY_LAZYWRITE ) ) ) + else if ( aProp.Name == CFGPROPERTY_LAZYWRITE ) { if ( aProp.Value.getValueType() == getCppuBooleanType() ) { diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index 83b74babf48b..c6b1785a9057 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -72,8 +72,7 @@ void HierarchyUri::init() const // Scheme is case insensitive. rtl::OUString aScheme = m_aUri.copy( 0, HIERARCHY_URL_SCHEME_LENGTH ).toAsciiLowerCase(); - if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HIERARCHY_URL_SCHEME ) ) ) + if ( aScheme == HIERARCHY_URL_SCHEME ) { m_aUri = m_aUri.replaceAt( 0, aScheme.getLength(), aScheme ); diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx index 8ac01f85e818..6f1042d47278 100644 --- a/ucb/source/ucp/odma/odma_content.cxx +++ b/ucb/source/ucp/odma/odma_content.cxx @@ -221,8 +221,7 @@ uno::Any SAL_CALL Content::execute( { uno::Any aRet; - if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) ) + if ( aCommand.Name == "getPropertyValues" ) { ////////////////////////////////////////////////////////////////// // getPropertyValues @@ -243,8 +242,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= getPropertyValues( Properties, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) ) + else if ( aCommand.Name == "setPropertyValues" ) { ////////////////////////////////////////////////////////////////// // setPropertyValues @@ -277,8 +275,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= setPropertyValues( aProperties, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) ) + else if ( aCommand.Name == "getPropertySetInfo" ) { ////////////////////////////////////////////////////////////////// // getPropertySetInfo @@ -287,8 +284,7 @@ uno::Any SAL_CALL Content::execute( // Note: Implemented by base class. aRet <<= getPropertySetInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) ) + else if ( aCommand.Name == "getCommandInfo" ) { ////////////////////////////////////////////////////////////////// // getCommandInfo @@ -297,8 +293,7 @@ uno::Any SAL_CALL Content::execute( // Note: Implemented by base class. aRet <<= getCommandInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "open" ) ) ) + else if ( aCommand.Name == "open" ) { ucb::OpenCommandArgument2 aOpenCommand; if ( !( aCommand.Argument >>= aOpenCommand ) ) @@ -440,8 +435,7 @@ uno::Any SAL_CALL Content::execute( -1 ) ), Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "insert" ) ) ) + else if ( aCommand.Name == "insert" ) { ////////////////////////////////////////////////////////////////// // insert @@ -522,8 +516,7 @@ uno::Any SAL_CALL Content::execute( // imported. getContentProvider()->saveDocument(aProp->m_sDocumentId); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getCasePreservingURL" ) ) ) + else if ( aCommand.Name == "getCasePreservingURL" ) { rtl::OUString CasePreservingURL = openDoc(); aRet <<= CasePreservingURL; @@ -605,53 +598,43 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Process Core properties. - if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + if ( rProp.Name == "ContentType" ) { xRow->appendString ( rProp, rData->m_sContentType ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( rProp.Name == "Title" ) { xRow->appendString ( rProp, rData->m_sTitle ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rProp.Name == "IsDocument" ) { xRow->appendBoolean( rProp, rData->m_bIsDocument ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rProp.Name == "IsFolder" ) { xRow->appendBoolean( rProp, rData->m_bIsFolder ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ) + else if ( rProp.Name == "DateCreated" ) { xRow->appendTimestamp( rProp, rData->m_aDateCreated ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) + else if ( rProp.Name == "DateModified" ) { xRow->appendTimestamp( rProp, rData->m_aDateModified ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) ) + else if ( rProp.Name == "IsReadOnly" ) { xRow->appendBoolean( rProp, rData->m_bIsReadOnly ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Author" ) ) ) + else if ( rProp.Name == "Author" ) { xRow->appendString ( rProp, rData->m_sAuthor ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Subject" ) ) ) + else if ( rProp.Name == "Subject" ) { xRow->appendString ( rProp, rData->m_sSubject ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Keywords" ) ) ) + else if ( rProp.Name == "Keywords" ) { xRow->appendString ( rProp, rData->m_sKeywords ); } diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 1d323c062e0d..6bd5b0f0b064 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -99,17 +99,10 @@ ContentProperties::ContentProperties( const rtl::OUString& rContentType ) bEncrypted( sal_False ), bHasEncryptedEntries( sal_False ) { - bIsFolder = rContentType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PACKAGE_FOLDER_CONTENT_TYPE ) ) - || rContentType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PACKAGE_ZIP_FOLDER_CONTENT_TYPE ) ); + bIsFolder = rContentType == PACKAGE_FOLDER_CONTENT_TYPE || rContentType == PACKAGE_ZIP_FOLDER_CONTENT_TYPE; bIsDocument = !bIsFolder; - OSL_ENSURE( bIsFolder || - rContentType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PACKAGE_STREAM_CONTENT_TYPE ) ) - || rContentType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PACKAGE_ZIP_STREAM_CONTENT_TYPE ) ), + OSL_ENSURE( bIsFolder || rContentType == PACKAGE_STREAM_CONTENT_TYPE || rContentType == PACKAGE_ZIP_STREAM_CONTENT_TYPE, "ContentProperties::ContentProperties - Unknown type!" ); } @@ -474,8 +467,7 @@ uno::Any SAL_CALL Content::execute( { uno::Any aRet; - if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) ) + if ( aCommand.Name == "getPropertyValues" ) { ////////////////////////////////////////////////////////////////// // getPropertyValues @@ -496,8 +488,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= getPropertyValues( Properties ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) ) + else if ( aCommand.Name == "setPropertyValues" ) { ////////////////////////////////////////////////////////////////// // setPropertyValues @@ -530,8 +521,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= setPropertyValues( aProperties, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) ) + else if ( aCommand.Name == "getPropertySetInfo" ) { ////////////////////////////////////////////////////////////////// // getPropertySetInfo @@ -540,8 +530,7 @@ uno::Any SAL_CALL Content::execute( // Note: Implemented by base class. aRet <<= getPropertySetInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) ) + else if ( aCommand.Name == "getCommandInfo" ) { ////////////////////////////////////////////////////////////////// // getCommandInfo @@ -550,8 +539,7 @@ uno::Any SAL_CALL Content::execute( // Note: Implemented by base class. aRet <<= getCommandInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "open" ) ) ) + else if ( aCommand.Name == "open" ) { ////////////////////////////////////////////////////////////////// // open @@ -572,9 +560,7 @@ uno::Any SAL_CALL Content::execute( aRet = open( aOpenCommand, Environment ); } - else if ( !m_aUri.isRootFolder() - && aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "insert" ) ) ) + else if ( !m_aUri.isRootFolder() && aCommand.Name == "insert" ) { ////////////////////////////////////////////////////////////////// // insert @@ -598,9 +584,7 @@ uno::Any SAL_CALL Content::execute( : ucb::NameClash::ERROR; insert( aArg.Data, nNameClash, Environment ); } - else if ( !m_aUri.isRootFolder() - && aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "delete" ) ) ) + else if ( !m_aUri.isRootFolder() && aCommand.Name == "delete" ) { ////////////////////////////////////////////////////////////////// // delete @@ -635,8 +619,7 @@ uno::Any SAL_CALL Content::execute( // Remove own and all children's Additional Core Properties. removeAdditionalPropertySet( sal_True ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "transfer" ) ) ) + else if ( aCommand.Name == "transfer" ) { ////////////////////////////////////////////////////////////////// // transfer @@ -658,9 +641,7 @@ uno::Any SAL_CALL Content::execute( transfer( aInfo, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "createNewContent" ) ) && - isFolder() ) + else if ( aCommand.Name == "createNewContent" && isFolder() ) { ////////////////////////////////////////////////////////////////// // createNewContent @@ -683,8 +664,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= createNewContent( aInfo ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "flush" ) ) ) + else if ( aCommand.Name == "flush" ) { ////////////////////////////////////////////////////////////////// // flush @@ -869,41 +849,34 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Process Core properties. - if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + if ( rProp.Name == "ContentType" ) { xRow->appendString ( rProp, rData.aContentType ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( rProp.Name == "Title" ) { xRow->appendString ( rProp, rData.aTitle ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rProp.Name == "IsDocument" ) { xRow->appendBoolean( rProp, rData.bIsDocument ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rProp.Name == "IsFolder" ) { xRow->appendBoolean( rProp, rData.bIsFolder ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + else if ( rProp.Name == "CreatableContentsInfo" ) { xRow->appendObject( rProp, uno::makeAny( rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + else if ( rProp.Name == "MediaType" ) { xRow->appendString ( rProp, rData.aMediaType ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) + else if ( rProp.Name == "Size" ) { // Property only available for streams. if ( rData.bIsDocument ) @@ -911,8 +884,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( else xRow->appendVoid( rProp ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Compressed" ) ) ) + else if ( rProp.Name == "Compressed" ) { // Property only available for streams. if ( rData.bIsDocument ) @@ -920,8 +892,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( else xRow->appendVoid( rProp ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) + else if ( rProp.Name == "Encrypted" ) { // Property only available for streams. if ( rData.bIsDocument ) @@ -929,8 +900,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( else xRow->appendVoid( rProp ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "HasEncryptedEntries" ) ) ) + else if ( rProp.Name == "HasEncryptedEntries" ) { // Property only available for root folder. PackageUri aURI( rContentId ); @@ -1125,8 +1095,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { const beans::PropertyValue& rValue = pValues[ n ]; - if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + if ( rValue.Name == "ContentType" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1134,8 +1103,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1143,8 +1111,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1152,8 +1119,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1161,8 +1127,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( rValue.Name == "Title" ) { if ( m_aUri.isRootFolder() ) { @@ -1214,8 +1179,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } } } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + else if ( rValue.Name == "MediaType" ) { rtl::OUString aNewValue; if ( rValue.Value >>= aNewValue ) @@ -1240,8 +1204,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( static_cast< cppu::OWeakObject * >( this ) ); } } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) + else if ( rValue.Name == "Size" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1249,8 +1212,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Compressed" ) ) ) + else if ( rValue.Name == "Compressed" ) { // Property only available for streams. if ( m_aProps.bIsDocument ) @@ -1286,8 +1248,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( static_cast< cppu::OWeakObject * >( this ) ); } } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) + else if ( rValue.Name == "Encrypted" ) { // Property only available for streams. if ( m_aProps.bIsDocument ) @@ -1323,8 +1284,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( static_cast< cppu::OWeakObject * >( this ) ); } } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "HasEncryptedEntries" ) ) ) + else if ( rValue.Name == "HasEncryptedEntries" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1332,8 +1292,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "EncryptionKey" ) ) ) + else if ( rValue.Name == "EncryptionKey" ) { // @@@ This is a temporary solution. In the future submitting // the key should be done using an interaction handler! @@ -2034,8 +1993,7 @@ void Content::transfer( rValue.Name = rProp.Name; rValue.Handle = rProp.Handle; - if ( !bHadTitle && rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + if ( !bHadTitle && rProp.Name == "Title" ) { // Set new title instead of original. bHadTitle = sal_True; diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index 3f69681ee5ff..582bde364b08 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -119,13 +119,9 @@ void PackageUri::init() const m_aScheme = aPureUri.copy( 0, PACKAGE_URL_SCHEME_LENGTH ).toAsciiLowerCase(); - if ( m_aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PACKAGE_URL_SCHEME ) ) - || m_aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PACKAGE_ZIP_URL_SCHEME ) ) ) + if ( m_aScheme == PACKAGE_URL_SCHEME || m_aScheme == PACKAGE_ZIP_URL_SCHEME ) { - if ( m_aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( PACKAGE_ZIP_URL_SCHEME ) ) ) + if ( m_aScheme == PACKAGE_ZIP_URL_SCHEME ) { m_aParam += ( !m_aParam.isEmpty() diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index a8634a6d1f87..6f9d6c422380 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -81,17 +81,13 @@ using namespace tdoc_ucp; //========================================================================= static ContentType lcl_getContentType( const rtl::OUString & rType ) { - if ( rType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_ROOT_CONTENT_TYPE ) ) ) + if ( rType == TDOC_ROOT_CONTENT_TYPE ) return ROOT; - else if ( rType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_DOCUMENT_CONTENT_TYPE ) ) ) + else if ( rType == TDOC_DOCUMENT_CONTENT_TYPE ) return DOCUMENT; - else if ( rType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ) ) ) + else if ( rType == TDOC_FOLDER_CONTENT_TYPE ) return FOLDER; - else if ( rType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_STREAM_CONTENT_TYPE ) ) ) + else if ( rType == TDOC_STREAM_CONTENT_TYPE ) return STREAM; else { @@ -135,10 +131,7 @@ Content* Content::create( if ( Info.Type.isEmpty() ) return 0; - if ( !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ) ) && - !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_STREAM_CONTENT_TYPE ) ) ) + if ( Info.Type != TDOC_FOLDER_CONTENT_TYPE && Info.Type != TDOC_STREAM_CONTENT_TYPE ) { OSL_FAIL( "Content::create - unsupported content type!" ); return 0; @@ -395,8 +388,7 @@ uno::Any SAL_CALL Content::execute( { uno::Any aRet; - if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) ) + if ( aCommand.Name == "getPropertyValues" ) { ////////////////////////////////////////////////////////////////// // getPropertyValues @@ -417,8 +409,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= getPropertyValues( Properties ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) ) + else if ( aCommand.Name == "setPropertyValues" ) { ////////////////////////////////////////////////////////////////// // setPropertyValues @@ -451,8 +442,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= setPropertyValues( aProperties, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) ) + else if ( aCommand.Name == "getPropertySetInfo" ) { ////////////////////////////////////////////////////////////////// // getPropertySetInfo @@ -460,8 +450,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= getPropertySetInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) ) + else if ( aCommand.Name == "getCommandInfo" ) { ////////////////////////////////////////////////////////////////// // getCommandInfo @@ -469,8 +458,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= getCommandInfo( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "open" ) ) ) + else if ( aCommand.Name == "open" ) { ////////////////////////////////////////////////////////////////// // open @@ -491,8 +479,7 @@ uno::Any SAL_CALL Content::execute( aRet = open( aOpenCommand, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "insert" ) ) ) + else if ( aCommand.Name == "insert" ) { ////////////////////////////////////////////////////////////////// // insert ( Supported by folders and streams only ) @@ -551,8 +538,7 @@ uno::Any SAL_CALL Content::execute( : ucb::NameClash::ERROR; insert( aArg.Data, nNameClash, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "delete" ) ) ) + else if ( aCommand.Name == "delete" ) { ////////////////////////////////////////////////////////////////// // delete ( Supported by folders and streams only ) @@ -606,8 +592,7 @@ uno::Any SAL_CALL Content::execute( // Remove own and all children's Additional Core Properties. removeAdditionalPropertySet( sal_True ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "transfer" ) ) ) + else if ( aCommand.Name == "transfer" ) { ////////////////////////////////////////////////////////////////// // transfer ( Supported by document and folders only ) @@ -648,8 +633,7 @@ uno::Any SAL_CALL Content::execute( transfer( aInfo, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "createNewContent" ) ) ) + else if ( aCommand.Name == "createNewContent" ) { ////////////////////////////////////////////////////////////////// // createNewContent ( Supported by document and folders only ) @@ -742,9 +726,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) if ( Info.Type.isEmpty() ) return uno::Reference< ucb::XContent >(); - sal_Bool bCreateFolder = - Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ) ); + sal_Bool bCreateFolder = Info.Type == TDOC_FOLDER_CONTENT_TYPE; #ifdef NO_STREAM_CREATION_WITHIN_DOCUMENT_ROOT // streams cannot be created as direct children of document root @@ -755,9 +737,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) return uno::Reference< ucb::XContent >(); } #endif - if ( !bCreateFolder && - !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_STREAM_CONTENT_TYPE ) ) ) + if ( !bCreateFolder && Info.Type != TDOC_STREAM_CONTENT_TYPE ) { OSL_FAIL( "Content::createNewContent - unsupported type!" ); return uno::Reference< ucb::XContent >(); @@ -1008,34 +988,28 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Process Core properties. - if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + if ( rProp.Name == "ContentType" ) { xRow->appendString ( rProp, rData.getContentType() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( rProp.Name == "Title" ) { xRow->appendString ( rProp, rData.getTitle() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rProp.Name == "IsDocument" ) { xRow->appendBoolean( rProp, rData.getIsDocument() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rProp.Name == "IsFolder" ) { xRow->appendBoolean( rProp, rData.getIsFolder() ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + else if ( rProp.Name == "CreatableContentsInfo" ) { xRow->appendObject( rProp, uno::makeAny( rData.getCreatableContentsInfo() ) ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Storage" ) ) ) + else if ( rProp.Name == "Storage" ) { // Storage is only supported by folders. ContentType eType = rData.getType(); @@ -1047,8 +1021,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( else xRow->appendVoid( rProp ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DocumentModel" ) ) ) + else if ( rProp.Name == "DocumentModel" ) { // DocumentModel is only supported by documents. ContentType eType = rData.getType(); @@ -1221,8 +1194,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { const beans::PropertyValue& rValue = pValues[ n ]; - if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + if ( rValue.Name == "ContentType" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1230,8 +1202,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1239,8 +1210,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1248,8 +1218,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1257,8 +1226,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( rValue.Name == "Title" ) { // Title is read-only for root and documents. ContentType eType = m_aProps.getType(); @@ -1311,8 +1279,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } } } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Storage" ) ) ) + else if ( rValue.Name == "Storage" ) { ContentType eType = m_aProps.getType(); if ( eType == FOLDER ) @@ -1331,8 +1298,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( static_cast< cppu::OWeakObject * >( this ) ); } } - else if ( rValue.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DocumentModel" ) ) ) + else if ( rValue.Name == "DocumentModel" ) { ContentType eType = m_aProps.getType(); if ( eType == DOCUMENT ) @@ -2037,8 +2003,7 @@ void Content::transfer( rtl::OUString aScheme = rInfo.SourceURL.copy( 0, TDOC_URL_SCHEME_LENGTH + 2 ) .toAsciiLowerCase(); - if ( !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_URL_SCHEME ":/" ) ) ) + if ( aScheme != TDOC_URL_SCHEME ":/" ) { // Invalid scheme. ucbhelper::cancelCommandExecution( diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index e9f064e26519..6bd7063b178c 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -200,10 +200,8 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( Events documentation: OOo Developer's Guide / Writing UNO Components / Jobs */ - if ( Event.EventName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "OnLoadFinished" ) ) // document loaded - || Event.EventName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "OnCreate" ) ) ) // document created + if ( Event.EventName == "OnLoadFinished" // document loaded + || Event.EventName == "OnCreate" ) // document created { if ( isOfficeDocument( Event.Source ) ) { @@ -259,8 +257,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( } } } - else if ( Event.EventName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "OfficeDocumentsListener::notifyClosing" ) ) ) + else if ( Event.EventName == "OfficeDocumentsListener::notifyClosing" ) { if ( isOfficeDocument( Event.Source ) ) { @@ -314,8 +311,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( } } } - else if ( Event.EventName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "OnSaveDone" ) ) ) + else if ( Event.EventName == "OnSaveDone" ) { if ( isOfficeDocument( Event.Source ) ) { @@ -350,8 +346,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( "OnSaveDone event notified for unknown document!" ); } } - else if ( Event.EventName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "OnSaveAsDone" ) ) ) + else if ( Event.EventName == "OnSaveAsDone" ) { if ( isOfficeDocument( Event.Source ) ) { @@ -389,8 +384,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( "OnSaveAsDone event notified for unknown document!" ); } } - else if ( Event.EventName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "OnTitleChanged" ) ) ) + else if ( Event.EventName == "OnTitleChanged" ) { if ( isOfficeDocument( Event.Source ) ) { @@ -744,8 +738,7 @@ bool OfficeDocumentsManager::isBasicIDE( if ( !aModule.isEmpty() ) { // Filter unwanted items, that are no real documents. - if ( aModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.script.BasicIDE" ) ) ) + if ( aModule == "com.sun.star.script.BasicIDE" ) { return true; } diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx index 5da084d9de41..ce670c29cd7d 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.cxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx @@ -65,8 +65,7 @@ void Uri::init() const // Check for proper scheme. (Scheme is case insensitive.) rtl::OUString aScheme = m_aUri.copy( 0, TDOC_URL_SCHEME_LENGTH ).toAsciiLowerCase(); - if ( !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( TDOC_URL_SCHEME ) ) ) + if ( aScheme != TDOC_URL_SCHEME ) { // Invaild scheme. return; diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 0147bb745e65..39d0a1980fb7 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -247,16 +247,12 @@ void ContentProperties::UCBNamesToDAVNames( { const beans::Property & rProp = rProps[ n ]; - if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + if ( rProp.Name == "Title" ) { // Title is always obtained from resource's URI. continue; } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) - || - ( rProp.Name == DAVProperties::CREATIONDATE ) ) + else if ( rProp.Name == "DateCreated" || rProp.Name == DAVProperties::CREATIONDATE ) { if ( !bCreationDate ) { @@ -264,10 +260,7 @@ void ContentProperties::UCBNamesToDAVNames( bCreationDate = sal_True; } } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) - || - ( rProp.Name == DAVProperties::GETLASTMODIFIED ) ) + else if ( rProp.Name == "DateModified" || rProp.Name == DAVProperties::GETLASTMODIFIED ) { if ( !bLastModified ) { @@ -276,10 +269,7 @@ void ContentProperties::UCBNamesToDAVNames( bLastModified = sal_True; } } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) - || - ( rProp.Name == DAVProperties::GETCONTENTTYPE ) ) + else if ( rProp.Name == "MediaType" || rProp.Name == DAVProperties::GETCONTENTTYPE ) { if ( !bContentType ) { @@ -288,10 +278,7 @@ void ContentProperties::UCBNamesToDAVNames( bContentType = sal_True; } } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Size" ) ) - || - ( rProp.Name == DAVProperties::GETCONTENTLENGTH ) ) + else if ( rProp.Name == "Size" || rProp.Name == DAVProperties::GETCONTENTLENGTH ) { if ( !bContentLength ) { @@ -300,16 +287,7 @@ void ContentProperties::UCBNamesToDAVNames( bContentLength = sal_True; } } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) - || - rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) - || - rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) - || - ( rProp.Name == DAVProperties::RESOURCETYPE ) ) + else if ( rProp.Name == "ContentType" || rProp.Name == "IsDocument" || rProp.Name == "IsFolder" || rProp.Name == DAVProperties::RESOURCETYPE ) { if ( !bResourceType ) { @@ -347,20 +325,17 @@ void ContentProperties::UCBNamesToHTTPNames( { const beans::Property & rProp = rProps[ n ]; - if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) + if ( rProp.Name == "DateModified" ) { propertyNames.push_back( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Last-Modified")) ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + else if ( rProp.Name == "MediaType" ) { propertyNames.push_back( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content-Type")) ); } - else if ( rProp.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) + else if ( rProp.Name == "Size" ) { propertyNames.push_back( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content-Length")) ); @@ -460,8 +435,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Content-Length" ) ) ) + else if ( rName == "Content-Length" ) { // Do NOT map Content-Lenght entity header to DAV:getcontentlength! // Only DAV resources have this property. @@ -502,8 +476,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ] = PropertyValue( uno::makeAny( aDate ), true ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Last-Modified" ) ) ) + else if ( rName == "Last-Modified" ) { // Do not map Last-Modified entity header to DAV:getlastmodified! // Only DAV resources have this property. diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index b80d665aeaca..e69aaf94cf07 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -1677,8 +1677,7 @@ void NeonSession::abort() // ------------------------------------------------------------------- const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const { - if ( m_aScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http" ) ) || - m_aScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "https" ) ) ) + if ( m_aScheme == "http" || m_aScheme == "https" ) { return m_rProxyDecider.getProxy( m_aScheme, m_aHostName, diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx index 6acfb4e51bf1..897e8a6e9c3a 100644 --- a/ucb/source/ucp/webdav/NeonUri.cxx +++ b/ucb/source/ucp/webdav/NeonUri.cxx @@ -221,18 +221,15 @@ void NeonUri::calculateURI () switch ( mPort ) { case DEFAULT_HTTP_PORT: - bAppendPort - = !mScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http" ) ); + bAppendPort = mScheme != "http"; break; case DEFAULT_HTTPS_PORT: - bAppendPort - = !mScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "https" ) ); + bAppendPort = mScheme != "https"; break; case DEFAULT_FTP_PORT: - bAppendPort - = !mScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ftp" ) ); + bAppendPort = mScheme != "ftp"; break; } if ( bAppendPort ) diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index f5636225fa73..50c182018d10 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -409,8 +409,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aRet; - if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) ) + if ( aCommand.Name == "getPropertyValues" ) { ////////////////////////////////////////////////////////////////// // getPropertyValues @@ -431,8 +430,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= getPropertyValues( Properties, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) ) + else if ( aCommand.Name == "setPropertyValues" ) { ////////////////////////////////////////////////////////////////// // setPropertyValues @@ -465,8 +463,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= setPropertyValues( aProperties, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) ) + else if ( aCommand.Name == "getPropertySetInfo" ) { ////////////////////////////////////////////////////////////////// // getPropertySetInfo @@ -476,8 +473,7 @@ uno::Any SAL_CALL Content::execute( aRet <<= getPropertySetInfo( Environment, sal_False /* don't cache data */ ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) ) + else if ( aCommand.Name == "getCommandInfo" ) { ////////////////////////////////////////////////////////////////// // getCommandInfo @@ -486,8 +482,7 @@ uno::Any SAL_CALL Content::execute( // Note: Implemented by base class. aRet <<= getCommandInfo( Environment, sal_False ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "open" ) ) ) + else if ( aCommand.Name == "open" ) { ////////////////////////////////////////////////////////////////// // open @@ -518,8 +513,7 @@ uno::Any SAL_CALL Content::execute( aRet = open( aOpenCommand, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "insert" ) ) ) + else if ( aCommand.Name == "insert" ) { ////////////////////////////////////////////////////////////////// // insert @@ -540,8 +534,7 @@ uno::Any SAL_CALL Content::execute( insert( arg.Data, arg.ReplaceExisting, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "delete" ) ) ) + else if ( aCommand.Name == "delete" ) { ////////////////////////////////////////////////////////////////// // delete @@ -583,9 +576,7 @@ uno::Any SAL_CALL Content::execute( // Remove own and all children's Additional Core Properties. removeAdditionalPropertySet( sal_True ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "transfer" ) ) - && isFolder( Environment ) ) + else if ( aCommand.Name == "transfer" && isFolder( Environment ) ) { ////////////////////////////////////////////////////////////////// // transfer @@ -607,8 +598,7 @@ uno::Any SAL_CALL Content::execute( transfer( transferArgs, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "post" ) ) ) + else if ( aCommand.Name == "post" ) { ////////////////////////////////////////////////////////////////// // post @@ -629,9 +619,7 @@ uno::Any SAL_CALL Content::execute( post( aArg, Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "lock" ) ) && - supportsExclusiveWriteLock( Environment ) ) + else if ( aCommand.Name == "lock" && supportsExclusiveWriteLock( Environment ) ) { ////////////////////////////////////////////////////////////////// // lock @@ -639,9 +627,7 @@ uno::Any SAL_CALL Content::execute( lock( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "unlock" ) ) && - supportsExclusiveWriteLock( Environment ) ) + else if ( aCommand.Name == "unlock" && supportsExclusiveWriteLock( Environment ) ) { ////////////////////////////////////////////////////////////////// // unlock @@ -649,9 +635,7 @@ uno::Any SAL_CALL Content::execute( unlock( Environment ); } - else if ( aCommand.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "createNewContent" ) ) && - isFolder( Environment ) ) + else if ( aCommand.Name == "createNewContent" && isFolder( Environment ) ) { ////////////////////////////////////////////////////////////////// // createNewContent @@ -997,11 +981,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) if ( Info.Type.isEmpty() ) return uno::Reference< ucb::XContent >(); - if ( ( !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) ) - && - ( !Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_CONTENT_TYPE ) ) ) ) + if ( ( Info.Type != WEBDAV_COLLECTION_TYPE ) && ( Info.Type != WEBDAV_CONTENT_TYPE ) ) return uno::Reference< ucb::XContent >(); rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); @@ -1013,8 +993,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); sal_Bool isCollection; - if ( Info.Type.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) ) + if ( Info.Type == WEBDAV_COLLECTION_TYPE ) { aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Collection")); isCollection = sal_True; @@ -1430,8 +1409,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( for ( sal_Int32 n = 0; n < nCount; ++n ) { const rtl::OUString rName = rProperties[ n ].Name; - if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "BaseURI" ) ) ) + if ( rName == "BaseURI" ) { // Add BaseURI property, if requested. xProps->addProperty( @@ -1439,8 +1417,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( uno::makeAny( getBaseURI( xResAccess ) ), true ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + else if ( rName == "CreatableContentsInfo" ) { // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; @@ -1560,8 +1537,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( rName == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1569,8 +1545,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( rName == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1661,8 +1636,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ) + else if ( rName == "DateCreated" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1670,8 +1644,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) + else if ( rName == "DateModified" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -1679,8 +1652,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - else if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + else if ( rName == "MediaType" ) { // Read-only property! // (but could be writable, if 'getcontenttype' would be) @@ -1689,8 +1661,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } - if ( rName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + if ( rName == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( @@ -2513,30 +2484,24 @@ void Content::transfer( // Check source's and target's URL scheme // const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); - if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) + if ( aScheme == WEBDAV_URL_SCHEME ) { sourceURI.SetScheme( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); } - else if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) + else if ( aScheme == DAV_URL_SCHEME ) { sourceURI.SetScheme( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); } - else if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) ) + else if ( aScheme == DAVS_URL_SCHEME ) { sourceURI.SetScheme( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTPS_URL_SCHEME )) ); } else { - if ( !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HTTP_URL_SCHEME ) ) && - !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) ) + if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME ) { ucbhelper::cancelCommandExecution( uno::makeAny( @@ -2549,12 +2514,10 @@ void Content::transfer( } } - if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) + if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) targetURI.SetScheme( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); - else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) + else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) targetURI.SetScheme( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); @@ -3205,8 +3168,7 @@ const Content::ResourceType & Content::getResourceType( const rtl::OUString aScheme( rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); - if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) ) ) + if ( aScheme == FTP_URL_SCHEME ) { eResourceType = FTP; } diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index db1047168be7..478dc66a4bb4 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -384,64 +384,43 @@ uno::Sequence< beans::Property > Content::getProperties( { bHasGetContentLength = sal_True; } - else if ( !bHasContentType && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + else if ( !bHasContentType && (*it) == "ContentType" ) { bHasContentType = sal_True; } - else if ( !bHasIsDocument && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + else if ( !bHasIsDocument && (*it) == "IsDocument" ) { bHasIsDocument = sal_True; } - else if ( !bHasIsFolder && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + else if ( !bHasIsFolder && (*it) == "IsFolder" ) { bHasIsFolder = sal_True; } - else if ( !bHasTitle && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + else if ( !bHasTitle && (*it) == "Title" ) { bHasTitle = sal_True; } - else if ( !bHasBaseURI && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "BaseURI" ) ) ) + else if ( !bHasBaseURI && (*it) == "BaseURI" ) { bHasBaseURI = sal_True; } - else if ( !bHasDateCreated && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ) + else if ( !bHasDateCreated && (*it) == "DateCreated" ) { bHasDateCreated = sal_True; } - else if ( !bHasDateModified && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) + else if ( !bHasDateModified && (*it) == "DateModified" ) { bHasDateModified = sal_True; } - else if ( !bHasMediaType && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + else if ( !bHasMediaType && (*it) == "MediaType" ) { bHasMediaType = sal_True; } - else if ( !bHasSize && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) + else if ( !bHasSize && (*it) == "Size" ) { bHasSize = sal_True; } - else if ( !bHasCreatableInfos && - (*it).equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( - "CreatableContentsInfo" ) ) ) + else if ( !bHasCreatableInfos && (*it) == "CreatableContentsInfo" ) { bHasCreatableInfos = sal_True; } diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index ba24d632c276..c789e120e595 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -124,18 +124,8 @@ ContentProvider::queryContent( const rtl::OUString aScheme = Identifier->getContentProviderScheme().toAsciiLowerCase(); - if ( !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HTTP_URL_SCHEME ) ) && - !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) && - !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) && - !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) && - !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) && - !aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) ) ) + if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME && aScheme != WEBDAV_URL_SCHEME + && aScheme != DAV_URL_SCHEME && aScheme != DAVS_URL_SCHEME && aScheme != FTP_URL_SCHEME ) throw ucb::IllegalIdentifierException(); // Normalize URL and create new Id, if nessacary. @@ -153,8 +143,7 @@ ContentProvider::queryContent( uno::Reference< ucb::XContentIdentifier > xCanonicId; bool bNewId = false; - if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) + if ( aScheme == WEBDAV_URL_SCHEME ) { aURL = aURL.replaceAt( 0, WEBDAV_URL_SCHEME_LENGTH, @@ -162,8 +151,7 @@ ContentProvider::queryContent( HTTP_URL_SCHEME )) ); bNewId = true; } - else if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) + else if ( aScheme == DAV_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAV_URL_SCHEME_LENGTH, @@ -171,8 +159,7 @@ ContentProvider::queryContent( HTTP_URL_SCHEME )) ); bNewId = true; } - else if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) ) + else if ( aScheme == DAVS_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAVS_URL_SCHEME_LENGTH, diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index ceff8f3d0f00..3dddf1c8d5f3 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -552,14 +552,12 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( return m_aEmptyProxy; } - if ( rProtocol.toAsciiLowerCase() - .equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ftp" ) ) ) + if ( rProtocol.toAsciiLowerCase() == "ftp" ) { if ( !m_aFtpProxy.aName.isEmpty() && m_aFtpProxy.nPort >= 0 ) return m_aFtpProxy; } - else if ( rProtocol.toAsciiLowerCase() - .equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "https" ) ) ) + else if ( rProtocol.toAsciiLowerCase() == "https" ) { if ( !m_aHttpsProxy.aName.isEmpty() ) return m_aHttpsProxy; @@ -591,8 +589,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( rtl::OUString aKey; if ( ( rElem.Accessor >>= aKey ) && !aKey.isEmpty() ) { - if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - PROXY_TYPE_KEY ) ) ) + if ( aKey == PROXY_TYPE_KEY ) { if ( !( rElem.Element >>= m_nProxyType ) ) { @@ -600,8 +597,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( "Error getting config item value!" ); } } - else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - NO_PROXY_LIST_KEY ) ) ) + else if ( aKey == NO_PROXY_LIST_KEY ) { rtl::OUString aNoProxyList; if ( !( rElem.Element >>= aNoProxyList ) ) @@ -612,8 +608,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( setNoProxyList( aNoProxyList ); } - else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - HTTP_PROXY_NAME_KEY ) ) ) + else if ( aKey == HTTP_PROXY_NAME_KEY ) { if ( !( rElem.Element >>= m_aHttpProxy.aName ) ) { @@ -621,8 +616,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( "Error getting config item value!" ); } } - else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - HTTP_PROXY_PORT_KEY ) ) ) + else if ( aKey == HTTP_PROXY_PORT_KEY ) { if ( !( rElem.Element >>= m_aHttpProxy.nPort ) ) { @@ -633,8 +627,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( if ( m_aHttpProxy.nPort == -1 ) m_aHttpProxy.nPort = 80; // standard HTTP port. } - else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - HTTPS_PROXY_NAME_KEY ) ) ) + else if ( aKey == HTTPS_PROXY_NAME_KEY ) { if ( !( rElem.Element >>= m_aHttpsProxy.aName ) ) { @@ -642,8 +635,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( "Error getting config item value!" ); } } - else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - HTTPS_PROXY_PORT_KEY ) ) ) + else if ( aKey == HTTPS_PROXY_PORT_KEY ) { if ( !( rElem.Element >>= m_aHttpsProxy.nPort ) ) { @@ -654,8 +646,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( if ( m_aHttpsProxy.nPort == -1 ) m_aHttpsProxy.nPort = 443; // standard HTTPS port. } - else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - FTP_PROXY_NAME_KEY ) ) ) + else if ( aKey == FTP_PROXY_NAME_KEY ) { if ( !( rElem.Element >>= m_aFtpProxy.aName ) ) { @@ -663,8 +654,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( "Error getting config item value!" ); } } - else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - FTP_PROXY_PORT_KEY ) ) ) + else if ( aKey == FTP_PROXY_PORT_KEY ) { if ( !( rElem.Element >>= m_aFtpProxy.nPort ) ) { diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 0ca9a09652fd..bedc28068a62 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -427,9 +427,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() { SvtSysLocale aSysLocale; com::sun::star::lang::Locale aLocale = aSysLocale.GetLocale(); - if ( aLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")) || - aLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ja")) || - aLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")) ) + if ( aLocale.Language == "zh" || aLocale.Language == "ja" || aLocale.Language == "ko" ) aItem.bExpandWordSpace = false; m_aDefOptions = aItem; diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index f65a25d82e98..f464f890f092 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -1224,7 +1224,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const String& rFontNam aLocale.Variant = OUString(); else if( !aLocale.Country.isEmpty() ) aLocale.Country = OUString(); - else if( ! aLocale.Language.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "en" ) ) ) + else if( aLocale.Language != "en" ) aLocale.Language = OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) ); else aLocale.Language = OUString(); diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index daee93fc2d3a..5b454c0cf4b6 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -288,9 +288,7 @@ bool utl::UCBContentHelper::MakeFolder( != 0) { // Make sure the only required bootstrap property is "Title": - if (info[i].Properties.getLength() != 1 - || !info[i].Properties[0].Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("Title"))) + if ( info[i].Properties.getLength() != 1 || info[i].Properties[0].Name != "Title" ) { continue; } diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index f749cfd06c33..ce8a4c51e00e 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -982,30 +982,17 @@ namespace DOM { // does not need mutex currently events::CEvent *pEvent = 0; - if ( - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMSubtreeModified")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMNodeInserted")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMNodeRemoved")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMNodeRemovedFromDocument")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMNodeInsertedIntoDocument")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMAttrModified")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMCharacterDataModified"))) + if ( aType == "DOMSubtreeModified" || aType == "DOMNodeInserted" || aType == "DOMNodeRemoved" + || aType == "DOMNodeRemovedFromDocument" || aType == "DOMNodeInsertedIntoDocument" || aType == "DOMAttrModified" + || aType == "DOMCharacterDataModified") { pEvent = new events::CMutationEvent; - } else if ( - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMFocusIn")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMFocusOut")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMActivate"))) + } else if ( aType == "DOMFocusIn" || aType == "DOMFocusOut" || aType == "DOMActivate") { pEvent = new events::CUIEvent; - } else if ( - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("click")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mousedown")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mouseup")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mouseover")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mousemove")) || - aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mouseout")) ) + } else if ( aType == "click" || aType == "mousedown" || aType == "mouseup" + || aType == "mouseover" || aType == "mousemove" || aType == "mouseout" ) { pEvent = new events::CMouseEvent; } diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx index 8d21c8f99948..2103e0318a95 100644 --- a/uui/source/iahndl-ioexceptions.cxx +++ b/uui/source/iahndl-ioexceptions.cxx @@ -248,9 +248,7 @@ UUIInteractionHelper::handleInteractiveIOException( RTL_CONSTASCII_USTRINGPARAM( "Removable")), &bRemovable); - nErrorCode - = aResourceType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("volume")) + nErrorCode = aResourceType == "volume" ? (bRemovable ? ERRCODE_UUI_IO_NOTREADY_VOLUME_REMOVABLE : ERRCODE_UUI_IO_NOTREADY_VOLUME) @@ -301,12 +299,9 @@ UUIInteractionHelper::handleInteractiveIOException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ResourceType")), &aResourceType); - nErrorCode - = aResourceType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("volume")) + nErrorCode = aResourceType == "volume" ? ERRCODE_UUI_IO_NOTEXISTS_VOLUME - : (aResourceType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("folder")) + : (aResourceType == "folder" ? ERRCODE_UUI_IO_NOTEXISTS_FOLDER : ERRCODE_UUI_IO_NOTEXISTS); aArguments.push_back(aArgUri); diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 38739bd9f3ed..4011f6a16324 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1123,9 +1123,7 @@ UUIInteractionHelper::getContextProperty() for (sal_Int32 i = 0; i < m_aProperties.getLength(); ++i) { beans::PropertyValue aProperty; - if ((m_aProperties[i] >>= aProperty) - && aProperty. - Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Context"))) + if ((m_aProperties[i] >>= aProperty) && aProperty.Name == "Context" ) { rtl::OUString aContext; aProperty.Value >>= aContext; diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index 259c0752706b..11eec85e6227 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -56,9 +56,9 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException ) { if( m_sResourceUrl.equalsAscii( ITEM_MENUBAR_URL ) ) { - if( pCBarHelper->getModuleId().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) ) + if( pCBarHelper->getModuleId() == "com.sun.star.sheet.SpreadsheetDocument" ) sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar") ); - else if( pCBarHelper->getModuleId().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) ) + else if( pCBarHelper->getModuleId() == "com.sun.star.text.TextDocument" ) sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Menu Bar") ); return sName; } diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index ecd0228f32ef..4703a1d5f339 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -118,7 +118,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) if( aSource >>= sBarName ) { // some built-in command bars - if( m_pCBarHelper->getModuleId().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ) ) + if( m_pCBarHelper->getModuleId() == "com.sun.star.sheet.SpreadsheetDocument" ) { if( sBarName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("Worksheet Menu Bar") ) ) { @@ -132,7 +132,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) aRet <<= uno::Reference< XCommandBar >( new VbaDummyCommandBar( this, mxContext, sBarName, office::MsoBarType::msoBarTypePopup ) ); } } - else if( m_pCBarHelper->getModuleId().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument") ) ) + else if( m_pCBarHelper->getModuleId() == "com.sun.star.text.TextDocument" ) { if( sBarName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("Menu Bar") ) ) { @@ -226,9 +226,9 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th if( nIndex == 1 ) { uno::Any aSource; - if( m_pCBarHelper->getModuleId().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) + if( m_pCBarHelper->getModuleId() == "com.sun.star.sheet.SpreadsheetDocument" ) aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar")); - else if( m_pCBarHelper->getModuleId().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) ) + else if( m_pCBarHelper->getModuleId() == "com.sun.star.text.TextDocument" ) aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Menu Bar")); if( aSource.hasValue() ) return createCollectionObject( aSource ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index ccbaa632619d..243d728b03ad 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -11508,7 +11508,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues() int nKidIndex = rGroupWidget.m_aKidsIndex[nKid]; PDFWidget& rKid = m_aWidgets[nKidIndex]; rKid.m_aOnValue = OUString::valueOf( sal_Int32(nKid+1) ); - if( ! rKid.m_aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Off" ) ) ) + if( rKid.m_aValue != "Off" ) rKid.m_aValue = rKid.m_aOnValue; } } @@ -11535,7 +11535,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues() #endif } // update selected radio button - if( ! rKid.m_aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Off" ) ) ) + if( rKid.m_aValue != "Off" ) { rGroupWidget.m_aValue = rKid.m_aValue; } diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 3e828dab3f84..3d8de49003c8 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -141,11 +141,11 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, sal_Int32 i = 0; for ( i = 0; i < pFilterData->getLength(); i++ ) { - if ( (*pFilterData)[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Compression" ) ) ) + if ( (*pFilterData)[ i ].Name == "Compression" ) (*pFilterData)[ i ].Value >>= mnCompLevel; - else if ( (*pFilterData)[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Interlaced" ) ) ) + else if ( (*pFilterData)[ i ].Name == "Interlaced" ) (*pFilterData)[ i ].Value >>= mnInterlaced; - else if ( (*pFilterData)[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MaxChunkSize" ) ) ) + else if ( (*pFilterData)[ i ].Name == "MaxChunkSize" ) { sal_Int32 nVal = 0; if ( (*pFilterData)[ i ].Value >>= nVal ) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 89bc71ca5163..ddbbc76d3a3b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1185,7 +1185,7 @@ void PrintDialog::setupOptionalUI() bool bSwitchPage = false; if( !aGroupingHint.isEmpty() ) bSwitchPage = true; - else if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Subgroup" ) ) || (bOnStaticPage && ! bSubgroupOnStaticPage ) ) + else if( aCtrlType == "Subgroup" || (bOnStaticPage && ! bSubgroupOnStaticPage ) ) bSwitchPage = true; if( bSwitchPage ) { @@ -1230,8 +1230,7 @@ void PrintDialog::setupOptionalUI() } } - if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Group" ) ) || - ( ! pCurParent && ! (bOnStaticPage || !aGroupingHint.isEmpty() ) ) ) + if( aCtrlType == "Group" || ( ! pCurParent && ! (bOnStaticPage || !aGroupingHint.isEmpty() ) ) ) { // add new tab page TabPage* pNewGroup = new TabPage( &maTabCtrl ); @@ -1285,10 +1284,7 @@ void PrintDialog::setupOptionalUI() pIndent->setChild( pCurColumn ); } // EVIL - else if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Bool" ) ) && - aGroupingHint.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LayoutPage" ) ) && - aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrintProspect" ) ) - ) + else if( aCtrlType == "Bool" && aGroupingHint == "LayoutPage" && aPropertyName == "PrintProspect" ) { maNUpPage.maBrochureBtn.SetText( aText ); maNUpPage.maBrochureBtn.Show(); @@ -1331,7 +1327,7 @@ void PrintDialog::setupOptionalUI() } } } - if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Bool" ) ) && pCurParent ) + if( aCtrlType == "Bool" && pCurParent ) { // add a check box CheckBox* pNewBox = new CheckBox( pCurParent ); @@ -1361,7 +1357,7 @@ void PrintDialog::setupOptionalUI() // add checkbox to current column pDependencyRow->addWindow( pNewBox ); } - else if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Radio" ) ) && pCurParent ) + else if( aCtrlType == "Radio" && pCurParent ) { sal_Int32 nCurHelpText = 0; boost::shared_ptr<vcl::RowOrColumn> pRadioColumn( pCurColumn ); @@ -1421,10 +1417,7 @@ void PrintDialog::setupOptionalUI() pLabel->setLabel( pBtn ); } } - else if( ( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "List" ) ) || - aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Range" ) ) || - aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Edit" ) ) - ) && pCurParent ) + else if( ( aCtrlType == "List" || aCtrlType == "Range" || aCtrlType == "Edit" ) && pCurParent ) { // create a row in the current column boost::shared_ptr<vcl::RowOrColumn> pFieldColumn( new vcl::RowOrColumn( pCurColumn.get(), false ) ); diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 1e4636ee69a8..f69f2dee6491 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -263,7 +263,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() for( int i = 0; i < nParams; i++ ) { rtl_getAppCommandArg( i, &aParam.pData ); - if( i < nParams-1 && (aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-display" ) ) || aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--display" ) )) ) + if( i < nParams-1 && (aParam == "-display" || aParam == "--display" ) ) { osl_getCommandArg( i+1, &aParam.pData ); aBParm = OUStringToOString( aParam, osl_getThreadTextEncoding() ); diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index b92c8c750e21..d2400d7f857b 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -98,10 +98,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals * #i109007# KDE3 seems to have the same problem. * And same applies for KDE4. */ - if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk")) || - rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk3")) || - rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) || - rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) ) + if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "kde" || rModuleBase == "kde4" ) { pCloseModule = NULL; } @@ -216,8 +213,7 @@ static SalInstance* check_headless_plugin() for( int i = 0; i < nParams; i++ ) { osl_getCommandArg( i, &aParam.pData ); - if( aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("-headless")) || - aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("--headless")) ) + if( aParam == "-headless" || aParam == "--headless" ) { return tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "svp" ) ) ); } diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 3b62677af45b..776313b04b48 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -642,7 +642,7 @@ void GtkData::Init() osl_getCommandArg(i, &aParam.pData ); OString aBParam( OUStringToOString( aParam, aEnc ) ); - if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-display" ) ) || aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--display" ) ) ) + if( aParam == "-display" || aParam == "--display" ) { pCmdLineAry[i+1] = g_strdup( "--display" ); osl_getCommandArg(i+1, &aParam.pData ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index c363d5f25f92..4ee951282fcc 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -922,7 +922,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw } while( nTokenIndex >= 0 ); - if( !bExtensionTypedIn && ( !sToken.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*")) ) ) + if( !bExtensionTypedIn && ( sToken != "*" ) ) { //if the filename does not already have the auto extension, stick it on OUString sExtension = OUString(RTL_CONSTASCII_USTRINGPARAM( "." )) + sToken; diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 0b723e1c099d..447ca9228f5e 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -439,7 +439,7 @@ void GtkData::initNWF( void ) (char *)NULL); pSVData->maNWFData.mnMenuFormatExtraBorder = horizontal_padding; - if( SalGetDesktopEnvironment().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE")) ) + if( SalGetDesktopEnvironment() == "KDE" ) { // #i97196# ensure a widget exists and the style engine was loaded NWEnsureGTKButton( SalX11Screen( 0 ) ); diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index d1086b8ee04d..d66e22719784 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -143,7 +143,7 @@ void KDEXLib::Init() for ( nIdx = 0; nIdx < nParams; ++nIdx ) { osl_getCommandArg( nIdx, &aParam.pData ); - if ( !m_pFreeCmdLineArgs && aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-display" ) ) && nIdx + 1 < nParams ) + if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams ) { osl_getCommandArg( nIdx + 1, &aParam.pData ); aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() ); diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 23822b1768f7..658eebb48cf6 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -136,7 +136,7 @@ void KDEXLib::Init() for ( nIdx = 0; nIdx < nParams; ++nIdx ) { osl_getCommandArg( nIdx, &aParam.pData ); - if ( !m_pFreeCmdLineArgs && aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-display" ) ) && nIdx + 1 < nParams ) + if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams ) { osl_getCommandArg( nIdx + 1, &aParam.pData ); aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() ); diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index ab9b6cd51198..9d1d3de27ff3 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -919,8 +919,7 @@ int GrindApp::Main() { ::rtl::OUString aParam = GetCommandLineParam( i ); - if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) || - aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) ) + if( aParam == "--help" || aParam == "-h" ) bHelp = true; } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5b1f4d2839eb..de03396973c1 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2786,7 +2786,7 @@ void DomainMapper_Impl::CloseFieldCommand() while (aPartIt != aItEnd) { - if (aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\l"))) + if ( *aPartIt == "\\l" ) { ++aPartIt; @@ -2796,12 +2796,10 @@ void DomainMapper_Impl::CloseFieldCommand() sURL = OUString('#'); sURL += *aPartIt; } - else if (aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\m")) || - aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\n"))) + else if ( *aPartIt == "\\m" || *aPartIt == "\\n" ) { } - else if (aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\o")) || - aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\t"))) + else if ( *aPartIt == "\\o" || *aPartIt == "\\t" ) { ++aPartIt; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 07d6591d2a55..cdfecdbfeda9 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -849,8 +849,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) for( sal_Int32 nProp = 0; nProp < aPropValues.getLength(); ++nProp) { // Don't add the style name properties - bool bIsParaStyleName = aPropValues[nProp].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ParaStyleName" ) ); - bool bIsCharStyleName = aPropValues[nProp].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharStyleName" ) ); + bool bIsParaStyleName = aPropValues[nProp].Name == "ParaStyleName"; + bool bIsCharStyleName = aPropValues[nProp].Name == "CharStyleName"; if ( !bIsParaStyleName && !bIsCharStyleName ) { aSortedPropVals.Insert( aPropValues[nProp] ); diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index 5ac315c02d52..85303f7883f2 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -106,11 +106,10 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes #endif writerfilter::dmapper::SourceDocumentType eType = - (m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007" ) ) || - m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007_Template" ) ) || - m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_OOXML" ) ) || - m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_OOXML_Text_Template" ) )) ? - writerfilter::dmapper::DOCUMENT_OOXML : writerfilter::dmapper::DOCUMENT_DOC; + (m_sFilterName == "writer_MS_Word_2007" || m_sFilterName == "writer_MS_Word_2007_Template" || + m_sFilterName == "writer_OOXML" || m_sFilterName == "writer_OOXML_Text_Template" ) ? + writerfilter::dmapper::DOCUMENT_OOXML : writerfilter::dmapper::DOCUMENT_DOC; + writerfilter::Stream::Pointer_t pStream(new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, eType)); //create the tokenizer and domain mapper if( eType == writerfilter::dmapper::DOCUMENT_OOXML ) @@ -204,7 +203,7 @@ void WriterFilter::initialize( const uno::Sequence< uno::Any >& aArguments ) thr nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= m_sFilterName; break; @@ -225,8 +224,7 @@ OUString WriterFilter_getImplementationName () throw (uno::RuntimeException) sal_Bool WriterFilter_supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) )); + return (ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME1 ); } diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index 2f549d0f3a9e..b57207f589f2 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -142,8 +142,7 @@ OUString RtfFilter::getImplementationName( ) throw (uno::RuntimeException) #define SERVICE_NAME2 "com.sun.star.document.ExportFilter" sal_Bool RtfFilter::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) { - return (rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) )); + return ( rServiceName == SERVICE_NAME1 || rServiceName == SERVICE_NAME2 ); } uno::Sequence< OUString > RtfFilter::getSupportedServiceNames( ) throw (uno::RuntimeException) diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index 31b7b8a5e15b..8475dab99551 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -148,7 +148,7 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r sal_Bool WriterFilterDetection_supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ); + return ServiceName == SERVICE_NAME1; } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c2447466b741..627700426c83 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -898,8 +898,7 @@ void RTFDocumentImpl::text(OUString& rString) m_aStates.top().aDestinationText.append(rString); break; case DESTINATION_EQINSTRUCTION: - if (rString.copy(0, 2).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("do")) - && rString.copy(2).toInt32() > 0) + if ( rString.copy(0, 2) == "do" && rString.copy(2).toInt32() > 0 ) dispatchFlag(RTF_SUB); break; default: bRet = false; break; diff --git a/writerperfect/source/cdrimp/CDRImportFilter.cxx b/writerperfect/source/cdrimp/CDRImportFilter.cxx index 8e17102b157f..91876898b974 100644 --- a/writerperfect/source/cdrimp/CDRImportFilter.cxx +++ b/writerperfect/source/cdrimp/CDRImportFilter.cxx @@ -92,9 +92,9 @@ throw (RuntimeException) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } if ( !xInputStream.is() ) @@ -157,9 +157,9 @@ throw( com::sun::star::uno::RuntimeException ) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) ) + if ( pValue[i].Name == "TypeName" ) location=i; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + else if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; } @@ -197,7 +197,7 @@ throw (Exception, RuntimeException) nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; break; @@ -222,8 +222,7 @@ throw (RuntimeException) #ifdef DEBUG std::cerr << "CDRImportFilter_supportsService" << std::endl; #endif - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) ); + return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 ); } Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames( ) throw (RuntimeException) diff --git a/writerperfect/source/vsdimp/VisioImportFilter.cxx b/writerperfect/source/vsdimp/VisioImportFilter.cxx index b731769a1a66..c06076c0ea16 100644 --- a/writerperfect/source/vsdimp/VisioImportFilter.cxx +++ b/writerperfect/source/vsdimp/VisioImportFilter.cxx @@ -92,9 +92,9 @@ throw (RuntimeException) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } if ( !xInputStream.is() ) @@ -157,9 +157,9 @@ throw( com::sun::star::uno::RuntimeException ) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) ) + if ( pValue[i].Name == "TypeName" ) location=i; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + else if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; } @@ -197,7 +197,7 @@ throw (Exception, RuntimeException) nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; break; @@ -222,8 +222,7 @@ throw (RuntimeException) #ifdef DEBUG std::cerr << "VisioImportFilter_supportsService" << std::endl; #endif - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) ); + return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 ); } Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames( ) throw (RuntimeException) diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx index 26226ff2d1fa..a82338f6727e 100644 --- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx +++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx @@ -108,9 +108,9 @@ throw (RuntimeException) uno::Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } if ( !xInputStream.is() ) @@ -201,11 +201,11 @@ throw( com::sun::star::uno::RuntimeException ) uno::Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) ) + if ( pValue[i].Name == "TypeName" ) location=i; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + else if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } @@ -264,7 +264,7 @@ throw (Exception, RuntimeException) nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; break; @@ -283,8 +283,7 @@ throw (RuntimeException) sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const OUString &ServiceName ) throw (RuntimeException) { - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) ); + return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 ); } Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames( ) throw (RuntimeException) @@ -424,7 +423,7 @@ throw (RuntimeException) sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const OUString &ServiceName ) throw (RuntimeException) { - return ( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) ) ); + return ( ServiceName == SERVICE_NAME ); } Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames( ) diff --git a/writerperfect/source/wpgimp/WPGImportFilter.cxx b/writerperfect/source/wpgimp/WPGImportFilter.cxx index 478879e04285..5ce55996141f 100644 --- a/writerperfect/source/wpgimp/WPGImportFilter.cxx +++ b/writerperfect/source/wpgimp/WPGImportFilter.cxx @@ -91,9 +91,9 @@ throw (RuntimeException) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } if ( !xInputStream.is() ) @@ -156,9 +156,9 @@ throw( com::sun::star::uno::RuntimeException ) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) ) + if ( pValue[i].Name == "TypeName" ) location=i; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + else if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; } @@ -196,7 +196,7 @@ throw (Exception, RuntimeException) nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; break; @@ -221,8 +221,7 @@ throw (RuntimeException) #ifdef DEBUG std::cerr << "WPGImportFilter_supportsService" << std::endl; #endif - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) ); + return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 ); } Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames( ) throw (RuntimeException) diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx index 55aa72966de6..cb9b0561e05c 100644 --- a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx +++ b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx @@ -87,9 +87,9 @@ throw (RuntimeException) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } if ( !xInputStream.is() ) @@ -156,11 +156,11 @@ throw( com::sun::star::uno::RuntimeException ) Reference < XInputStream > xInputStream; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) ) + if ( pValue[i].Name == "TypeName" ) location=i; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) ) + else if ( pValue[i].Name == "InputStream" ) pValue[i].Value >>= xInputStream; - else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) ) + else if ( pValue[i].Name == "URL" ) pValue[i].Value >>= sURL; } @@ -219,7 +219,7 @@ throw (Exception, RuntimeException) nLength = aAnySeq.getLength(); for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) ) + if ( pValue[i].Name == "Type" ) { pValue[i].Value >>= msFilterName; break; @@ -238,8 +238,7 @@ throw (RuntimeException) sal_Bool SAL_CALL MSWorksImportFilter_supportsService( const OUString &ServiceName ) throw (RuntimeException) { - return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || - ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) ); + return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 ); } Sequence< OUString > SAL_CALL MSWorksImportFilter_getSupportedServiceNames( ) throw (RuntimeException) diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index 67efe6efb732..63b8dd839865 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -126,10 +126,10 @@ namespace chelp { Databases* pDatabases ) throw( com::sun::star::ucb::IllegalIdentifierException ); - bool isPicture() const { return m_aModule.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("picture")); } - bool isActive() const { return !m_aActive.isEmpty() && m_aActive.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); } + bool isPicture() const { return m_aModule == "picture"; } + bool isActive() const { return !m_aActive.isEmpty() && m_aActive == "true"; } bool isQuery() const { return m_aId.isEmpty() && !m_aQuery.isEmpty(); } - bool isEntryForModule() const { return m_aId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("start")) || m_bStart; } + bool isEntryForModule() const { return m_aId == "start" || m_bStart; } bool isFile() const { return !m_aId.isEmpty(); } bool isModule() const { return m_aId.isEmpty() && !m_aModule.isEmpty(); } bool isRoot() const { return m_aModule.isEmpty(); } diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 4067e2c4de57..fa94162508e6 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -766,9 +766,8 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc const OUString& rODFVersionOfFile, bool bAxisPositionAttributeImported ) { - if( ( rODFVersionOfFile.isEmpty() || rODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.0")) - || rODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.1")) - || ( rODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.2")) && !bAxisPositionAttributeImported ) ) ) + if( ( rODFVersionOfFile.isEmpty() || rODFVersionOfFile == "1.0" || rODFVersionOfFile == "1.1" + || ( rODFVersionOfFile == "1.2" && !bAxisPositionAttributeImported ) ) ) { try { diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 20f11839676d..ff70d98b783d 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -581,8 +581,7 @@ bool lcl_SpecialHandlingForDonutChartNeeded( const SvXMLImport & rImport ) { bool bResult = false; - if( rServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.DonutChartType" ))) + if( rServiceName == "com.sun.star.chart2.DonutChartType" ) { bResult = SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( rImport.GetModel() ); } @@ -758,9 +757,9 @@ void SchXMLChartContext::EndElement() return; bool bHasOwnData = false; - if( m_aXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "." ) ) ) //data comes from the chart itself + if( m_aXLinkHRefAttributeToIndicateDataProvider == "." ) //data comes from the chart itself bHasOwnData = true; - else if( m_aXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".." ) ) ) //data comes from the parent application + else if( m_aXLinkHRefAttributeToIndicateDataProvider == ".." ) //data comes from the parent application bHasOwnData = false; else if( !m_aXLinkHRefAttributeToIndicateDataProvider.isEmpty() ) //not supported so far to get the data by sibling objects -> fall back to chart itself if data are available bHasOwnData = m_bHasTableElement; @@ -769,7 +768,7 @@ void SchXMLChartContext::EndElement() if( xNewDoc->hasInternalDataProvider()) { - if( !m_bHasTableElement && !m_aXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "." ) ) ) + if( !m_bHasTableElement && m_aXLinkHRefAttributeToIndicateDataProvider != "." ) { //#i103147# ODF, workaround broken files with a missing table:cell-range-address at the plot-area bool bSwitchSuccessful = SchXMLTools::switchBackToDataProviderFromParent( xNewDoc, maLSequencesPerIndex ); @@ -939,8 +938,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() uno::Sequence< uno::Reference< chart2::XChartType > > aChartTypes( xCTCnt->getChartTypes()); for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx ) { - if( aChartTypes[nCTIdx]->getChartType().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.CandleStickChartType"))) + if( aChartTypes[nCTIdx]->getChartType() == "com.sun.star.chart2.CandleStickChartType" ) { xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 60cb7d867bec..bb8011c2ef57 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2904,8 +2904,8 @@ void SchXMLExportHelper_Impl::exportSeries( // domain elements if( bExportContent ) { - bool bIsScatterChart = aChartType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.ScatterChartType")); - bool bIsBubbleChart = aChartType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.BubbleChartType")); + bool bIsScatterChart = aChartType == "com.sun.star.chart2.ScatterChartType"; + bool bIsBubbleChart = aChartType == "com.sun.star.chart2.BubbleChartType"; Reference< chart2::data::XDataSequence > xYValuesForBubbleChart; if( bIsBubbleChart ) { @@ -3684,9 +3684,7 @@ void SchXMLExport::_ExportContent() // range string, as this is our only indicator for having own or // external data. @todo: fix this in the file format! Reference< lang::XServiceInfo > xDPServiceInfo( xNewDoc->getDataProvider(), uno::UNO_QUERY ); - if( ! (xDPServiceInfo.is() && - xDPServiceInfo->getImplementationName().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.comp.chart.InternalDataProvider" )))) + if( ! (xDPServiceInfo.is() && xDPServiceInfo->getImplementationName() == "com.sun.star.comp.chart.InternalDataProvider" )) { bIncludeTable = sal_False; } diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 167e9e8bca0b..50eabc70d19e 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -365,8 +365,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if( xProp.is() && ( xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dim3D"))) >>= bIs3d ) && bIs3d ) { - if( maChartTypeServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.PieChartType" )) - || maChartTypeServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.DonutChartType" )) ) + if( maChartTypeServiceName == "com.sun.star.chart2.PieChartType" || maChartTypeServiceName == "com.sun.star.chart2.DonutChartType" ) { ::rtl::OUString aPropName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartingAngle")) ); uno::Any aAStartingAngle( SchXMLTools::getPropertyFromContext( aPropName, pPropStyleContext, pStylesCtxt ) ); @@ -415,8 +414,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if( ( xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dim3D"))) >>= bIs3d ) && bIs3d ) { - if( maChartTypeServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.AreaChartType" )) || - maChartTypeServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LineChartType" )) ) + if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" ) { aDeepProperty <<= uno::makeAny( true ); } @@ -440,9 +438,9 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri // bool bCreateInternalDataProvider = false; - if( m_rXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "." ) ) ) //data comes from the chart itself + if( m_rXLinkHRefAttributeToIndicateDataProvider == "." ) //data comes from the chart itself bCreateInternalDataProvider = true; - else if( m_rXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".." ) ) ) //data comes from the parent application + else if( m_rXLinkHRefAttributeToIndicateDataProvider == ".." ) //data comes from the parent application bCreateInternalDataProvider = false; else if( !m_rXLinkHRefAttributeToIndicateDataProvider.isEmpty() ) //not supported so far to get the data by sibling objects -> fall back to chart itself bCreateInternalDataProvider = true; @@ -595,9 +593,7 @@ void SchXMLPlotAreaContext::EndElement() } // set correct number of lines at series - if( ! m_aGlobalSeriesImportInfo.rbAllRangeAddressesAvailable && - mnNumOfLinesProp > 0 && - maChartTypeServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ColumnChartType" ))) + if( ! m_aGlobalSeriesImportInfo.rbAllRangeAddressesAvailable && mnNumOfLinesProp > 0 && maChartTypeServiceName == "com.sun.star.chart2.ColumnChartType" ) { try { diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 42f9032e3c56..d9f9c09a96ee 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -374,10 +374,10 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib if( m_rGlobalSeriesImportInfo.rbAllRangeAddressesAvailable && ! bHasRange ) m_rGlobalSeriesImportInfo.rbAllRangeAddressesAvailable = sal_False; - bool bIsCandleStick = maGlobalChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.CandleStickChartType")); + bool bIsCandleStick = maGlobalChartTypeName == "com.sun.star.chart2.CandleStickChartType"; if( !maSeriesChartTypeName.isEmpty() ) { - bIsCandleStick = maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.CandleStickChartType")); + bIsCandleStick = maSeriesChartTypeName == "com.sun.star.chart2.CandleStickChartType"; } else { @@ -509,8 +509,8 @@ void SchXMLSeries2Context::EndElement() // special handling for different chart types. This is necessary as the // roles are not yet saved in the file format sal_Int32 nDomainCount = maDomainAddresses.size(); - bool bIsScatterChart = maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.ScatterChartType")); - bool bIsBubbleChart = maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.BubbleChartType")); + bool bIsScatterChart = maSeriesChartTypeName == "com.sun.star.chart2.ScatterChartType"; + bool bIsBubbleChart = maSeriesChartTypeName == "com.sun.star.chart2.BubbleChartType"; bool bDeleteSeries = false; std::vector< DomainInfo > aDomainInfos; diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index c25fba0a4fe8..de5bad54585c 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -472,8 +472,7 @@ void CreateCategories( { OUString aConvertedRange( rRangeAddress ); bool bRangeConverted = false; - if( ! (xNewDoc->hasInternalDataProvider() && - aConvertedRange.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("categories")))) + if( ! (xNewDoc->hasInternalDataProvider() && aConvertedRange == "categories")) { Reference< chart2::data::XRangeXMLConversion > xXMLConv( xDataProvider, uno::UNO_QUERY ); if( xXMLConv.is()) @@ -636,8 +635,7 @@ Reference< chart2::XRegressionCurve > getRegressionCurve( if( xServiceName.is()) { OUString aServiceName( xServiceName->getServiceName()); - if( aServiceName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" ))) + if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" ) continue; } // take first non-empty curve diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 3628e1ec2c54..6b08e12dcf8d 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -711,12 +711,8 @@ void XMLConfigItemContext::ManipulateConfigItem() mrAny <<= nTmp; } - else if( (mrItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ColorTableURL" ) ) ) || - (mrItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LineEndTableURL" ) ) ) || - (mrItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HatchTableURL" ) ) ) || - (mrItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DashTableURL" ) ) ) || - (mrItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GradientTableURL") ) ) || - (mrItemName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BitmapTableURL" ) ) ) ) + else if( (mrItemName == "ColorTableURL") || (mrItemName == "LineEndTableURL") || (mrItemName == "HatchTableURL") + || (mrItemName == "DashTableURL") || (mrItemName == "GradientTableURL") || (mrItemName == "BitmapTableURL") ) { if( GetImport().getServiceFactory().is() ) try { diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index f40ebea041cc..e70a24ce4b0b 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2121,7 +2121,7 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp ) sFilterService = OUString( pEntry->sFilterService, pEntry->nFilterServiceLen, RTL_TEXTENCODING_ASCII_US ); - bIsChart = sModelService.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( XML_MODEL_SERVICE_CHART )); + bIsChart = sModelService == XML_MODEL_SERVICE_CHART; break; } pEntry++; diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 63d113a2d294..d1f960c50dd1 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -418,7 +418,7 @@ void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XCompo const OUString* pSNS( sSNS.getConstArray() ); while( --n > 0 ) { - if( (*pSNS++).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape") ) ) + if( (*pSNS++) == "com.sun.star.drawing.TableShape" ) { mbIsTableShapeSupported = true; break; diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 8a6a850cdee2..590368f5c541 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -203,9 +203,7 @@ void SvXMLMetaExport::_MExport() sDefTarget ); //! define strings for xlink:show values - const XMLTokenEnum eShow = - sDefTarget.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_blank")) - ? XML_NEW : XML_REPLACE; + const XMLTokenEnum eShow = sDefTarget == "_blank" ? XML_NEW : XML_REPLACE; mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, eShow ); SvXMLElementExport aElem( mrExport, diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 77bbd772e847..714dcda08a79 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -847,7 +847,7 @@ OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageType nLa sal_Bool bFound = sal_False; for ( sal_Int32 j=0; j < nCnt && !bFound; j++ ) { - if ( !aCals[j].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gregorian") ) ) + if ( aCals[j] != "gregorian" ) { aCalendar = aCals[j]; bFound = sal_True; diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 992a7c4355b3..bd773beacc55 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -158,7 +158,7 @@ XMLTableExport::XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExp const OUString* pSNS( sSNS.getConstArray() ); while( --n > 0 ) { - if( (*pSNS++).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape") ) ) + if( (*pSNS++) == "com.sun.star.drawing.TableShape" ) { mbExportTables = true; break; diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 14a1b9bf7fd7..73b681e525ec 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -2385,9 +2385,7 @@ XMLNumberedParaContext::XMLNumberedParaContext( i_rImport.GetTextImport()->GetTextListHelper() ); if (m_ListId.isEmpty()) { - OSL_ENSURE( ! i_rImport.GetODFVersion().equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("1.2") ), - "invalid numbered-paragraph: no list-id (1.2)"); + OSL_ENSURE( i_rImport.GetODFVersion() != "1.2", "invalid numbered-paragraph: no list-id (1.2)" ); m_ListId = rTextListsHelper.GetNumberedParagraphListId(m_Level, StyleName); OSL_ENSURE(!m_ListId.isEmpty(), "numbered-paragraph: no ListId"); diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 6ab8937e9a5a..bbf1fd533cf5 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -740,8 +740,7 @@ void XMLTableFormulaImportContext::ProcessAttribute( aValueHelper.ProcessAttribute( nAttrToken, sAttrValue ); break; case XML_TOK_TEXTFIELD_DISPLAY: - if ( sAttrValue.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("formula")) ) + if ( sAttrValue == "formula" ) bIsShowFormula = sal_True; break; default: diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index e3a33042816d..4872a74fa6b6 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -239,7 +239,7 @@ void SAL_CALL XMLTransformerBase::startElement( const OUString& rName, { SvXMLNamespaceMap *pRewindMap = 0; - bool bRect = rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "presentation:show-shape" ) ); + bool bRect = rName == "presentation:show-shape"; (void)bRect; // Process namespace attributes. This must happen before creating the diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 33556e00bb92..bb8fbad5c7e4 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -70,12 +70,12 @@ inline bool getBoolAttr( ::rtl::OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) ); if (!aValue.isEmpty()) { - if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("true") )) + if ( aValue == "true" ) { *pRet = sal_True; return true; } - else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("false") )) + else if ( aValue == "false" ) { *pRet = sal_False; return true; @@ -139,14 +139,8 @@ public: inline bool isEventElement( sal_Int32 nUid, ::rtl::OUString const & rLocalName ) { - return ((XMLNS_SCRIPT_UID == nUid && - (rLocalName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("event") ) || - rLocalName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("listener-event") ))) || - (XMLNS_DIALOGS_UID == nUid && - rLocalName.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("event") ))); + return ((XMLNS_SCRIPT_UID == nUid && (rLocalName == "event" || rLocalName == "listener-event" )) || + (XMLNS_DIALOGS_UID == nUid && rLocalName == "event" )); } void addStyle( diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index 08deae929409..a9589836df51 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -72,12 +72,12 @@ inline bool getBoolAttr( xAttributes->getValueByUidName( uid, rAttrName ) ); if (!aValue.isEmpty()) { - if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("true") )) + if ( aValue == "true" ) { *pRet = sal_True; return true; } - else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("false") )) + else if ( aValue == "false" ) { *pRet = sal_False; return true; diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index 8566529e5295..f04c5e3d5342 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -179,11 +179,11 @@ Reference< xml::input::XElement > LibraryImport::startRootElement( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal namespace!") ), Reference< XInterface >(), Any() ); } - else if (mpLibArray && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("libraries") )) + else if ( mpLibArray && rLocalName == "libraries" ) { return new LibrariesElement( rLocalName, xAttributes, 0, this ); } - else if (mpLibDesc && rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("library") )) + else if ( mpLibDesc && rLocalName == "library" ) { LibDescriptor& aDesc = *mpLibDesc; aDesc.bLink = aDesc.bReadOnly = aDesc.bPasswordProtected = aDesc.bPreload = sal_False; diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 935bd4311345..a70f4a50559c 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -157,7 +157,7 @@ rtl::OUString SEInitializer_NssImpl_getImplementationName () sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName ) throw (cssu::RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SE_SERVICE_NAME )) || ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( NSS_SERVICE_NAME )); + return ( ServiceName == SE_SERVICE_NAME || ServiceName == NSS_SERVICE_NAME ); } cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) |