fdo#46808, use service constructor for i18n::CharacterClassificationHEADmaster

6 files changed, 13 insertions, 10 deletions

diff --git a/bf_forms/source/component/forms_Filter.cxx b/bf_forms/source/component/forms_Filter.cxx
index cd589ed0e..87b7ddc93 100644
--- a/bf_forms/source/component/forms_Filter.cxx
+++ b/bf_forms/source/component/forms_Filter.cxx
@@ -39,6 +39,7 @@
 
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
+#include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/numbers.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -85,7 +86,7 @@ namespace frm
     OFilterControl::OFilterControl( const Reference< XMultiServiceFactory >& _rxORB )
         :m_aTextListeners( *this )
         ,m_xORB( _rxORB )
-        ,m_aParser( _rxORB )
+        ,m_aParser( comphelper::getComponentContext(_rxORB) )
         ,m_nControlClass( FormComponentType::TEXTFIELD )
         ,m_bFilterList( sal_False )
         ,m_bMultiLine( sal_False )
diff --git a/bf_svtools/source/numbers/svt_zforlist.cxx b/bf_svtools/source/numbers/svt_zforlist.cxx
index a76965234..420524141 100644
--- a/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -235,7 +235,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( xServiceManager, aLocale );
     xTransliteration.init( xServiceManager, eLang,
diff --git a/bf_svtools/source/syslocale/svt_syslocale.cxx b/bf_svtools/source/syslocale/svt_syslocale.cxx
index c13ac5495..4f10a444e 100644
--- a/bf_svtools/source/syslocale/svt_syslocale.cxx
+++ b/bf_svtools/source/syslocale/svt_syslocale.cxx
@@ -65,7 +65,7 @@ SvtSysLocale_Impl::SvtSysLocale_Impl()
     pLocaleData = new LocaleDataWrapper(
         ::comphelper::getProcessServiceFactory(), rLocale );
     pCharClass = new CharClass(
-        ::comphelper::getProcessServiceFactory(), rLocale );
+        ::comphelper::getProcessComponentContext(), rLocale );
     aSysLocaleOptions.AddListener( *this );
 }
 
diff --git a/bf_sw/source/core/bastyp/sw_calc.cxx b/bf_sw/source/core/bastyp/sw_calc.cxx
index 9bc84cad1..67e31cb89 100644
--- a/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -65,6 +65,7 @@
 #include <dbmgr.hxx>
 #include <docfld.hxx>
 #include <legacysmgr/legacy_binfilters_smgr.hxx>
+#include <comphelper/processfactory.hxx>
 
 namespace binfilter {
 // tippt sich schneller
@@ -266,7 +267,7 @@ static int
 /*N*/       ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang ));
 /*N*/       ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(
 /*N*/                             ::legacy_binfilters::getLegacyProcessServiceFactory() );
-/*N*/       pCharClass = new CharClass( xMSF, aLocale );
+/*N*/       pCharClass = new CharClass( comphelper::getComponentContext(xMSF), aLocale );
 /*N*/       pLclData = new LocaleDataWrapper( xMSF, aLocale );
 /*N*/   }
 /*N*/
diff --git a/bf_sw/source/core/bastyp/sw_init.cxx b/bf_sw/source/core/bastyp/sw_init.cxx
index e1eeb8ba0..f57c646d3 100644
--- a/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/bf_sw/source/core/bastyp/sw_init.cxx
@@ -80,7 +80,7 @@
 #include <bf_svx/forbiddenruleitem.hxx>
 #include <bf_svx/paravertalignitem.hxx>
 #include <bf_svx/pgrditem.hxx>
-
+#include <comphelper/processfactory.hxx>
 
 #include <fmthbsh.hxx>
 #include <fmtanchr.hxx>
@@ -695,7 +695,7 @@ public:
 /*N*/   ::com::sun::star::uno::Reference<
 /*N*/           ::com::sun::star::lang::XMultiServiceFactory > xMSF =
 /*N*/                                   ::legacy_binfilters::getLegacyProcessServiceFactory();
-/*N*/   pAppCharClass = new CharClass( xMSF, rLcl );
+/*N*/   pAppCharClass = new CharClass( comphelper::getComponentContext(xMSF), rLcl );
 /*N*/
 /*N*/   _FrmInit();
 /*N*/   _TextInit();
diff --git a/bf_xmloff/source/style/xmloff_xmlnumfe.cxx b/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
index d8e5ed5a2..bc5d9da84 100644
--- a/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
+++ b/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
@@ -23,6 +23,7 @@
 #include <bf_svtools/zformat.hxx>
 #include <bf_svtools/numuno.hxx>
 #include <bf_svtools/nfsymbol.hxx>
+#include <comphelper/processfactory.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
@@ -233,7 +234,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
 
     if ( pFormatter )
     {
-        pCharClass = new CharClass( pFormatter->GetServiceManager(),
+        pCharClass = new CharClass( comphelper::getComponentContext(pFormatter->GetServiceManager()),
             pFormatter->GetLocale() );
         pLocaleData = new LocaleDataWrapper( pFormatter->GetServiceManager(),
             pFormatter->GetLocale() );
@@ -245,7 +246,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
         // #110680#
         // pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale );
         // pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale );
-        pCharClass = new CharClass( rExport.getServiceFactory(), aLocale );
+        pCharClass = new CharClass( comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
         pLocaleData = new LocaleDataWrapper( rExport.getServiceFactory(), aLocale );
     }
 
@@ -271,7 +272,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
 
     if ( pFormatter )
     {
-        pCharClass = new CharClass( pFormatter->GetServiceManager(),
+        pCharClass = new CharClass( comphelper::getComponentContext(pFormatter->GetServiceManager()),
             pFormatter->GetLocale() );
         pLocaleData = new LocaleDataWrapper( pFormatter->GetServiceManager(),
             pFormatter->GetLocale() );
@@ -283,7 +284,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
         // #110680#
         // pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale );
         // pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale );
-        pCharClass = new CharClass( rExport.getServiceFactory(), aLocale );
+        pCharClass = new CharClass( comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
         pLocaleData = new LocaleDataWrapper( rExport.getServiceFactory(), aLocale );
     }