diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-10-26 13:11:42 -0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-30 18:17:11 +0100 |
| commit | 2b01553fa5982ed50fd37f346a150d1aac8dcd6f (patch) | |
| tree | 1daf00bf4b69950c5b75e98571d2b839d5b83327 /svx/source/accessibility/AccessibleFrameSelector.cxx | |
| parent | 9ab844c7fa907e2d1119a316c695198ef888a059 (diff) | |
fdo#54938: Convert svx to use cppu::supportsService
Change-Id: I3ab178924cb1c4240511f08625f244dac54e3913
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source/accessibility/AccessibleFrameSelector.cxx')
| -rw-r--r-- | svx/source/accessibility/AccessibleFrameSelector.cxx | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 1a21e7cfd5dd..64dd1d1b497d 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/awt/FocusChangeReason.hpp> +#include <cppuhelper/supportsservice.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <osl/mutex.hxx> @@ -552,50 +553,34 @@ void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessib } } -// ---------------------------------------------------------------------------- - OUString AccFrameSelector::getImplementationName( ) throw (RuntimeException) { return OUString("AccFrameSelector"); } -// ---------------------------------------------------------------------------- - -const sal_Char sAccessible[] = "Accessible"; -const sal_Char sAccessibleContext[] = "AccessibleContext"; -const sal_Char sAccessibleComponent[] = "AccessibleComponent"; - sal_Bool AccFrameSelector::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - return rServiceName.equalsAsciiL( sAccessible , sizeof(sAccessible )-1 ) || - rServiceName.equalsAsciiL( sAccessibleContext , sizeof(sAccessibleContext )-1 ) || - rServiceName.equalsAsciiL( sAccessibleComponent, sizeof(sAccessibleComponent)-1 ); + return cppu::supportsService(this, rServiceName); } -// ---------------------------------------------------------------------------- - Sequence< OUString > AccFrameSelector::getSupportedServiceNames( ) throw (RuntimeException) { Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( sAccessible ); - pArray[1] = OUString( sAccessibleContext ); - pArray[2] = OUString( sAccessibleComponent ); + pArray[0] = OUString( "Accessible" ); + pArray[1] = OUString( "AccessibleContext" ); + pArray[2] = OUString( "AccessibleComponent" ); return aRet; } -// ---------------------------------------------------------------------------- - void AccFrameSelector::IsValid() throw (RuntimeException) { if(!mpFrameSel) throw RuntimeException(); } -// ---------------------------------------------------------------------------- - void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus) { SolarMutexGuard aGuard; |