diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 13:42:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-28 17:42:50 +0000 |
| commit | 8bf1ba09408d42dbc0798aedb96ab387353f9eed (patch) | |
| tree | e28c70bf7a9840f661580d108502900ddb11993c /dbaccess | |
| parent | 03ac752ca513305cb7504f5bfda701d93e2179f0 (diff) | |
Use ImplInheritanceHelper in OJoinDesignViewAccess
Change-Id: Ib67e03aeea4df67fc7a7b5db5d8cfdd9e57f87f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146271
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/inc/JAccess.hxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/JAccess.cxx | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 4416f42d6292..6d0d52ec0233 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -20,18 +20,16 @@ #include "JoinTableView.hxx" #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> namespace dbaui { class OJoinTableView; - typedef ::cppu::ImplHelper1< css::accessibility::XAccessible - > OJoinDesignViewAccess_BASE; /** the class OJoinDesignViewAccess represents the accessible object for join views like the QueryDesign and the RelationDesign */ - class OJoinDesignViewAccess : public VCLXAccessibleComponent, public OJoinDesignViewAccess_BASE + class OJoinDesignViewAccess : public cppu::ImplInheritanceHelper<VCLXAccessibleComponent, css::accessibility::XAccessible> { VclPtr<OJoinTableView> m_pTableView; // the window which I should give accessibility to @@ -40,10 +38,6 @@ namespace dbaui */ OJoinDesignViewAccess( OJoinTableView* _pTableView); - // XInterface - DECLARE_XINTERFACE( ) - DECLARE_XTYPEPROVIDER( ) - virtual OUString SAL_CALL getImplementationName() override; // XAccessible diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 277a6f9c3426..b67d31c30982 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -33,7 +33,7 @@ namespace dbaui using namespace ::com::sun::star::lang; OJoinDesignViewAccess::OJoinDesignViewAccess(OJoinTableView* _pTableView) - :VCLXAccessibleComponent(_pTableView->GetComponentInterface().is() ? _pTableView->GetWindowPeer() : nullptr) + :ImplInheritanceHelper(_pTableView->GetComponentInterface().is() ? _pTableView->GetWindowPeer() : nullptr) ,m_pTableView(_pTableView) { } @@ -82,10 +82,6 @@ namespace dbaui { return this; } - // XInterface - IMPLEMENT_FORWARD_XINTERFACE2( OJoinDesignViewAccess, VCLXAccessibleComponent, OJoinDesignViewAccess_BASE ) - // XTypeProvider - IMPLEMENT_FORWARD_XTYPEPROVIDER2( OJoinDesignViewAccess, VCLXAccessibleComponent, OJoinDesignViewAccess_BASE ) } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |