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 /framework/source/uielement/fontmenucontroller.cxx | |
| parent | c0654ce02272499236f7b43920e288c5fff34d4f (diff) | |
fdo#46808, Convert some XMultiservice in framework module
Change-Id: Id4dd0bafd40cf96271527c9c970c4ab31527644c
Diffstat (limited to 'framework/source/uielement/fontmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/fontmenucontroller.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 714332cb5a12..47e35095bde2 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -56,7 +56,7 @@ static bool lcl_I18nCompareString(const OUString& rStr1, const OUString& rStr2) namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( FontMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE_2 ( FontMenuController , OWeakObject , SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_FONTMENUCONTROLLER @@ -64,8 +64,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( FontMenuController DEFINE_INIT_SERVICE ( FontMenuController, {} ) -FontMenuController::FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) : - svt::PopupMenuControllerBase( xServiceManager ) +FontMenuController::FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : + svt::PopupMenuControllerBase( xContext ) { } @@ -123,7 +123,6 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim m_xFrame.clear(); m_xDispatch.clear(); m_xFontListDispatch.clear(); - m_xServiceManager.clear(); if ( m_xPopupMenu.is() ) m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); |