diff options
| author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-01-31 02:23:12 -0200 |
|---|---|---|
| committer | Marcos Souza <marcos.souza.org@gmail.com> | 2014-02-02 14:59:51 +0000 |
| commit | a91de8efc9b99cedb917203e3255d55a514fb8a3 (patch) | |
| tree | 1b1629098bd2b7d349fd7e0aa6510bc9c5aed374 /framework/source/uielement/popuptoolbarcontroller.cxx | |
| parent | 22d80c90c83fd1f819f6a208b09bedf7117c6611 (diff) | |
fdo#54938 Convert framework to cppu::supportsService
Change-Id: Id0c7c845d128920ba278de4208f5c32dcf83ecb1
Reviewed-on: https://gerrit.libreoffice.org/7754
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Tested-by: Marcos Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'framework/source/uielement/popuptoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 6f513fde1dd1..33f73ec94dd4 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -16,14 +16,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <framework/menuconfiguration.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> +#include <comphelper/processfactory.hxx> +#include <framework/menuconfiguration.hxx> #include <rtl/ref.hxx> #include <svtools/imagemgr.hxx> #include <svtools/miscopt.hxx> #include <svtools/toolboxcontroller.hxx> +#include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/urlobj.hxx> #include <unotools/moduleoptions.hxx> @@ -154,9 +154,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) } -void SAL_CALL -PopupMenuToolbarController::statusChanged( - const css::frame::FeatureStateEvent& rEvent ) +void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ) { // TODO move to base class @@ -390,9 +388,7 @@ css::uno::Sequence<OUString> NewToolbarController::getSupportedServiceNames() return aRet; } -void SAL_CALL -NewToolbarController::initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) +void SAL_CALL NewToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException ) { PopupMenuToolbarController::initialize( aArguments ); @@ -401,10 +397,8 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) createPopupMenuController(); } -void SAL_CALL -NewToolbarController::statusChanged( - const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) +void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) +throw ( css::uno::RuntimeException ) { if ( rEvent.IsEnabled ) { @@ -418,9 +412,8 @@ NewToolbarController::statusChanged( enable( rEvent.IsEnabled ); } -void SAL_CALL -NewToolbarController::execute( sal_Int16 /*KeyModifier*/ ) - throw ( css::uno::RuntimeException ) +void SAL_CALL NewToolbarController::execute( sal_Int16 /*KeyModifier*/ ) +throw ( css::uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); if ( !m_aLastURL.getLength() ) |