diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-13 16:59:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-14 06:37:16 +0000 |
| commit | d191d1f9b684c6229f3651361c92ff39ffb350f1 (patch) | |
| tree | e670ba0105d974b3a68c17b42366eec1d35ebae4 /framework/inc/uielement/generictoolbarcontroller.hxx | |
| parent | ba974ccc8c49766542ddd727c95ecc5db1cff198 (diff) | |
com::sun::star->css in framework
Change-Id: If5a77db83fcbef5ed436f2043ddeb7c515a840dc
Reviewed-on: https://gerrit.libreoffice.org/19356
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/inc/uielement/generictoolbarcontroller.hxx')
| -rw-r--r-- | framework/inc/uielement/generictoolbarcontroller.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index a9bd37fbe284..016c5920d52f 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -35,21 +35,21 @@ struct ExecuteInfo; class GenericToolbarController : public svt::ToolboxController { public: - GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + GenericToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand ); virtual ~GenericToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; DECL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, void ); @@ -63,23 +63,23 @@ class GenericToolbarController : public svt::ToolboxController class MenuToolbarController : public GenericToolbarController { - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc; - PopupMenu* pMenu; - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager; - OUString m_aModuleIdentifier; + css::uno::Reference< css::container::XIndexAccess > m_xMenuDesc; + PopupMenu* pMenu; + css::uno::Reference< css::lang::XComponent > m_xMenuManager; + OUString m_aModuleIdentifier; public: - MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + MenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand, const OUString& aModuleIdentifier, - const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc ); + const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc ); virtual ~MenuToolbarController(); // XToolbarController - virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; }; |