diff options
| author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 19:49:53 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 20:03:42 +0200 |
| commit | d6bc02f8c4cd0f50f0a2631ac7634dab408efc1f (patch) | |
| tree | b5a12df1fcae025715633469b75ab4c9b6f6d279 /configmgr | |
| parent | 0e1c0587617e0a6e4295a13599e97cdf6d1d2ea9 (diff) | |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/qa/unit/test.cxx | 14 | ||||
| -rw-r--r-- | configmgr/source/components.cxx | 2 | ||||
| -rw-r--r-- | configmgr/source/configurationprovider.cxx | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index 11786fa00e8b..2dc8a9b378d4 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -291,9 +291,7 @@ void RecursiveTest::disposing(css::lang::EventObject const & Source) void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt) throw (css::uno::RuntimeException) { - CPPUNIT_ASSERT( - evt.Source == properties_ && - evt.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label"))); + CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" ); if (count_ > 0) { --count_; step(); @@ -406,7 +404,7 @@ void Test::testKeySet() { RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>= s); - CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("baa"))); + CPPUNIT_ASSERT( s == "baa" ); } void Test::testKeyReset() { @@ -422,7 +420,7 @@ void Test::testKeyReset() { RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>= s); - CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Foo"))); + CPPUNIT_ASSERT( s == "Foo" ); } } @@ -436,8 +434,7 @@ void Test::testSetSetMemberName() { ".uno:FontworkShapeType")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>= s); - CPPUNIT_ASSERT( - s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Shape"))); + CPPUNIT_ASSERT( s == "Fontwork Shape" ); css::uno::Reference< css::container::XNameAccess > access( createUpdateAccess( @@ -468,8 +465,7 @@ void Test::testSetSetMemberName() { ".uno:FontworkShapeType")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>= s); - CPPUNIT_ASSERT( - s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Gallery"))); + CPPUNIT_ASSERT( s == "Fontwork Gallery" ); } void Test::testReadCommands() { diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 54e20e4fe154..5b40d3013cb0 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -221,7 +221,7 @@ Components & Components::getSingleton( } bool Components::allLocales(rtl::OUString const & locale) { - return locale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*")); + return locale == "*"; } rtl::Reference< Node > Components::resolvePathRepresentation( diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 3f41805b446e..940da36918bd 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -259,12 +259,10 @@ Service::createInstanceWithArguments( } } bool update; - if (ServiceSpecifier.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(accessServiceName))) + if ( ServiceSpecifier == accessServiceName ) { update = false; - } else if (ServiceSpecifier.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM(updateAccessServiceName))) + } else if ( ServiceSpecifier == updateAccessServiceName ) { update = true; } else { |