diff options
| author | Noel Grandin <noel@peralex.com> | 2013-06-04 09:45:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-05 08:13:22 +0200 |
| commit | c23be036a6b71324302aa8acd3858ea725c2ada6 (patch) | |
| tree | 07cef6aa529e0aed660af046f4f2267ea7e3d2d0 /svtools | |
| parent | c0654ce02272499236f7b43920e288c5fff34d4f (diff) | |
fdo#46808, Convert some XMultiservice in framework module
Change-Id: Id4dd0bafd40cf96271527c9c970c4ab31527644c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/popupmenucontrollerbase.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index c369bf8a2814..41d24b678c7f 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -60,14 +60,13 @@ struct PopupMenuControllerBaseDispatchInfo : mxDispatch( xDispatch ), maURL( rURL ), maArgs( rArgs ) {} }; -PopupMenuControllerBase::PopupMenuControllerBase( const Reference< XMultiServiceFactory >& xServiceManager ) : +PopupMenuControllerBase::PopupMenuControllerBase( const Reference< XComponentContext >& xContext ) : ::comphelper::OBaseMutex(), PopupMenuControllerBaseType(m_aMutex), - m_bInitialized( false ), - m_xServiceManager( xServiceManager ) + m_bInitialized( false ) { - if ( m_xServiceManager.is() ) - m_xURLTransformer.set( util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ) ); + if ( xContext.is() ) + m_xURLTransformer.set( util::URLTransformer::create( xContext ) ); } PopupMenuControllerBase::~PopupMenuControllerBase() @@ -104,7 +103,6 @@ void SAL_CALL PopupMenuControllerBase::disposing() m_xFrame.clear(); m_xDispatch.clear(); m_xPopupMenu.clear(); - m_xServiceManager.clear(); } // XServiceInfo |