strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use ImplInheritanceHelper in VCLXAccessibleTextComponent

Browse source 
Change-Id: Iad1ae727e31908949d61d32b3828a67ac74398e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146183
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2023-01-26 12:09:44 +01:00
parent fc2f4eb5ca
commit b50d9685e8
2 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
accessibility/inc/standard/vclxaccessibletextcomponent.hxx
View file

@ -22,17 +22,15 @@
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <comphelper/accessibletexthelper.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase.hxx>
typedef ::cppu::ImplHelper1 <
css::accessibility::XAccessibleText > VCLXAccessibleTextComponent_BASE;
class VCLXAccessibleTextComponent : public VCLXAccessibleComponent,
public ::comphelper::OCommonAccessibleText,
public VCLXAccessibleTextComponent_BASE
class VCLXAccessibleTextComponent : public cppu::ImplInheritanceHelper<
VCLXAccessibleComponent,
css::accessibility::XAccessibleText>,
public ::comphelper::OCommonAccessibleText
{
OUString m_sText;
@ -52,12 +50,6 @@ protected:
public:
VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow );
// XInterface
DECLARE_XINTERFACE()
// XTypeProvider
DECLARE_XTYPEPROVIDER()
// XAccessibleText
virtual sal_Int32 SAL_CALL getCaretPosition() override;
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;

14
accessibility/source/standard/vclxaccessibletextcomponent.cxx
View file

@ -45,7 +45,7 @@ using namespace ::comphelper;
VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow )
:VCLXAccessibleComponent( pVCLXWindow )
:ImplInheritanceHelper( pVCLXWindow )
{
VclPtr<vcl::Window> pWindow = GetWindow();
if ( pWindow )
@ -118,18 +118,6 @@ void VCLXAccessibleTextComponent::disposing()
}
// XInterface
IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
// XTypeProvider
IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
// XAccessibleText