fdo#46808, convert svx::DbGridControl to XComponentContext

3 files changed, 11 insertions, 11 deletions

diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx
index c3f631363b2b..b0d225ccef24 100644
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/svx/inc/svx/fmgridcl.hxx
@@ -105,7 +105,7 @@ class SVX_DLLPUBLIC FmGridControl : public DbGridControl
 
 public:
     FmGridControl(
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&,
         Window* pParent,
         FmXGridPeer* _pPeer,
         WinBits nBits);
diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 156d5b96dd45..7a1951d4dea0 100644
--- a/svx/inc/svx/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
@@ -218,10 +218,10 @@ protected:
     sal_uInt16  m_nPeerCreationLevel;
     sal_Bool    m_bInDraw;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
 
 public:
-    FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
+    FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
     virtual ~FmXGridControl();
 
     // UNO connection
@@ -367,11 +367,11 @@ class SVX_DLLPUBLIC FmXGridPeer :public VCLXWindow
     GridListenerDelegator*  m_pGridListener;
 
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceFactory;
-    ::osl::Mutex                                                                        m_aMutex;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
+    ::osl::Mutex                                                                    m_aMutex;
 
 public:
-    FmXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
+    FmXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
     ~FmXGridPeer();
 
     // spaeter Constructor, immer nach dem realen Constructor zu rufen !
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index d308a9217eaa..9a146353950d 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -221,8 +221,8 @@ private:
     Link            m_aMasterStateProvider;
     Link            m_aMasterSlotExecutor;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >        m_xFormatter;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >    m_xFormatter;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
 
     DbGridColumns   m_aColumns;         // Column description
     NavigationBar   m_aBar;
@@ -365,7 +365,7 @@ protected:
 
 public:
     DbGridControl(
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >,
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >,
         Window* pParent,
         WinBits nBits = WB_BORDER);
 
@@ -496,8 +496,8 @@ public:
     */
     void        ForceHideScrollbars( sal_Bool _bForce );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-        getServiceManager() const { return m_xServiceFactory; }
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+        getContext() const { return m_xContext; }
 
     /// returns <TRUE/> if the text of the given cell can be copied into the clipboard
     sal_Bool    canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId);