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

Change-Id: I0499ad7de27b1539e97f01ab8aa0ef2d6713ae76

7 files changed, 14 insertions, 13 deletions

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 5c5772101b81..47ac9d70e189 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -187,7 +187,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s
     DbCellControl* pCellControl = NULL;
     if (m_rParent.IsFilterMode())
     {
-        pCellControl = new DbFilterField(m_rParent.getServiceManager(),*this);
+        pCellControl = new DbFilterField(comphelper::getComponentContext(m_rParent.getServiceManager()),*this);
     }
     else
     {
@@ -2747,9 +2747,9 @@ sal_Bool DbListBox::commitControl()
 
 DBG_NAME(DbFilterField);
 /*************************************************************************/
-DbFilterField::DbFilterField(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,DbGridColumn& _rColumn)
+DbFilterField::DbFilterField(const Reference< ::com::sun::star::uno::XComponentContext >& rxContext,DbGridColumn& _rColumn)
               :DbCellControl(_rColumn)
-              ,OSQLParserClient(_rxORB)
+              ,OSQLParserClient(rxContext)
               ,m_nControlClass(::com::sun::star::form::FormComponentType::TEXTFIELD)
               ,m_bFilterList(sal_False)
               ,m_bFilterListFilled(sal_False)
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 919ec65ea37a..a9ab319df386 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -553,7 +553,7 @@ TYPEINIT1(FmFilterModel, FmParentData);
 //------------------------------------------------------------------------
 FmFilterModel::FmFilterModel(const Reference< XMultiServiceFactory >& _rxFactory)
               :FmParentData(_rxFactory,NULL, ::rtl::OUString())
-              ,OSQLParserClient(_rxFactory)
+              ,OSQLParserClient(comphelper::getComponentContext(_rxFactory))
               ,m_xORB(_rxFactory)
               ,m_pAdapter(NULL)
               ,m_pCurrentItems(NULL)
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 63d04a43a343..14fb1fca3639 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -686,7 +686,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
 
     :m_xSearchCursor(xCursor)
     ,m_xFormatSupplier(xFormatSupplier)
-    ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
+    ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLocaleData().getLocale() )
     ,m_aStringCompare( _rxORB )
     ,m_nCurrentFieldIndex(-2)   // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig'
     ,m_bUsingTextComponents(sal_False)
@@ -723,7 +723,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
         const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
         const InterfaceArray& arrFields, FMSEARCH_MODE eMode)
     :m_xSearchCursor(xCursor)
-    ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
+    ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLocaleData().getLocale() )
     ,m_aStringCompare( _rxORB )
     ,m_nCurrentFieldIndex(-2)   // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig'
     ,m_bUsingTextComponents(sal_True)
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index fb5f281cb80e..8c7fc1e70f98 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -75,6 +75,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/namedvaluecollection.hxx>
+#include <comphelper/processfactory.hxx>
 #include <comphelper/propagg.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
@@ -559,7 +560,7 @@ DBG_NAME( FormController )
 FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB )
                   :FormController_BASE( m_aMutex )
                   ,OPropertySetHelper( FormController_BASE::rBHelper )
-                  ,OSQLParserClient( _rxORB )
+                  ,OSQLParserClient( comphelper::getComponentContext(_rxORB) )
                   ,m_aContext( _rxORB )
                   ,m_aActivateListeners(m_aMutex)
                   ,m_aModifyListeners(m_aMutex)
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index f9eb42ee1e6e..ea3ffc9d847a 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -32,16 +32,16 @@ namespace svxform
     //= OSQLParserClient
     //====================================================================
     //--------------------------------------------------------------------
-    OSQLParserClient::OSQLParserClient(const Reference< XMultiServiceFactory >& _rxORB)
+    OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext)
     {
-        m_xORB = _rxORB;
+        m_xContext = rxContext;
     }
     //--------------------------------------------------------------------
     bool OSQLParserClient::ensureLoaded() const
     {
         if ( !ODbtoolsClient::ensureLoaded() )
             return false;
-         m_xParser = getFactory()->createSQLParser(m_xORB,getParseContext());
+         m_xParser = getFactory()->createSQLParser(m_xContext,getParseContext());
         return m_xParser.is();
     }
 
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 3e56d9895d51..49e8ada74b54 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -708,7 +708,7 @@ class DbFilterField
 
 public:
     TYPEINFO();
-    DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,DbGridColumn& _rColumn);
+    DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn);
     virtual ~DbFilterField();
 
     virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor );
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index d97ee70b53e0..0630eda44450 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -46,14 +46,14 @@ namespace svxform
     {
     private:
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
 
     protected:
         mutable ::rtl::Reference< ::connectivity::simple::ISQLParser >  m_xParser;
 
     protected:
         OSQLParserClient(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext);
         virtual bool ensureLoaded() const;
 
     protected: