diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-12-17 01:14:30 -0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-18 10:17:14 +0100 |
| commit | 6cd3118b6370a0314e58692e08b68c4dcb0f922a (patch) | |
| tree | dae1a4f84e21716bd450593719e168d8a3bb2cac /i18npool/source/collator | |
| parent | fdo#72790 Clear interop grab bag name, once grab bag is cleared. (diff) | |
| download | core-6cd3118b6370a0314e58692e08b68c4dcb0f922a.tar.gz core-6cd3118b6370a0314e58692e08b68c4dcb0f922a.zip | |
fdo#54938: Convert i18npool to use cppu::supportsService
Change-Id: I9acc496cd95c8362972fa0c41d35b77fc0715aba
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'i18npool/source/collator')
| -rw-r--r-- | i18npool/source/collator/chaptercollator.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/collator/collatorImpl.cxx | 11 | ||||
| -rw-r--r-- | i18npool/source/collator/collator_unicode.cxx | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index 5193b73c4299..dd2f9ca49d7e 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // prevent internal compiler error with MSVC6SP3 #include <utility> +#include <cppuhelper/supportsservice.hxx> #include <chaptercollator.hxx> #include <com/sun/star/i18n/KCharacterType.hpp> #include <com/sun/star/i18n/ParseResult.hpp> @@ -85,7 +85,7 @@ ChapterCollator::getImplementationName() throw( RuntimeException ) sal_Bool SAL_CALL ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return rServiceName.equalsAscii(cChapCollator); + return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index ee6c37f75e4a..bb02ab2fcd44 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -17,19 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <collatorImpl.hxx> #include <localedata.hxx> #include <com/sun/star/i18n/CollatorOptions.hpp> #include <com/sun/star/i18n/LocaleData.hpp> #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> +#include <cppuhelper/supportsservice.hxx> using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; - namespace com { namespace sun { namespace star { namespace i18n { CollatorImpl::CollatorImpl( const Reference < XComponentContext >& rxContext ) : m_xContext(rxContext) @@ -215,17 +214,15 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS const sal_Char cCollator[] = "com.sun.star.i18n.Collator"; -OUString SAL_CALL -CollatorImpl::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL CollatorImpl::getImplementationName() throw( RuntimeException ) { return OUString::createFromAscii(cCollator); } -sal_Bool SAL_CALL -CollatorImpl::supportsService(const OUString& rServiceName) +sal_Bool SAL_CALL CollatorImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return rServiceName.equalsAscii(cCollator); + return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 52620ac68b20..48f30a182345 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -27,6 +27,7 @@ #include <collator_unicode.hxx> #include <localedata.hxx> #include <com/sun/star/i18n/CollatorOptions.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -250,7 +251,7 @@ Collator_Unicode::getImplementationName() throw( RuntimeException ) sal_Bool SAL_CALL Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return rServiceName.equalsAscii(implementationName); + return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL |