summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-05 16:41:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-05 16:41:34 +0100
commitce44bd325ea92465dc64c7733cc88a58fef6ec91 (patch)
tree078b86658de7c6f71b50db964097a7767df9a260
parent9e1d8c9cfa1197c4fa5685240549fed3134e4f7c (diff)
fdo#46808, Adapt i18n::Transliteration UNO service to new style
-rw-r--r--bf_sc/source/core/data/sc_global.cxx4
-rw-r--r--bf_sw/source/core/bastyp/sw_init.cxx2
-rw-r--r--inc/bf_svtools/ondemand.hxx5
3 files changed, 6 insertions, 5 deletions
diff --git a/bf_sc/source/core/data/sc_global.cxx b/bf_sc/source/core/data/sc_global.cxx
index eabcd5577..8e340c80c 100644
--- a/bf_sc/source/core/data/sc_global.cxx
+++ b/bf_sc/source/core/data/sc_global.cxx
@@ -403,10 +403,10 @@ void global_InitAppOptions();
/*N*/ pCaseCollator = new CollatorWrapper( ::legacy_binfilters::getLegacyProcessServiceFactory() );
/*N*/ pCaseCollator->loadDefaultCollator( *pLocale, 0 );
/*N*/ pTransliteration = new ::utl::TransliterationWrapper(
-/*N*/ ::legacy_binfilters::getLegacyProcessServiceFactory(), SC_TRANSLITERATION_IGNORECASE );
+/*N*/ comphelper::getComponentContext( ::legacy_binfilters::getLegacyProcessServiceFactory() ), SC_TRANSLITERATION_IGNORECASE );
/*N*/ pTransliteration->loadModuleIfNeeded( eOfficeLanguage );
/*N*/ pCaseTransliteration = new ::utl::TransliterationWrapper(
-/*N*/ ::legacy_binfilters::getLegacyProcessServiceFactory(), SC_TRANSLITERATION_CASESENSE );
+/*N*/ comphelper::getComponentContext( ::legacy_binfilters::getLegacyProcessServiceFactory() ), SC_TRANSLITERATION_CASESENSE );
/*N*/ pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage );
/*N*/ pScIntlWrapper = new IntlWrapper( ::legacy_binfilters::getLegacyProcessServiceFactory(), *pLocale );
/*N*/
diff --git a/bf_sw/source/core/bastyp/sw_init.cxx b/bf_sw/source/core/bastyp/sw_init.cxx
index e645ab673..e1eeb8ba0 100644
--- a/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/bf_sw/source/core/bastyp/sw_init.cxx
@@ -839,7 +839,7 @@ public:
/*N*/ ::com::sun::star::lang::XMultiServiceFactory > xMSF =
/*N*/ ::legacy_binfilters::getLegacyProcessServiceFactory();
/*N*/
-/*N*/ pTransWrp = new ::utl::TransliterationWrapper( xMSF,
+/*N*/ pTransWrp = new ::utl::TransliterationWrapper( comphelper::getComponentContext( xMSF ),
/*N*/ ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE |
/*N*/ ::com::sun::star::i18n::TransliterationModules_IGNORE_KANA |
/*N*/ ::com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH );
diff --git a/inc/bf_svtools/ondemand.hxx b/inc/bf_svtools/ondemand.hxx
index 007891b6f..7e7981815 100644
--- a/inc/bf_svtools/ondemand.hxx
+++ b/inc/bf_svtools/ondemand.hxx
@@ -34,6 +34,7 @@
#include <unotools/nativenumberwrapper.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/processfactory.hxx>
namespace binfilter
{
@@ -306,7 +307,7 @@ public:
if ( !bValid )
{
if ( !pPtr )
- pPtr = new ::utl::TransliterationWrapper( xSMgr, nType );
+ pPtr = new ::utl::TransliterationWrapper( comphelper::getComponentContext(xSMgr), nType );
pPtr->loadModuleIfNeeded( eLanguage );
bValid = true;
}
@@ -316,7 +317,7 @@ public:
const ::utl::TransliterationWrapper* getForModule( const String& rModule, LanguageType eLang ) const
{
if ( !pPtr )
- pPtr = new ::utl::TransliterationWrapper( xSMgr, nType );
+ pPtr = new ::utl::TransliterationWrapper( comphelper::getComponentContext(xSMgr), nType );
pPtr->loadModuleByImplName( rModule, eLang );
bValid = false; // reforce settings change in get()
return pPtr;