summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-19 11:32:06 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-19 11:32:20 +0100
commit4c0c23af21db0b72541674c2352df04f48774e81 (patch)
treefe5697fbc7f793de73531e50711c5b39d9825923 /desktop
parent8f2cf65ec9a450441b92ed1f638eda26231a9be7 (diff)
Simplify equalsIgnoreAsciiCaseAscii[L] calls
Change-Id: If5201bd772aed245e8f7f8b900d76ffe4ca57b49
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx8
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx6
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx4
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx4
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx16
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx6
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx4
7 files changed, 24 insertions, 24 deletions
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, &params ))
{
- 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, &params ))
{
- 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, &params ))
{
- 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, &params ))
{
- 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, &params ))
{
- 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, &params ) &&
- 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, &params ))
{
- 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, &params ))
{
- 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(