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/fwe/classes/rootactiontriggercontainer.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/fwe/classes/rootactiontriggercontainer.cxx')
| -rw-r--r-- | framework/source/fwe/classes/rootactiontriggercontainer.cxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index b64d2ea39be4..45802e16a0b6 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -22,12 +22,12 @@ #include <classes/actiontriggercontainer.hxx> #include <classes/actiontriggerpropertyset.hxx> #include <classes/actiontriggerseparatorpropertyset.hxx> +#include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <framework/actiontriggerhelper.hxx> -#include <threadhelp/resetableguard.hxx> #include <osl/mutex.hxx> +#include <threadhelp/resetableguard.hxx> #include <vcl/svapp.hxx> -#include <cppuhelper/typeprovider.hxx> - using namespace cppu; using namespace com::sun::star::uno; @@ -46,7 +46,6 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() return seqID ; } - RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier ) : PropertySetContainer() , m_bContainerCreated( sal_False ) @@ -123,7 +122,6 @@ throw ( RuntimeException ) return aSeq; } - // XIndexContainer void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) @@ -151,7 +149,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) PropertySetContainer::removeByIndex( Index ); } - // XIndexReplace void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) @@ -166,7 +163,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept PropertySetContainer::replaceByIndex( Index, Element ); } - // XIndexAccess sal_Int32 SAL_CALL RootActionTriggerContainer::getCount() throw ( RuntimeException ) @@ -200,7 +196,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) return PropertySetContainer::getByIndex( Index ); } - // XElementAccess Type SAL_CALL RootActionTriggerContainer::getElementType() throw (::com::sun::star::uno::RuntimeException) @@ -220,7 +215,6 @@ throw (::com::sun::star::uno::RuntimeException) return sal_False; } - // XServiceInfo OUString SAL_CALL RootActionTriggerContainer::getImplementationName() throw ( RuntimeException ) @@ -231,10 +225,7 @@ throw ( RuntimeException ) sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { - if ( ServiceName.equalsAscii( SERVICENAME_ACTIONTRIGGERCONTAINER )) - return sal_True; - - return sal_False; + return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames() |