diff options
57 files changed, 285 insertions, 297 deletions
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 8efb112500e3..45f1d79c5d34 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -237,36 +237,36 @@ sal_Int32 OStorageHelper::GetXStorageFormat( // TODO/LATER: the filter configuration could be used to detect it later, or batter a special service if ( - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_WRITER_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_DRAW_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_CALC_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_CHART_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_VND_SUN_XML_MATH_ASCII ) + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_DRAW_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_CALC_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_CHART_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_VND_SUN_XML_MATH_ASCII ) ) { nResult = SOFFICE_FILEFORMAT_60; } else if ( - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII ) || - aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII ) + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII ) ) { nResult = SOFFICE_FILEFORMAT_8; diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index a73ec6bf2a81..84f9456b3b7e 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -204,17 +204,13 @@ Service::createInstanceWithArguments( } // For backwards compatibility, allow "nodepath" and "Locale" in any // case: - if (name.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("nodepath"))) - { + if (name.equalsIgnoreAsciiCase("nodepath")) { if (!nodepath.isEmpty() || !(value >>= nodepath) || nodepath.isEmpty()) { badNodePath(); } - } else if (name.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("locale"))) - { + } else if (name.equalsIgnoreAsciiCase("locale")) { if (!locale.isEmpty() || !(value >>= locale) || locale.isEmpty()) { @@ -441,9 +437,7 @@ Factory::createInstanceWithArgumentsAndContext( } // For backwards compatibility, allow "Locale" and (ignored) // "EnableAsync" in any case: - if (name.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("locale"))) - { + if (name.equalsIgnoreAsciiCase("locale")) { if (!locale.isEmpty() || !(value >>= locale) || locale.isEmpty()) { @@ -453,9 +447,7 @@ Factory::createInstanceWithArgumentsAndContext( " one, non-empty, string Locale argument"), 0); } - } else if (!name.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("enableasync"))) - { + } else if (!name.equalsIgnoreAsciiCase("enableasync")) { throw css::uno::Exception( OUString("com.sun.star.configuration.ConfigurationProvider" " factory: unknown argument ") + name, diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 0c3164a47d28..df012107f8f9 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -2311,7 +2311,7 @@ static void pgTypeInfo2ResultSet( if( dataType == com::sun::star::sdbc::DataType::CHAR || ( dataType == com::sun::star::sdbc::DataType::VARCHAR && - xRow->getString(TYPE_NAME+1).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("varchar")) ) ) + xRow->getString(TYPE_NAME+1).equalsIgnoreAsciiCase("varchar") ) ) { // reflect varchar as varchar with upper limit ! //NOTE: the sql spec requires varchar to have an upper limit, however diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index acde1ad88e34..15e9690ec516 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -106,7 +106,7 @@ namespace pq_sdbc_driver static Any isCurrency( const rtl::OUString & typeName ) { - sal_Bool b = typeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("money")); + sal_Bool b = typeName.equalsIgnoreAsciiCase("money"); return Any( &b, getBooleanCppuType() ); } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 86cdb0d125a6..9793bb4b510f 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -115,7 +115,7 @@ namespace { const OUString &rDesktopEnvironment = Application::GetDesktopEnvironment(); - if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) ) + if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde4") ) { #ifdef ENABLE_KDE4 return OUString("com.sun.star.ui.dialogs.KDE4FilePicker" ); @@ -123,7 +123,7 @@ namespace return OUString(); #endif } - else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) ) + else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde") ) { #ifdef ENABLE_KDE return OUString("com.sun.star.ui.dialogs.KDEFilePicker"); @@ -131,7 +131,7 @@ namespace return OUString(); #endif } - else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")) ) + else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("tde") ) { #ifdef ENABLE_TDE return OUString("com.sun.star.ui.dialogs.TDEFilePicker"); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index edf5aeab57d1..8255bfc0bf9f 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1417,7 +1417,7 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect while ( xRs->next() ) { ::rtl::OUString sValue = xRow->getString( 1 ); - if ( !xRow->wasNull() && sValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("View")) ) + if ( !xRow->wasNull() && sValue.equalsIgnoreAsciiCase("View") ) { bSupportsViews = true; break; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 991c5782c214..15878e187574 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -660,7 +660,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) { - if (type.equalsIgnoreAsciiCaseAscii("application")) + if (type.equalsIgnoreAsciiCase("application")) { OUString name; if (!bRemoved) @@ -669,7 +669,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( name = StrTitle::getTitle( ucbContent ); } - if (subType.equalsIgnoreAsciiCaseAscii("vnd.sun.star.uno-component")) + if (subType.equalsIgnoreAsciiCase("vnd.sun.star.uno-component")) { // xxx todo: probe and evaluate component xml description @@ -714,7 +714,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } } - else if (subType.equalsIgnoreAsciiCaseAscii("vnd.sun.star.uno-components")) + else if (subType.equalsIgnoreAsciiCase("vnd.sun.star.uno-components")) { INetContentTypeParameter const * param = params.find(rtl::OString("platform")); if (param == 0 || platform_fits( param->m_sValue )) { @@ -723,7 +723,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( identifier); } } - else if (subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.uno-typelibrary")) + else if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.uno-typelibrary")) { INetContentTypeParameter const * param = params.find(rtl::OString("type")); if (param != 0) { diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 79efef0e23c6..74fd3987133f 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -328,7 +328,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) { - if (type.equalsIgnoreAsciiCaseAscii("application")) + if (type.equalsIgnoreAsciiCase("application")) { OUString name; if (!bRemoved) @@ -338,13 +338,13 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } ::ucbhelper::Content ucbContent( url, xCmdEnv, m_xComponentContext ); - if (subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.configuration-data")) + if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.configuration-data")) { return new PackageImpl( this, url, name, m_xConfDataTypeInfo, false /* data file */, bRemoved, identifier); } - else if (subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.configuration-schema")) { + else if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.configuration-schema")) { return new PackageImpl( this, url, name, m_xConfSchemaTypeInfo, true /* schema file */, bRemoved, identifier); diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 9a4e42141446..131d6ae18c90 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -171,7 +171,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) { - if (type.equalsIgnoreAsciiCaseAscii("application")) + if (type.equalsIgnoreAsciiCase("application")) { OUString name; if (!bRemoved) @@ -180,7 +180,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( url, xCmdEnv, getComponentContext() ); name = StrTitle::getTitle( ucbContent ); } - if (subType.equalsIgnoreAsciiCaseAscii("vnd.sun.star.executable")) + if (subType.equalsIgnoreAsciiCase("vnd.sun.star.executable")) { return new BackendImpl::ExecutablePackageImpl( this, url, name, m_xExecutableTypeInfo, bRemoved, diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 8c0146646f9c..67598b91a96a 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -186,7 +186,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType_, type, subType, ¶ms )) { - if (type.equalsIgnoreAsciiCaseAscii("application")) + if (type.equalsIgnoreAsciiCase("application")) { OUString name; if (!bRemoved) @@ -196,7 +196,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( name = StrTitle::getTitle( ucbContent ); } - if (subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.help")) + if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.help")) { return new PackageImpl( this, url, name, m_xHelpTypeInfo, bRemoved, diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index e6d54f79640d..ef94106f3591 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -415,7 +415,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) { - if (type.equalsIgnoreAsciiCaseAscii("application")) + if (type.equalsIgnoreAsciiCase("application")) { //In case a XPackage is created for a removed extension, we cannot @@ -427,13 +427,13 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( url, xCmdEnv, getComponentContext() ); name = StrTitle::getTitle( ucbContent ); } - if (subType.equalsIgnoreAsciiCaseAscii("vnd.sun.star.package-bundle")) + if (subType.equalsIgnoreAsciiCase("vnd.sun.star.package-bundle")) { return new PackageImpl( this, url, name, m_xBundleTypeInfo, false, bRemoved, identifier); } - else if (subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.legacy-package-bundle")) + else if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.legacy-package-bundle")) { return new PackageImpl( this, url, name, m_xLegacyBundleTypeInfo, true, bRemoved, @@ -1309,9 +1309,9 @@ Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle( OUString type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms ) && - type.equalsIgnoreAsciiCaseAscii("application") && - (subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.uno-component") || - subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.configuration-data"))) + type.equalsIgnoreAsciiCase("application") && + (subType.equalsIgnoreAsciiCase( "vnd.sun.star.uno-component") || + subType.equalsIgnoreAsciiCase( "vnd.sun.star.configuration-data"))) { --upper_end; pret[ upper_end ] = *iPos; @@ -1458,8 +1458,8 @@ void BackendImpl::PackageImpl::scanBundle( const OUString url( makeURL( packageRootURL, fullPath ) ); // check for bundle description: - if (type.equalsIgnoreAsciiCaseAscii("application") && - subType.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.package-bundle-description")) + if (type.equalsIgnoreAsciiCase("application") && + subType.equalsIgnoreAsciiCase( "vnd.sun.star.package-bundle-description")) { // check locale: param = params.find("locale"); diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 70fc93d0c5fe..9007449774a8 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -246,7 +246,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) { - if (type.equalsIgnoreAsciiCaseAscii("application")) + if (type.equalsIgnoreAsciiCase("application")) { OUString dialogURL( makeURL( url, "dialog.xlb" ) ); if (! create_ucb_content( @@ -254,7 +254,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( dialogURL = OUString(); } - if (subType.equalsIgnoreAsciiCaseAscii("vnd.sun.star.basic-library")) + if (subType.equalsIgnoreAsciiCase("vnd.sun.star.basic-library")) { OUString scriptURL( makeURL( url, "script.xlb")); if (! create_ucb_content( @@ -266,7 +266,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( this, url, xCmdEnv, scriptURL, dialogURL, bRemoved, identifier); } - else if (subType.equalsIgnoreAsciiCaseAscii( + else if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.dialog-library")) { return new PackageImpl( this, url, xCmdEnv, diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 9a6c3b2ffc54..534face1a1d8 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -222,9 +222,9 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) { - if (type.equalsIgnoreAsciiCaseAscii("application")) + if (type.equalsIgnoreAsciiCase("application")) { - if (subType.equalsIgnoreAsciiCaseAscii("vnd.sun.star.framework-script")) + if (subType.equalsIgnoreAsciiCase("vnd.sun.star.framework-script")) { OUString lang = OUString("Script"); OUString sParcelDescURL = makeURL( diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index f32c3dd85922..7065dce019f2 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -251,13 +251,13 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star // pretty printing is confusing for some filters so it is disabled by default sal_Bool bPrettyPrint = - (msUserData.getLength() > 6 && msUserData[6].equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true"))); + (msUserData.getLength() > 6 && msUserData[6].equalsIgnoreAsciiCase("true")); // export of <text:number> element for <text:list-item> elements are // needed for certain filters. sal_Bool bExportTextNumberElementForListItems = ( msUserData.getLength() > 7 && - msUserData[7].equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ); + msUserData[7].equalsIgnoreAsciiCase("true") ); // get the base URI, so we can use relative links OUString aBaseURI; diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index d2bc3239260b..706e17e0afd5 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -580,13 +580,13 @@ namespace frm { Any aValue; if ( aText == "1" - || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("TRUE")) - || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("IS TRUE")) + || aText.equalsIgnoreAsciiCase("TRUE") + || aText.equalsIgnoreAsciiCase("IS TRUE") ) { aValue <<= (sal_Int32)STATE_CHECK; } - else if ( aText == "0" || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("FALSE")) ) + else if ( aText == "0" || aText.equalsIgnoreAsciiCase("FALSE") ) { aValue <<= (sal_Int32)STATE_NOCHECK; } diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index cc4d8ddcb52d..d8bb867d3b13 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -309,17 +309,17 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler ) // strip whitespace-only text node for get submission Reference< XDocumentFragment > aFragment = createSubmissionDocument( - xResult, aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("get"))); + xResult, aMethod.equalsIgnoreAsciiCase("get")); // submit result; set encoding, etc. auto_ptr<CSubmission> xSubmission; - if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("PUT"))) + if (aMethod.equalsIgnoreAsciiCase("PUT")) xSubmission = auto_ptr<CSubmission>( new CSubmissionPut( getAction(), aFragment)); - else if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("post"))) + else if (aMethod.equalsIgnoreAsciiCase("post")) xSubmission = auto_ptr<CSubmission>( new CSubmissionPost( getAction(), aFragment)); - else if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("get"))) + else if (aMethod.equalsIgnoreAsciiCase("get")) xSubmission = auto_ptr<CSubmission>( new CSubmissionGet( getAction(), aFragment)); else diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 27bcd4baee84..543c6d0bb515 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -51,8 +51,8 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla try { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); - if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("all")) - || aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("document"))) { + if (aReplace.equalsIgnoreAsciiCase("all") + || aReplace.equalsIgnoreAsciiCase("document")) { Reference< XComponentLoader > xLoader; if (aFrame.is()) xLoader = Reference< XComponentLoader >(aFrame, UNO_QUERY); @@ -74,7 +74,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla return CSubmission::SUCCESS; - } else if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("instance"))) { + } else if (aReplace.equalsIgnoreAsciiCase("instance")) { if (aDocument.is()) { // parse the result stream into a new document Reference< XDocumentBuilder > xBuilder(DocumentBuilder::create(xContext)); @@ -95,7 +95,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla // nothing to replace return CSubmission::UNKNOWN_ERROR; } - } else if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("none"))) { + } else if (aReplace.equalsIgnoreAsciiCase("none")) { // do nothing \o/ return CSubmission::SUCCESS; } diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 8a915c45aa0b..315e42933f34 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -93,11 +93,11 @@ void xforms_booleanFromStringFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlChar *pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); - if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) || - aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("1"))) + if (aString.equalsIgnoreAsciiCase("true") || + aString.equalsIgnoreAsciiCase("1")) xmlXPathReturnTrue(ctxt); - else if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) || - aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("0"))) + else if (aString.equalsIgnoreAsciiCase("false") || + aString.equalsIgnoreAsciiCase("0")) xmlXPathReturnFalse(ctxt); else XP_ERROR(XPATH_NUMBER_ERROR); @@ -225,9 +225,9 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlChar* pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); - if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("version"))) + if (aString.equalsIgnoreAsciiCase("version")) xmlXPathReturnString(ctxt, (xmlChar*)_version); - else if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("conformance-level"))) + else if (aString.equalsIgnoreAsciiCase("conformance-level")) xmlXPathReturnString(ctxt, (xmlChar*)_conformance); else xmlXPathReturnEmptyString(ctxt); diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index d4c6769015aa..4bc8d9d25a48 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -44,13 +44,13 @@ static OUString FilePicker_getSystemPickerServiceName() { #ifdef UNX OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); - if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde"))) + if (aDesktopEnvironment.equalsIgnoreAsciiCase("tde")) return OUString ("com.sun.star.ui.dialogs.TDEFilePicker"); - else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))) + else if (aDesktopEnvironment.equalsIgnoreAsciiCase("kde")) return OUString ("com.sun.star.ui.dialogs.KDEFilePicker"); - else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4"))) + else if (aDesktopEnvironment.equalsIgnoreAsciiCase("kde4")) return OUString ("com.sun.star.ui.dialogs.KDE4FilePicker"); - else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx"))) + else if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) return OUString ("com.sun.star.ui.dialogs.AquaFilePicker"); else return OUString ("com.sun.star.ui.dialogs.SystemFilePicker"); @@ -124,11 +124,11 @@ static OUString FolderPicker_getSystemPickerServiceName() { OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); #ifdef UNX - if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde"))) + if (aDesktopEnvironment.equalsIgnoreAsciiCase("tde")) return OUString("com.sun.star.ui.dialogs.TDEFolderPicker"); - else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))) + else if (aDesktopEnvironment.equalsIgnoreAsciiCase("kde")) return OUString("com.sun.star.ui.dialogs.KDEFolderPicker"); - else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx"))) + else if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) return OUString("com.sun.star.ui.dialogs.AquaFolderPicker"); #endif return OUString("com.sun.star.ui.dialogs.SystemFolderPicker"); diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 8361ff68efc7..c4f49c570293 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -593,7 +593,7 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , const ::rtl::OUString& sTarget) { - if (sTarget.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("_self"))) + if (sTarget.equalsIgnoreAsciiCase("_self")) return xFrame; OSL_ENSURE(sTarget.isEmpty(), "CloseDispatch used for unexpected target. Magic things will happen now .-)"); diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 407d5f267056..07bf13d60cc6 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -180,9 +180,9 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) throw (css::uno::RuntimeException) { - if ( ! aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("OnSaveAsDone")) - && ! aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("OnModeChanged")) - && ! aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("OnTitleChanged"))) + if ( ! aEvent.EventName.equalsIgnoreAsciiCase("OnSaveAsDone") + && ! aEvent.EventName.equalsIgnoreAsciiCase("OnModeChanged") + && ! aEvent.EventName.equalsIgnoreAsciiCase("OnTitleChanged")) return; // SYNCHRONIZED -> @@ -194,10 +194,8 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) // <- SYNCHRONIZED if (aEvent.Source != xOwner - || ((aEvent.EventName.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("OnModeChanged")) - || aEvent.EventName.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("OnTitleChanged"))) + || ((aEvent.EventName.equalsIgnoreAsciiCase("OnModeChanged") + || aEvent.EventName.equalsIgnoreAsciiCase("OnTitleChanged")) && !xOwner.is())) { return; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 0da9cc032d77..23a1210ab19c 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -477,15 +477,15 @@ uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const rtl::O ::rtl::OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) ) + if ( aElementType.equalsIgnoreAsciiCase("menubar") && + aElementName.equalsIgnoreAsciiCase("menubar") ) return m_xMenuBar; - else if (( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) ) || + else if (( aElementType.equalsIgnoreAsciiCase("statusbar") && + aElementName.equalsIgnoreAsciiCase("statusbar") ) || ( m_aStatusBarElement.m_aName == aName )) return m_aStatusBarElement.m_xUIElement; - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) ) + else if ( aElementType.equalsIgnoreAsciiCase("progressbar") && + aElementName.equalsIgnoreAsciiCase("progressbar") ) return m_aProgressBarElement.m_xUIElement; return uno::Reference< ui::XUIElement >(); @@ -1476,13 +1476,13 @@ throw (RuntimeException) parseResourceURL( aName, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL ) + if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL ) { bNotify = m_pToolbarManager->createToolbar( aName ); bMustBeLayouted = m_pToolbarManager->isLayoutDirty(); } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) ) + else if ( aElementType.equalsIgnoreAsciiCase("menubar") && + aElementName.equalsIgnoreAsciiCase("menubar") ) { // #i38743# don't create a menubar if frame isn't top if ( !bInPlaceMenu && !m_xMenuBar.is() && implts_isFrameOrWindowTop( xFrame )) @@ -1533,20 +1533,20 @@ throw (RuntimeException) } aWriteLock.unlock(); } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) && + else if ( aElementType.equalsIgnoreAsciiCase("statusbar") && ( implts_isFrameOrWindowTop(xFrame) || implts_isEmbeddedLayoutManager() )) { implts_createStatusBar( aName ); bNotify = sal_True; } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && + else if ( aElementType.equalsIgnoreAsciiCase("progressbar") && + aElementName.equalsIgnoreAsciiCase("progressbar") && implts_isFrameOrWindowTop(xFrame) ) { implts_createProgressBar(); bNotify = sal_True; } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("dockingwindow"))) + else if ( aElementType.equalsIgnoreAsciiCase("dockingwindow")) { // Add layout manager as listener for docking and other window events uno::Reference< uno::XInterface > xThis( static_cast< OWeakObject* >(this), uno::UNO_QUERY ); @@ -1589,8 +1589,8 @@ throw (RuntimeException) Reference< XComponent > xComponent; parseResourceURL( aName, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) ) + if ( aElementType.equalsIgnoreAsciiCase("menubar") && + aElementName.equalsIgnoreAsciiCase("menubar") ) { if ( !m_bInplaceMenuSet ) { @@ -1599,8 +1599,8 @@ throw (RuntimeException) bNotify = true; } } - else if (( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) ) || + else if (( aElementType.equalsIgnoreAsciiCase("statusbar") && + aElementName.equalsIgnoreAsciiCase("statusbar") ) || ( m_aStatusBarElement.m_aName == aName )) { aWriteLock.unlock(); @@ -1608,21 +1608,21 @@ throw (RuntimeException) bMustBeLayouted = true; bNotify = true; } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) ) + else if ( aElementType.equalsIgnoreAsciiCase("progressbar") && + aElementName.equalsIgnoreAsciiCase("progressbar") ) { aWriteLock.unlock(); implts_createProgressBar(); bMustBeLayouted = true; bNotify = sal_True; } - else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL ) + else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL ) { aWriteLock.unlock(); bNotify = m_pToolbarManager->destroyToolbar( aName ); bMustBeLayouted = m_pToolbarManager->isLayoutDirty(); } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("dockingwindow"))) + else if ( aElementType.equalsIgnoreAsciiCase("dockingwindow")) { uno::Reference< frame::XFrame > xFrame( m_xFrame ); uno::Reference< lang::XMultiServiceFactory > xSMGR( m_xSMGR ); @@ -1664,8 +1664,8 @@ throw (uno::RuntimeException) ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s requested.", aResName.getStr() ); - if (( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) ) || + if (( aElementType.equalsIgnoreAsciiCase("statusbar") && + aElementName.equalsIgnoreAsciiCase("statusbar") ) || ( m_aStatusBarElement.m_aName == rResourceURL )) { implts_readStatusBarState( rResourceURL ); @@ -1693,15 +1693,15 @@ throw (uno::RuntimeException) } } } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) ) + else if ( aElementType.equalsIgnoreAsciiCase("progressbar") && + aElementName.equalsIgnoreAsciiCase("progressbar") ) { aWriteLock.unlock(); implts_showProgressBar(); bResult = true; bNotify = true; } - else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_bVisible ) + else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_bVisible ) { bool bComponentAttached( !m_aModuleIdentifier.isEmpty() ); uno::Reference< uno::XInterface > xThis( m_xToolbarManager, uno::UNO_QUERY ); @@ -1713,7 +1713,7 @@ throw (uno::RuntimeException) bNotify = pToolbarManager->requestToolbar( rResourceURL ); } } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("dockingwindow"))) + else if ( aElementType.equalsIgnoreAsciiCase("dockingwindow")) { uno::Reference< frame::XFrame > xFrame( m_xFrame ); aWriteLock.unlock(); @@ -1798,8 +1798,8 @@ throw (RuntimeException) ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() ); - if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) ) + if ( aElementType.equalsIgnoreAsciiCase("menubar") && + aElementName.equalsIgnoreAsciiCase("menubar") ) { WriteGuard aWriteLock( m_aLock ); m_bMenuVisible = sal_True; @@ -1808,8 +1808,8 @@ throw (RuntimeException) bResult = implts_resetMenuBar(); bNotify = bResult; } - else if (( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) ) || + else if (( aElementType.equalsIgnoreAsciiCase("statusbar") && + aElementName.equalsIgnoreAsciiCase("statusbar") ) || ( m_aStatusBarElement.m_aName == aName )) { WriteGuard aWriteLock( m_aLock ); @@ -1824,12 +1824,12 @@ throw (RuntimeException) bNotify = true; } } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) ) + else if ( aElementType.equalsIgnoreAsciiCase("progressbar") && + aElementName.equalsIgnoreAsciiCase("progressbar") ) { bNotify = bResult = implts_showProgressBar(); } - else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< awt::XWindowListener > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -1842,7 +1842,7 @@ throw (RuntimeException) bMustLayout = pToolbarManager->isLayoutDirty(); } } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("dockingwindow"))) + else if ( aElementType.equalsIgnoreAsciiCase("dockingwindow")) { ReadGuard aReadGuard( m_aLock ); uno::Reference< frame::XFrame > xFrame( m_xFrame ); @@ -1851,7 +1851,7 @@ throw (RuntimeException) impl_setDockingWindowVisibility( comphelper::getComponentContext(xSMGR), xFrame, aElementName, true ); } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("toolpanel"))) + else if ( aElementType.equalsIgnoreAsciiCase("toolpanel")) { ReadGuard aReadGuard( m_aLock ); uno::Reference< frame::XFrame > xFrame( m_xFrame ); @@ -1882,8 +1882,8 @@ throw (RuntimeException) ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() ); - if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) ) + if ( aElementType.equalsIgnoreAsciiCase("menubar") && + aElementName.equalsIgnoreAsciiCase("menubar") ) { WriteGuard aWriteLock( m_aLock ); @@ -1904,8 +1904,8 @@ throw (RuntimeException) } } } - else if (( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) ) || + else if (( aElementType.equalsIgnoreAsciiCase("statusbar") && + aElementName.equalsIgnoreAsciiCase("statusbar") ) || ( m_aStatusBarElement.m_aName == aName )) { WriteGuard aWriteLock( m_aLock ); @@ -1917,12 +1917,12 @@ throw (RuntimeException) bNotify = sal_True; } } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) ) + else if ( aElementType.equalsIgnoreAsciiCase("progressbar") && + aElementName.equalsIgnoreAsciiCase("progressbar") ) { bNotify = implts_hideProgressBar(); } - else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -1932,7 +1932,7 @@ throw (RuntimeException) bNotify = pToolbarManager->hideToolbar( aName ); bMustLayout = pToolbarManager->isLayoutDirty(); } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("dockingwindow"))) + else if ( aElementType.equalsIgnoreAsciiCase("dockingwindow")) { ReadGuard aReadGuard( m_aLock ); uno::Reference< frame::XFrame > xFrame( m_xFrame ); @@ -1958,7 +1958,7 @@ throw (RuntimeException) ::rtl::OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xThis( m_xToolbarManager ); @@ -1996,7 +1996,7 @@ sal_Bool SAL_CALL LayoutManager::floatWindow( const ::rtl::OUString& aName ) throw (RuntimeException) { bool bResult( false ); - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xThis( m_xToolbarManager ); @@ -2017,7 +2017,7 @@ throw (RuntimeException) throw (uno::RuntimeException) { bool bResult( false ); - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xThis( m_xToolbarManager ); @@ -2038,7 +2038,7 @@ throw (uno::RuntimeException) throw (uno::RuntimeException) { bool bResult( false ); - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xThis( m_xToolbarManager ); @@ -2058,7 +2058,7 @@ throw (uno::RuntimeException) void SAL_CALL LayoutManager::setElementSize( const ::rtl::OUString& aName, const awt::Size& aSize ) throw (RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xThis( m_xToolbarManager ); @@ -2077,7 +2077,7 @@ throw (RuntimeException) void SAL_CALL LayoutManager::setElementPos( const ::rtl::OUString& aName, const awt::Point& aPos ) throw (RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager ); @@ -2096,7 +2096,7 @@ throw (RuntimeException) void SAL_CALL LayoutManager::setElementPosSize( const ::rtl::OUString& aName, const awt::Point& aPos, const awt::Size& aSize ) throw (RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager ); @@ -2119,8 +2119,8 @@ throw (RuntimeException) ::rtl::OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) ) + if ( aElementType.equalsIgnoreAsciiCase("menubar") && + aElementName.equalsIgnoreAsciiCase("menubar") ) { ReadGuard aReadLock( m_aLock ); if ( m_xContainerWindow.is() ) @@ -2142,8 +2142,8 @@ throw (RuntimeException) } } } - else if (( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar")) ) || + else if (( aElementType.equalsIgnoreAsciiCase("statusbar") && + aElementName.equalsIgnoreAsciiCase("statusbar") ) || ( m_aStatusBarElement.m_aName == aName )) { if ( m_aStatusBarElement.m_xUIElement.is() ) @@ -2159,13 +2159,13 @@ throw (RuntimeException) } } } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar")) ) + else if ( aElementType.equalsIgnoreAsciiCase("progressbar") && + aElementName.equalsIgnoreAsciiCase("progressbar") ) { if ( m_aProgressBarElement.m_xUIElement.is() ) return m_aProgressBarElement.m_bVisible; } - else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< frame::XLayoutManager > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -2175,7 +2175,7 @@ throw (RuntimeException) if ( pToolbarManager ) return pToolbarManager->isToolbarVisible( aName ); } - else if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("dockingwindow"))) + else if ( aElementType.equalsIgnoreAsciiCase("dockingwindow")) { ReadGuard aReadGuard( m_aLock ); uno::Reference< frame::XFrame > xFrame( m_xFrame ); @@ -2190,7 +2190,7 @@ throw (RuntimeException) sal_Bool SAL_CALL LayoutManager::isElementFloating( const ::rtl::OUString& aName ) throw (RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -2207,7 +2207,7 @@ throw (RuntimeException) sal_Bool SAL_CALL LayoutManager::isElementDocked( const ::rtl::OUString& aName ) throw (RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -2224,7 +2224,7 @@ throw (RuntimeException) ::sal_Bool SAL_CALL LayoutManager::isElementLocked( const ::rtl::OUString& aName ) throw (uno::RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -2241,7 +2241,7 @@ throw (uno::RuntimeException) awt::Size SAL_CALL LayoutManager::getElementSize( const ::rtl::OUString& aName ) throw (RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -2258,7 +2258,7 @@ throw (RuntimeException) awt::Point SAL_CALL LayoutManager::getElementPos( const ::rtl::OUString& aName ) throw (RuntimeException) { - if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { ReadGuard aReadLock( m_aLock ); uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY ); @@ -2986,7 +2986,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even bool bRefreshLayout(false); parseResourceURL( Event.ResourceURL, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { if ( xUICfgListener.is() ) { @@ -2994,7 +2994,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even bRefreshLayout = pToolbarManager->isLayoutDirty(); } } - else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_MENUBAR )) + else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_MENUBAR )) { Reference< XUIElement > xUIElement = implts_findElement( Event.ResourceURL ); Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY ); @@ -3035,7 +3035,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event bool bRefreshLayout(false); parseResourceURL( Event.ResourceURL, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { if ( xToolbarManager.is() ) { @@ -3081,8 +3081,8 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event // No settings anymore, element must be destroyed if ( xContainerWindow.is() && bNoSettings ) { - if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) && - aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar")) ) + if ( aElementType.equalsIgnoreAsciiCase("menubar") && + aElementName.equalsIgnoreAsciiCase("menubar") ) { SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow ); if ( pSysWindow && !m_bInplaceMenuSet ) @@ -3119,7 +3119,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even bool bRefreshLayout(false); parseResourceURL( Event.ResourceURL, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR )) + if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { if ( xToolbarManager.is() ) { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 3f35223ece09..cd6c484cd8dc 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -1146,7 +1146,7 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars() // Check that we only create: // - Toolbars (the statusbar is also member of the persistent window state) // - Not custom toolbars, there are created with their own method (implts_createCustomToolbars) - if ( aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) && + if ( aElementType.equalsIgnoreAsciiCase("toolbar") && aElementName.indexOf( m_aCustomTbxPrefix ) == -1 ) { UIElement aNewToolbar = implts_findToolbar( aName ); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 35e14bc20120..8fe2b042d7d4 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -258,7 +258,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); if (!aUIElementName.isEmpty() && - ( aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xml")))) + ( aExtension.equalsIgnoreAsciiCase("xml"))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; aUIElementData.aName = aUIElementNames[n]; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index e19585ab094d..199a89aeefcc 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -204,7 +204,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); if (!aUIElementName.isEmpty() && - ( aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xml")))) + ( aExtension.equalsIgnoreAsciiCase("xml"))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; aUIElementData.aName = aUIElementNames[n]; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index d10965ec1531..7c16b83ea369 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -248,11 +248,11 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const ::rtl::OUString // SAFE addGenericInfoToCache(); - if ( rCommandURL.equalsIgnoreAsciiCaseAscii( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST )) + if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST )) return makeAny( m_aCommandImageList ); - else if ( rCommandURL.equalsIgnoreAsciiCaseAscii( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) + else if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) return makeAny( m_aCommandRotateImageList ); - else if ( rCommandURL.equalsIgnoreAsciiCaseAscii( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) + else if ( rCommandURL.equalsIgnoreAsciiCase( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) return makeAny( m_aCommandMirrorImageList ); else return Any(); diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index b44e29bebb75..f91cc1eb7c26 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -715,7 +715,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement case XML_NODE_TYPE_ELEMENT: { XMLElement *pElement = ( XMLElement * ) pCur; - if( !pElement->GetName().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("comment")) ){ + if( !pElement->GetName().equalsIgnoreAsciiCase("comment") ){ buffer.append( OUString("\\<") ); buffer.append( pElement->GetName() ); if ( pElement->GetAttributeList()){ diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index c4a88b384842..b39ffb6d0b4f 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -308,15 +308,15 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P aFontDesc.Name = aBulletFontName; aFontDesc.Pitch = nBulletFontPitch; aFontDesc.Family = nBulletFontFamily; - if ( aBulletFontName.equalsIgnoreAsciiCaseAscii("Wingdings") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Wingdings 2") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Wingdings 3") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Monotype Sorts") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Monotype Sorts 2") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Webdings") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("StarBats") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("StarMath") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("ZapfDingbats") ) { + if ( aBulletFontName.equalsIgnoreAsciiCase("Wingdings") || + aBulletFontName.equalsIgnoreAsciiCase("Wingdings 2") || + aBulletFontName.equalsIgnoreAsciiCase("Wingdings 3") || + aBulletFontName.equalsIgnoreAsciiCase("Monotype Sorts") || + aBulletFontName.equalsIgnoreAsciiCase("Monotype Sorts 2") || + aBulletFontName.equalsIgnoreAsciiCase("Webdings") || + aBulletFontName.equalsIgnoreAsciiCase("StarBats") || + aBulletFontName.equalsIgnoreAsciiCase("StarMath") || + aBulletFontName.equalsIgnoreAsciiCase("ZapfDingbats") ) { aFontDesc.CharSet = RTL_TEXTENCODING_SYMBOL; bSymbolFont = sal_True; } diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 8f8aa49516d8..dfa19ba4c013 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2455,7 +2455,7 @@ void XmlStreamObject::implDumpText( TextInputStream& rTextStrm ) matching start/end elements and the element text on the same line. */ OUStringBuffer aOldStartElem; // special handling for VML - bool bIsVml = InputOutputHelper::getFileNameExtension( maSysFileName ).equalsIgnoreAsciiCaseAscii("vml"); + bool bIsVml = InputOutputHelper::getFileNameExtension( maSysFileName ).equalsIgnoreAsciiCase("vml"); while( !rTextStrm.isEof() ) { diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx index 1e372a6a1454..9c9b81f07559 100644 --- a/oox/source/dump/pptxdumper.cxx +++ b/oox/source/dump/pptxdumper.cxx @@ -48,40 +48,40 @@ RootStorageObject::RootStorageObject( const DumperBase& rParent ) void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName ) { OUString aExt = InputOutputHelper::getFileNameExtension( rStrmName ); - if( aExt.equalsIgnoreAsciiCaseAscii("pptx") || - aExt.equalsIgnoreAsciiCaseAscii("potx") ) + if( aExt.equalsIgnoreAsciiCase("pptx") || + aExt.equalsIgnoreAsciiCase("potx") ) { Dumper( getContext(), rxStrm, rSysFileName ).dump(); } #ifdef FIXME else if( - aExt.equalsIgnoreAsciiCaseAscii("xlsb") || - aExt.equalsIgnoreAsciiCaseAscii("xlsm") || - aExt.equalsIgnoreAsciiCaseAscii("xlsx") || - aExt.equalsIgnoreAsciiCaseAscii("xltm") || - aExt.equalsIgnoreAsciiCaseAscii("xltx") ) + aExt.equalsIgnoreAsciiCase("xlsb") || + aExt.equalsIgnoreAsciiCase("xlsm") || + aExt.equalsIgnoreAsciiCase("xlsx") || + aExt.equalsIgnoreAsciiCase("xltm") || + aExt.equalsIgnoreAsciiCase("xltx") ) { ::oox::dump::xlsb::Dumper( getContext(), rxStrm, rSysFileName ).dump(); } else if( - aExt.equalsIgnoreAsciiCaseAscii("xla") || - aExt.equalsIgnoreAsciiCaseAscii("xlc") || - aExt.equalsIgnoreAsciiCaseAscii("xlm") || - aExt.equalsIgnoreAsciiCaseAscii("xls") || - aExt.equalsIgnoreAsciiCaseAscii("xlt") || - aExt.equalsIgnoreAsciiCaseAscii("xlw") ) + aExt.equalsIgnoreAsciiCase("xla") || + aExt.equalsIgnoreAsciiCase("xlc") || + aExt.equalsIgnoreAsciiCase("xlm") || + aExt.equalsIgnoreAsciiCase("xls") || + aExt.equalsIgnoreAsciiCase("xlt") || + aExt.equalsIgnoreAsciiCase("xlw") ) { ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump(); } #endif else if( - aExt.equalsIgnoreAsciiCaseAscii("xml") || - aExt.equalsIgnoreAsciiCaseAscii("vml") || - aExt.equalsIgnoreAsciiCaseAscii("rels") ) + aExt.equalsIgnoreAsciiCase("xml") || + aExt.equalsIgnoreAsciiCase("vml") || + aExt.equalsIgnoreAsciiCase("rels") ) { XmlStreamObject( *this, rxStrm, rSysFileName ).dump(); } - else if( aExt.equalsIgnoreAsciiCaseAscii("bin") ) + else if( aExt.equalsIgnoreAsciiCase("bin") ) { if( rStrgPath == "ppt" && rStrmName == "vbaProject.bin" ) { diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 5350d5846bf1..6d44cf07f000 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -128,15 +128,15 @@ bool XmlStream::AttributeList::attribute( int token, bool def ) const if( find != attrs.end()) { const OUString sValue = find->second; - if( sValue.equalsIgnoreAsciiCaseAscii("true") || - sValue.equalsIgnoreAsciiCaseAscii("on") || - sValue.equalsIgnoreAsciiCaseAscii("t") || - sValue.equalsIgnoreAsciiCaseAscii("1") ) + if( sValue.equalsIgnoreAsciiCase("true") || + sValue.equalsIgnoreAsciiCase("on") || + sValue.equalsIgnoreAsciiCase("t") || + sValue.equalsIgnoreAsciiCase("1") ) return true; - if( sValue.equalsIgnoreAsciiCaseAscii("false") || - sValue.equalsIgnoreAsciiCaseAscii("off") || - sValue.equalsIgnoreAsciiCaseAscii("f") || - sValue.equalsIgnoreAsciiCaseAscii("0") ) + if( sValue.equalsIgnoreAsciiCase("false") || + sValue.equalsIgnoreAsciiCase("off") || + sValue.equalsIgnoreAsciiCase("f") || + sValue.equalsIgnoreAsciiCase("0") ) return false; SAL_WARN( "oox.xmlstream", "Cannot convert \'" << sValue << "\' to bool." ); } diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 813b78b6d08a..bbb8a5f249a7 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2516,21 +2516,21 @@ ControlModelBase* EmbeddedControl::createModelFromGuid( const OUString& rClassId { OUString aClassId = rClassId;//.toAsciiUpperCase(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_COMMANDBUTTON ) ) return &createModel< AxCommandButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_LABEL ) ) return &createModel< AxLabelModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_IMAGE ) ) return &createModel< AxImageModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_TOGGLEBUTTON ) ) return &createModel< AxToggleButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_CHECKBOX ) ) return &createModel< AxCheckBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_OPTIONBUTTON ) ) return &createModel< AxOptionButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_TEXTBOX ) ) return &createModel< AxTextBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_LISTBOX ) ) return &createModel< AxListBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_COMBOBOX ) ) return &createModel< AxComboBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_SPINBUTTON ) ) return &createModel< AxSpinButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_SCROLLBAR ) ) return &createModel< AxScrollBarModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_FRAME ) ) return &createModel< AxFrameModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( COMCTL_GUID_SCROLLBAR_60 ) ) return &createModel< ComCtlScrollBarModel >( COMCTL_VERSION_60 ); - if( aClassId.equalsIgnoreAsciiCaseAscii( HTML_GUID_SELECT ) ) return &createModel< HtmlSelectModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( HTML_GUID_TEXTBOX ) ) return &createModel< HtmlTextBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_COMMANDBUTTON ) ) return &createModel< AxCommandButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_LABEL ) ) return &createModel< AxLabelModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_IMAGE ) ) return &createModel< AxImageModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_TOGGLEBUTTON ) ) return &createModel< AxToggleButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_CHECKBOX ) ) return &createModel< AxCheckBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_OPTIONBUTTON ) ) return &createModel< AxOptionButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_TEXTBOX ) ) return &createModel< AxTextBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_LISTBOX ) ) return &createModel< AxListBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_COMBOBOX ) ) return &createModel< AxComboBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_SPINBUTTON ) ) return &createModel< AxSpinButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_SCROLLBAR ) ) return &createModel< AxScrollBarModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_FRAME ) ) return &createModel< AxFrameModel >(); + if( aClassId.equalsIgnoreAsciiCase( COMCTL_GUID_SCROLLBAR_60 ) ) return &createModel< ComCtlScrollBarModel >( COMCTL_VERSION_60 ); + if( aClassId.equalsIgnoreAsciiCase( HTML_GUID_SELECT ) ) return &createModel< HtmlSelectModel >(); + if( aClassId.equalsIgnoreAsciiCase( HTML_GUID_TEXTBOX ) ) return &createModel< HtmlTextBoxModel >(); mxModel.reset(); return 0; diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 6c311e251c0a..ad6eaf5b438a 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -779,12 +779,12 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib, while( !bExitLoop && !aFrameTextStrm.isEof() ) { aLine = aFrameTextStrm.readLine().trim(); - bExitLoop = aLine.equalsIgnoreAsciiCaseAscii( "End" ); + bExitLoop = aLine.equalsIgnoreAsciiCase( "End" ); if( !bExitLoop && VbaHelper::extractKeyValue( aKey, aValue, aLine ) ) { - if( aKey.equalsIgnoreAsciiCaseAscii( "Caption" ) ) + if( aKey.equalsIgnoreAsciiCase( "Caption" ) ) mxCtrlModel->importProperty( XML_Caption, lclGetQuotedString( aValue ) ); - else if( aKey.equalsIgnoreAsciiCaseAscii( "Tag" ) ) + else if( aKey.equalsIgnoreAsciiCase( "Tag" ) ) mxSiteModel->importProperty( XML_Tag, lclGetQuotedString( aValue ) ); } } diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index f936b9040512..91be35621d3d 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -380,7 +380,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap if( !bExitLoop && VbaHelper::extractKeyValue( aKey, aValue, aLine ) ) { sal_Int32 nType = ModuleType::UNKNOWN; - if( aKey.equalsIgnoreAsciiCaseAscii( "Document" ) ) + if( aKey.equalsIgnoreAsciiCase( "Document" ) ) { nType = ModuleType::DOCUMENT; // strip automation server version from module names @@ -388,11 +388,11 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap if( nSlashPos >= 0 ) aValue = aValue.copy( 0, nSlashPos ); } - else if( aKey.equalsIgnoreAsciiCaseAscii( "Module" ) ) + else if( aKey.equalsIgnoreAsciiCase( "Module" ) ) nType = ModuleType::NORMAL; - else if( aKey.equalsIgnoreAsciiCaseAscii( "Class" ) ) + else if( aKey.equalsIgnoreAsciiCase( "Class" ) ) nType = ModuleType::CLASS; - else if( aKey.equalsIgnoreAsciiCaseAscii( "BaseClass" ) ) + else if( aKey.equalsIgnoreAsciiCase( "BaseClass" ) ) nType = ModuleType::FORM; if( (nType != ModuleType::UNKNOWN) && !aValue.isEmpty() ) diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 62c17447fd12..231c87f34759 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -54,7 +54,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon if ( !sTemp.isEmpty() ) { INetURLObject aURL(sTemp); - if ( aURL.GetExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("orp")) ) + if ( aURL.GetExtension().equalsIgnoreAsciiCase("orp") ) return ::rtl::OUString("StarBaseReport"); else { diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index f04d983d2572..53713923acb5 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -336,7 +336,7 @@ String XclControlHelper::ExtractFromMacroDescriptor( const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* /*pShell*/ ) { if( (!rDescriptor.ScriptCode.isEmpty()) && - rDescriptor.ScriptType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")) && + rDescriptor.ScriptType.equalsIgnoreAsciiCase("Script") && rDescriptor.ListenerType.equalsAscii( spTbxListenerData[ eEventType ].mpcListenerType ) && rDescriptor.EventMethod.equalsAscii( spTbxListenerData[ eEventType ].mpcEventMethod ) ) return XclTools::GetXclMacroName( rDescriptor.ScriptCode ); diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index f0a5f7d1e0c0..8b3bb9b7a3e4 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -99,9 +99,9 @@ void ShapeAnchor::importAnchor( sal_Int32 nElement, const AttributeList& rAttrib OUString sEditAs = rAttribs.getXString( XML_editAs, OUString() ); if ( !sEditAs.isEmpty() ) { - if ( sEditAs.equalsIgnoreAsciiCaseAscii("absolute" ) ) + if ( sEditAs.equalsIgnoreAsciiCase("absolute" ) ) meEditAs = ANCHOR_ABSOLUTE; - else if ( sEditAs.equalsIgnoreAsciiCaseAscii("oneCell") ) + else if ( sEditAs.equalsIgnoreAsciiCase("oneCell") ) meEditAs = ANCHOR_ONECELL; } } diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 261473dfeb5d..22f4a6bbd2ea 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -674,7 +674,7 @@ void VmlDrawing::notifyXShapeInserted( const Reference< XShape >& rxShape, sal_uInt32 VmlDrawing::convertControlTextColor( const OUString& rTextColor ) const { // color attribute not present or 'auto' - use passed default color - if( rTextColor.isEmpty() || rTextColor.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "auto" ) ) ) + if( rTextColor.isEmpty() || rTextColor.equalsIgnoreAsciiCase( "auto" ) ) return AX_SYSCOLOR_WINDOWTEXT; if( rTextColor[ 0 ] == '#' ) diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index efe95146b15f..3adbfdbd3ac4 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -1044,7 +1044,7 @@ const FunctionInfo* FunctionProvider::getFuncInfoFromMacroName( const OUString& FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const { -#define OOX_XLS_IS_LIBNAME( libname, basename ) (libname.equalsIgnoreAsciiCaseAscii( basename ".XLA" ) || libname.equalsIgnoreAsciiCaseAscii( basename ".XLAM" )) +#define OOX_XLS_IS_LIBNAME( libname, basename ) (libname.equalsIgnoreAsciiCase( basename ".XLA" ) || libname.equalsIgnoreAsciiCase( basename ".XLAM" )) // the EUROTOOL add-in containing the EUROCONVERT function if( OOX_XLS_IS_LIBNAME( rLibraryName, "EUROTOOL" ) ) diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index a26137dad4e6..8612e0d96c80 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1848,7 +1848,7 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts, catch( Exception& ) { // BIFF2-BIFF4 stores standard format explicitly in stream - if( rFmtCode.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "general" ) ) ) + if( rFmtCode.equalsIgnoreAsciiCase( "general" ) ) { nIndex = lclCreatePredefinedFormat( rxNumFmts, 0, rToLocale ); } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 0825e457cad5..9afb8724653e 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -266,7 +266,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW ); rtl::OUString sImplementationName = xServiceInfo->getImplementationName(); - if( sImplementationName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.SvxShapeCollection")) ) + if( sImplementationName.equalsIgnoreAsciiCase("com.sun.star.drawing.SvxShapeCollection") ) { uno::Reference< drawing::XShapes > xShapes( aSelection, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xShapes, uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 0b2282e363b0..b444c2f836a8 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -362,7 +362,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv util::ElementChange aChange = rEvent.Changes[ 0 ]; OUString sOperation; aChange.Accessor >>= sOperation; - if( !sOperation.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cell-change")) ) + if( !sOperation.equalsIgnoreAsciiCase("cell-change") ) return; if( nCount == 1 ) @@ -385,7 +385,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv aChange.Accessor >>= sOperation; uno::Reference< table::XCellRange > xRangeObj; aChange.ReplacedElement >>= xRangeObj; - if( xRangeObj.is() && sOperation.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cell-change")) ) + if( xRangeObj.is() && sOperation.equalsIgnoreAsciiCase("cell-change") ) { uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable( xRangeObj, uno::UNO_QUERY ); if( xCellRangeAddressable.is() ) diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index b89f3cd46416..91dfba73542a 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -312,10 +312,10 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) std::vector< rtl::OUString >::iterator it; for( it = aTokens.begin(); it != aTokens.end(); ++it ) { - if( (*it).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Bold")) ) + if( (*it).equalsIgnoreAsciiCase("Bold") ) bBold = sal_True; - if( (*it).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Italic")) ) + if( (*it).equalsIgnoreAsciiCase("Italic") ) bItalic = sal_True; } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 43f7d5076c79..836f2aa38ef3 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -567,7 +567,7 @@ public: { // #163288# treat "General" as "Standard" format sal_Int32 nNewIndex = 0; - if( !rFormat.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "General" ) ) ) + if( !rFormat.equalsIgnoreAsciiCase( "General" ) ) { lang::Locale aLocale; uno::Reference< beans::XPropertySet > xNumProps = getNumberProps(); diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 674885b4334d..1804e3e61b6e 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -144,11 +144,11 @@ namespace basprov if ( xUriRef.is() ) { ::rtl::OUString aScheme = xUriRef->getScheme(); - if ( aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("file")) ) + if ( aScheme.equalsIgnoreAsciiCase("file") ) { aFileURL = aLinkURL; } - else if ( aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg")) ) + else if ( aScheme.equalsIgnoreAsciiCase("vnd.sun.star.pkg") ) { ::rtl::OUString aAuthority = xUriRef->getAuthority(); if ( aAuthority.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.expand:" ) ) ) diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index a25f1518c14e..10b3dac449ca 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -386,7 +386,7 @@ SdFilterDetect::~SdFilterDetect() if( SvtModuleOptions().IsImpress() ) { INetURLObject aCheckURL( aFileName ); - if( aCheckURL.getExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cgm")) ) + if( aCheckURL.getExtension().equalsIgnoreAsciiCase("cgm") ) { sal_uInt8 n8; pStm->Seek( STREAM_SEEK_TO_BEGIN ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 15828e19641b..44b4e4c122ca 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1191,8 +1191,8 @@ sal_Bool SfxObjectShell::SaveTo_Impl // use UCB for case sensitive/insensitive file name comparison if ( pMedium - && !pMedium->GetName().equalsIgnoreAsciiCaseAscii("private:stream") - && !rMedium.GetName().equalsIgnoreAsciiCaseAscii("private:stream") + && !pMedium->GetName().equalsIgnoreAsciiCase("private:stream") + && !rMedium.GetName().equalsIgnoreAsciiCase("private:stream") && ::utl::UCBContentHelper::EqualURLs( pMedium->GetName(), rMedium.GetName() ) ) { bStoreToSameLocation = sal_True; diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 69ed0c3d7ff7..f8b930710584 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -1079,7 +1079,7 @@ bool SlideImpl::applyInitialShapeAttributes( for( ::std::size_t j=0; j<nShapePropSize; ++j ) { bool bVisible=false; - if( rShapeProps[j].Name.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("visibility")) && + if( rShapeProps[j].Name.equalsIgnoreAsciiCase("visibility") && extractValue( bVisible, rShapeProps[j].Value, pShape, diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 0e45dac82284..5d3c1c01b468 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -408,14 +408,14 @@ namespace slideshow // we also take the strings "true" and "false", // as well as "on" and "off" here - if( aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) || - aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("on")) ) + if( aString.equalsIgnoreAsciiCase("true") || + aString.equalsIgnoreAsciiCase("on") ) { o_rValue = true; return true; } - if( aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) || - aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("off")) ) + if( aString.equalsIgnoreAsciiCase("false") || + aString.equalsIgnoreAsciiCase("off") ) { o_rValue = false; return true; diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 9acc68745ddc..dc762a73ace0 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -132,8 +132,8 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA // allow to use other ucp's // if ( !isLocalNotFile_Impl( aURL ) ) - if ( aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg")) - || aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip")) + if ( aURL.equalsIgnoreAsciiCase("vnd.sun.star.pkg") + || aURL.equalsIgnoreAsciiCase("vnd.sun.star.zip") || ::utl::UCBContentHelper::IsDocument( aURL ) ) { throw lang::IllegalArgumentException( diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index d5f01f601143..becc31548872 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -703,7 +703,7 @@ INetContentType INetContentTypes::GetContentType(OUString const & rTypeName) return pEntry ? pEntry->m_eTypeID : Registration::GetContentType(aType); } else - return rTypeName.equalsIgnoreAsciiCaseAscii(CONTENT_TYPE_STR_X_STARMAIL) ? + return rTypeName.equalsIgnoreAsciiCase(CONTENT_TYPE_STR_X_STARMAIL) ? CONTENT_TYPE_X_STARMAIL : CONTENT_TYPE_UNKNOWN; // the content type "x-starmail" has no sub type } @@ -774,7 +774,7 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) OUString aToken = rURL.getToken(0, ':'); if (!aToken.isEmpty()) { - if (aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_FILE)) + if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_FILE)) if (rURL[ rURL.getLength() - 1 ] == (sal_Unicode)'/') // folder if (rURL.getLength() > RTL_CONSTASCII_LENGTH("file:///")) if (WildCard("*/{*}/").Matches(rURL)) // special folder @@ -796,10 +796,10 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) { //@@@ } - else if (aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_HTTP) - || aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_HTTPS)) + else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_HTTP) + || aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_HTTPS)) eTypeID = CONTENT_TYPE_TEXT_HTML; - else if (aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_PRIVATE)) + else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_PRIVATE)) { OUString aSecondPart = rURL.getToken(1, ':'); aToken = aSecondPart.getToken(0, '/'); @@ -833,7 +833,7 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) else if (aToken.equalsAscii(INETTYPE_URL_SUB_HELPID)) eTypeID = CONTENT_TYPE_APP_STARHELP; } - else if (aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_COMPONENT)) + else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_COMPONENT)) { aToken = rURL.getToken(1, ':'); // aToken now equals ss / * aToken = aToken.getToken(0, '/'); @@ -856,11 +856,11 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) } } } - else if (aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_MAILTO)) + else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_MAILTO)) eTypeID = CONTENT_TYPE_APP_VND_OUTTRAY; - else if (aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_MACRO)) + else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_MACRO)) eTypeID = CONTENT_TYPE_APP_MACRO; - else if (aToken.equalsIgnoreAsciiCaseAscii(INETTYPE_URL_PROT_DATA)) + else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_DATA)) { OUString aSecondPart = rURL.getToken(1, ':'); aToken = aSecondPart.getToken(0, ','); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index daa0d5edfbc8..4baf9166a6c3 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -310,7 +310,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR { INetURLObject aThmURL( xContentAccess->queryContentIdentifierString() ); - if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("thm"))) + if(aThmURL.GetExtension().equalsIgnoreAsciiCase("thm")) { INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( s_sSDG_EXT ); INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( s_sSDV_EXT ); diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 2a8ae2e5c77c..e72a084e741d 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -46,8 +46,8 @@ sal_uInt16 SwApplet_Impl::GetOptionType( const ::rtl::OUString& rName, sal_Bool { case 'A': case 'a': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_align ) || - rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_alt ) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_align ) || + rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_alt ) ) nType = SWHTML_OPTTYPE_IGNORE; else if( bApplet && (rName.equalsIgnoreAsciiCaseAscii( sHTML_O_archive ) || @@ -56,32 +56,32 @@ sal_uInt16 SwApplet_Impl::GetOptionType( const ::rtl::OUString& rName, sal_Bool break; case 'C': case 'c': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_class ) || - (bApplet && (rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_code ) || - rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_codebase ))) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_class ) || + (bApplet && (rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_code ) || + rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_codebase ))) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'H': case 'h': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_height ) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_height ) ) nType = SWHTML_OPTTYPE_SIZE; - else if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_hspace ) || - (!bApplet && rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SW_HTML_O_Hidden )) ) + else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_hspace ) || + (!bApplet && rName.equalsIgnoreAsciiCase( OOO_STRING_SW_HTML_O_Hidden )) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'I': case 'i': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_id ) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_id ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'M': case 'm': - if( bApplet && rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_mayscript ) ) + if( bApplet && rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_mayscript ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'N': case 'n': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_name ) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_name ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'O': @@ -91,23 +91,23 @@ sal_uInt16 SwApplet_Impl::GetOptionType( const ::rtl::OUString& rName, sal_Bool break; case 'S': case 's': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_style ) || - (!bApplet && rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_src )) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_style ) || + (!bApplet && rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_src )) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'T': case 't': - if( !bApplet && rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_type ) ) + if( !bApplet && rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_type ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'V': case 'v': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_vspace ) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_vspace ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'W': case 'w': - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_width ) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_width ) ) nType = SWHTML_OPTTYPE_SIZE; break; } @@ -158,13 +158,13 @@ sal_Bool SwApplet_Impl::CreateApplet( const ::rtl::OUString& rBaseURL ) { const SvCommand& rArg = aCommandList[i]; const ::rtl::OUString& rName = rArg.GetCommand(); - if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_code ) ) + if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_code ) ) aCode = rArg.GetArgument(); - else if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_codebase ) ) + else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_codebase ) ) aCodeBase = INetURLObject::GetAbsURL( rBaseURL, rArg.GetArgument() ); - else if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_name ) ) + else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_name ) ) aName = rArg.GetArgument(); - else if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_mayscript ) ) + else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_mayscript ) ) bMayScript = sal_True; } diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index cb6668d85194..e0e62b0f8ae9 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -993,8 +993,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, // (compatibility) *ppNewComp = new ::toolkit::XThrobber; } - else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("tabpagecontainer") ) ) + else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase( + "tabpagecontainer" ) ) { pNewWindow = new TabControl( pParent, nWinBits ); *ppNewComp = new VCLXTabPageContainer; diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index 605cb042717d..d2f5437abc4d 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -499,9 +499,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, rValue >>= aValue; // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType - sal_Bool bFolder = - aValue.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM( "collection" ) ); + sal_Bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" ); (*m_xProps)[ rtl::OUString("IsFolder") ] = PropertyValue( uno::makeAny( bFolder ), true ); diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 025373488f71..3a8819382cf4 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -1150,7 +1150,7 @@ GtkPrintDialog::impl_readFromSettings() } const gboolean bOldCollate(m_pWrapper->print_settings_get_collate(pSettings)); - const bool bCollate(aCollate.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true"))); + const bool bCollate(aCollate.equalsIgnoreAsciiCase("true")); if (bOldCollate != bCollate) { bChanged = true; diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index b27a149799b3..c7f30edeabe9 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -210,7 +210,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & if ( aType == "bool" ) { - sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); + sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCase("true"); m_aGetValue <<= bValue; m_aGetValueCondition.set(); |