summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-11-21 16:50:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-11-21 17:07:12 +0100
commit54bab3c6c1d225922d25420e44e7a915daeadce4 (patch)
tree430944cf979c06cd40dd27cb1de4796967d9ae2d /winaccessibility
parent1d3c75a4ccaee7097ddecd39bed5d43e343a91dc (diff)
Simplify css.accessibility.MSAAService and corresponding XMSAAService
Change-Id: I96c69e871aa7b20cdac9751a64faa5e436f31a1f (cherry picked from commit f3f4d9ec0f0eaa1aebdfebe831021a9d96e63f58)
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/source/service/msaaservice_impl.cxx31
1 files changed, 3 insertions, 28 deletions
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index ff3b017fb4cd..578139b011e0 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -18,13 +18,11 @@
*/
#include <rtl/ref.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/accessibility/XMSAAService.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -60,21 +58,16 @@ static OUString getImplementationName_MSAAServiceImpl()
return OUString( "com.sun.star.accessibility.my_sc_implementation.MSAAService" );
}
-class MSAAServiceImpl : public ::cppu::WeakImplHelper4<
- XMSAAService, lang::XServiceInfo,
- lang::XInitialization, lang::XComponent >
+class MSAAServiceImpl : public ::cppu::WeakImplHelper2<
+ XMSAAService, lang::XServiceInfo >
{
private:
rtl::Reference<AccTopWindowListener> m_pTopWindowListener;
- OUString m_arg;
public:
MSAAServiceImpl ();
virtual ~MSAAServiceImpl();
- // XInitialization will be called upon createInstanceWithArguments[AndContext]()
- virtual void SAL_CALL initialize( Sequence< Any > const & args ) throw (Exception);
-
// XComponent - as used by VCL to lifecycle manage this bridge.
virtual void SAL_CALL dispose();
virtual void SAL_CALL addEventListener( const ::css::uno::Reference< ::css::lang::XEventListener >& ) { /* dummy */ }
@@ -91,24 +84,6 @@ public:
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames();
};
-void MSAAServiceImpl::initialize( Sequence< Any > const & args ) throw (Exception)
-{
- if (1 != args.getLength())
- {
- throw lang::IllegalArgumentException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("give a string instanciating this component!") ),
- (::cppu::OWeakObject *)this, // resolve to XInterface reference
- 0 ); // argument pos
- }
- if (! (args[ 0 ] >>= m_arg))
- {
- throw lang::IllegalArgumentException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no string given as argument!") ),
- (::cppu::OWeakObject *)this, // resolve to XInterface reference
- 0 ); // argument pos
- }
-}
-
/**
* Implemention of getAccObjectPtr.
* @param