diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-02 15:13:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 18:05:00 +0100 |
| commit | 0666e43c45876199ddc71e378554878cca6f0539 (patch) | |
| tree | 39fd44bd26cceaa71a86a06c480d80c8351b5e0f /svl | |
| parent | ebc61e11cdb02f5cc33aeabead3d191eaf0d23d3 (diff) | |
fdo#46808, use service constructor for i18n::CharacterClassification
Change-Id: I0499ad7de27b1539e97f01ab8aa0ef2d6713ae76
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/CppunitTest_svl_urihelper.mk | 4 | ||||
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 5 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index b432734626cc..0312e7ab40dc 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -52,3 +52,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ )) $(eval $(call gb_CppunitTest_use_ure,svl_urihelper)) + +$(eval $(call gb_CppunitTest_use_components,svl_urihelper,\ + i18npool/util/i18npool \ +)) diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 98c25a6d6eb8..52828b99a8e6 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -387,10 +387,7 @@ void Test::testFindFirstURLInText() { { "generic:path", 0, 0, 0 }, { "wfs:", 0, 0, 0 } }; - CharClass charClass( - css::uno::Reference< css::lang::XMultiServiceFactory >( - m_context->getServiceManager(), css::uno::UNO_QUERY_THROW), - com::sun::star::lang::Locale("en", "US", "")); + CharClass charClass( m_context, com::sun::star::lang::Locale("en", "US", "")); for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) { rtl::OUString input(rtl::OUString::createFromAscii(tests[i].input)); xub_StrLen begin = 0; diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 9919cf9d0ad6..8d73e68a19d5 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -234,7 +234,7 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang ) nDefaultSystemCurrencyFormat = NUMBERFORMAT_ENTRY_NOT_FOUND; aLocale = MsLangId::convertLanguageToLocale( eLang ); - pCharClass = new CharClass( xServiceManager, aLocale ); + pCharClass = new CharClass( comphelper::getComponentContext(xServiceManager), aLocale ); xLocaleData.init( xServiceManager, aLocale, eLang ); xCalendar.init( comphelper::getComponentContext(xServiceManager), aLocale ); xTransliteration.init( xServiceManager, eLang, |