summaryrefslogtreecommitdiff
path: root/framework/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-05-27 15:15:03 +0200
committerNoel Grandin <noel@peralex.com>2013-05-28 08:10:24 +0200
commit052de9c16bc4018d2ae3edc6282267e04d3956ac (patch)
treec3613a6381e0b07aaac11d4340404b6275930719 /framework/source/inc
parent8f3cec9d7a50f33c7be5191656720e463712dd83 (diff)
fdo#46808, Convert some XMultiServiceFactory to XComponentContext
Change-Id: I7223d8e2c962ca90eda08119ed73a034d334329d
Diffstat (limited to 'framework/source/inc')
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx8
-rw-r--r--framework/source/inc/accelerators/documentacceleratorconfiguration.hxx2
-rw-r--r--framework/source/inc/accelerators/globalacceleratorconfiguration.hxx2
-rw-r--r--framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx2
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx6
5 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index f4e77e5841b9..ff30b448d57b 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -85,7 +85,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
//---------------------------------------
/** the global uno service manager.
Must be used to create own needed services. */
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
//---------------------------------------
/** used to:
@@ -108,7 +108,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
public:
- XMLBasedAcceleratorConfiguration( const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR );
+ XMLBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~XMLBasedAcceleratorConfiguration( );
//______________________________________
@@ -304,7 +304,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
//---------------------------------------
/** the global uno service manager.
Must be used to create own needed services. */
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::container::XNameAccess > m_xCfg;
AcceleratorCache m_aPrimaryReadCache;
@@ -322,7 +322,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
public:
- XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR );
+ XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~XCUBasedAcceleratorConfiguration( );
//______________________________________
diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index 2bddcc562031..d6283f0adb94 100644
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
@@ -67,7 +67,7 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration
@param xSMGR
reference to an uno service manager, which is used internaly.
*/
- DocumentAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR);
+ DocumentAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~DocumentAcceleratorConfiguration();
// XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index 2d0e33016ebe..3f8a6c6b00e8 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -54,7 +54,7 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
@param xSMGR
reference to an uno service manager, which is used internaly.
*/
- GlobalAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR);
+ GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext);
//----------------------------------
/** TODO */
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index 8ff1c9426452..816d2d8c8d89 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -65,7 +65,7 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
@param xSMGR
reference to an uno service manager, which is used internaly.
*/
- ModuleAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR);
+ ModuleAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext);
//----------------------------------
/** TODO */
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 30ef101ec93f..7cb7ea075d11 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -119,7 +119,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
//---------------------------------------
/** @short can be used to create on needed uno resources. */
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
//---------------------------------------
/** @short knows the type of provided configuration.
@@ -225,11 +225,11 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
with ::salhelper::SingletonRef template this ctor
cant have any special parameters!
- @param xSMGR
+ @param xContext
points to an uno service manager, which is used internaly
to create own needed uno resources.
*/
- PresetHandler(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+ PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext);
//---------------------------------------
/** @short copy ctor */