summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-03-20 09:29:30 +0200
committerNoel Grandin <noel@peralex.com>2013-04-08 13:53:03 +0200
commit86fdce60115014ddfae05993ef43686c9dbd6004 (patch)
treed50705d5f93fec079e4d676cd2a5a9c50783c6f3 /chart2
parent34da7fbcc643ad209290c6da456dbfb17aeb9ac0 (diff)
fdo#46808, Convert svt::ToolboxController to XComponentContext
.. and all of it's friends Change-Id: I408d9308d1d1a4f8ed0055ac5f4042d729c44d1e
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.cxx6
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 4c5d70df90c8..7713fbe9045f 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -68,16 +68,16 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (u
Reference< uno::XInterface > ShapeToolbarController::create( const Reference< uno::XComponentContext >& xContext )
{
- return *( new ShapeToolbarController( Reference< lang::XMultiServiceFactory >( xContext->getServiceManager(), uno::UNO_QUERY ) ) );
+ return * new ShapeToolbarController( xContext );
}
-ShapeToolbarController::ShapeToolbarController( const Reference< lang::XMultiServiceFactory >& rxFact )
+ShapeToolbarController::ShapeToolbarController( const Reference< uno::XComponentContext >& xContext )
:m_pToolbarController( NULL )
,m_nToolBoxId( 1 )
,m_nSlotId( 0 )
{
osl_atomic_increment( &m_refCount );
- m_xServiceManager = rxFact;
+ m_xContext = xContext;
osl_atomic_decrement( &m_refCount );
}
diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx
index c8c7d83e1fd8..d84155ba0c7a 100644
--- a/chart2/source/controller/main/ShapeToolbarController.hxx
+++ b/chart2/source/controller/main/ShapeToolbarController.hxx
@@ -52,7 +52,7 @@ class ShapeToolbarController : public ::svt::ToolboxController
void operator =( const ShapeToolbarController& );
public:
- ShapeToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFact );
+ ShapeToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ShapeToolbarController();
// ::com::sun::star::uno::XInterface