summaryrefslogtreecommitdiff
path: root/accessibility/inc
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@libreoffice.org>2018-02-06 11:18:44 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-18 16:56:08 +0100
commit861f819d1b1a1ee4a8a15ec26cdd20121fd03ddf (patch)
tree58e033859b9521705be207c2903945c0edec742c /accessibility/inc
parent0679691db053acaa3ca2aa633a56d108f2e5bb85 (diff)
Accessibility : cleanup constructors and destructors.
Change-Id: I63f94f4bb3865d0c2d211567588343e08878342c Reviewed-on: https://gerrit.libreoffice.org/49282 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility/inc')
-rw-r--r--accessibility/inc/extended/AccessibleGridControlHeader.hxx2
-rw-r--r--accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx4
-rw-r--r--accessibility/inc/extended/AccessibleGridControlTableBase.hxx2
-rw-r--r--accessibility/inc/extended/AccessibleGridControlTableCell.hxx2
-rw-r--r--accessibility/inc/extended/accessibleiconchoicectrl.hxx2
-rw-r--r--accessibility/inc/extended/accessibletabbar.hxx1
-rw-r--r--accessibility/inc/extended/accessibletabbarpage.hxx1
-rw-r--r--accessibility/inc/extended/accessibletabbarpagelist.hxx3
-rw-r--r--accessibility/inc/extended/accessibletablistbox.hxx5
-rw-r--r--accessibility/inc/extended/accessibletablistboxtable.hxx4
-rw-r--r--accessibility/inc/extended/textwindowaccessibility.hxx5
-rw-r--r--accessibility/inc/standard/accessiblemenucomponent.hxx1
-rw-r--r--accessibility/inc/standard/vclxaccessiblebox.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblebutton.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessibleedit.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblefixedtext.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblelistbox.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblemenu.hxx3
-rw-r--r--accessibility/inc/standard/vclxaccessiblemenuitem.hxx1
-rw-r--r--accessibility/inc/standard/vclxaccessiblemenuseparator.hxx1
-rw-r--r--accessibility/inc/standard/vclxaccessiblepopupmenu.hxx3
-rw-r--r--accessibility/inc/standard/vclxaccessibleradiobutton.hxx4
23 files changed, 23 insertions, 33 deletions
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
index dc65cbe199d4..b0046627b528 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -44,7 +44,7 @@ public:
::svt::table::AccessibleTableControlObjType eObjType );
private:
- virtual ~AccessibleGridControlHeader() override;
+ virtual ~AccessibleGridControlHeader() override = default;
public:
// XAccessibleContext
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index a0ec9e6bb53a..00076df2a484 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -23,7 +23,7 @@
namespace accessibility
{
- class AccessibleGridControlHeaderCell : public AccessibleGridControlCell, public css::accessibility::XAccessible
+ class AccessibleGridControlHeaderCell final : public AccessibleGridControlCell, public css::accessibility::XAccessible
{
sal_Int32 m_nColumnRowId;
public:
@@ -72,7 +72,7 @@ namespace accessibility
*/
::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override;
- protected:
+ private:
virtual tools::Rectangle implGetBoundingBox() override;
virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
index ea8989a8373d..8df02ca1c88e 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -50,7 +50,7 @@ public:
::svt::table::AccessibleTableControlObjType eObjType );
protected:
- virtual ~AccessibleGridControlTableBase() override;
+ virtual ~AccessibleGridControlTableBase() override = default;
public:
// XAccessibleContext
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index fa095efc0a0f..a250fe18cb6a 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -49,7 +49,7 @@ namespace accessibility
::svt::table::AccessibleTableControlObjType _eType
);
- virtual ~AccessibleGridControlCell() override;
+ virtual ~AccessibleGridControlCell() override = default;
private:
AccessibleGridControlCell( const AccessibleGridControlCell& ) = delete;
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index 1d5c76f2fc8b..823bbb6c723d 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -42,7 +42,7 @@ namespace accessibility
{
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
- virtual ~AccessibleIconChoiceCtrl() override;
+ virtual ~AccessibleIconChoiceCtrl() override = default;
/** this function is called upon disposing the component */
virtual void SAL_CALL disposing() override;
diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx
index 509a4d676cfd..c042e8875641 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -61,7 +61,6 @@ namespace accessibility
public:
AccessibleTabBar( TabBar* pTabBar );
- virtual ~AccessibleTabBar() override;
// XInterface
DECLARE_XINTERFACE()
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
index 1077a8a31087..3cc02ee323f7 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -77,7 +77,6 @@ namespace accessibility
public:
AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent );
- virtual ~AccessibleTabBarPage() override;
// XInterface
DECLARE_XINTERFACE()
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index fd1fac5f4527..5866bad6f2e3 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -46,7 +46,7 @@ namespace accessibility
css::lang::XServiceInfo > AccessibleTabBarPageList_BASE;
class AccessibleTabBarPageList final : public AccessibleTabBarBase,
- public AccessibleTabBarPageList_BASE
+ public AccessibleTabBarPageList_BASE
{
private:
typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
@@ -73,7 +73,6 @@ namespace accessibility
public:
AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
- virtual ~AccessibleTabBarPageList() override;
// XInterface
DECLARE_XINTERFACE()
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx
index 4d95205694b2..1c56d867bd33 100644
--- a/accessibility/inc/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -36,7 +36,7 @@ typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible
> AccessibleTabListBox_Base;
/** !!! */
-class AccessibleTabListBox
+class AccessibleTabListBox final
:public AccessibleBrowseBox
,public AccessibleTabListBox_Base
,public ::svt::IAccessibleTabListBox
@@ -52,7 +52,6 @@ public:
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
SvHeaderTabListBox& rBox );
-public:
// XInterface
DECLARE_XINTERFACE( )
// XTypeProvider
@@ -83,7 +82,7 @@ public:
return AccessibleBrowseBox::getHeaderBar( svt::BBTYPE_COLUMNHEADERBAR );
}
-protected:
+private:
/** dtor() */
virtual ~AccessibleTabListBox() override;
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
index a70234cbadf3..68e71f0e83d1 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -33,7 +33,7 @@ namespace accessibility {
typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
AccessibleTabListBoxTableImplHelper;
-class AccessibleTabListBoxTable : public AccessibleBrowseBoxTable, public AccessibleTabListBoxTableImplHelper
+class AccessibleTabListBoxTable final : public AccessibleBrowseBoxTable, public AccessibleTabListBoxTableImplHelper
{
private:
VclPtr<SvHeaderTabListBox> m_pTabListBox;
@@ -71,7 +71,7 @@ public:
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
SvHeaderTabListBox& rBox );
-protected:
+private:
/** dtor() */
virtual ~AccessibleTabListBoxTable() override;
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index 5c1fd4229511..8487da9d9da7 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -139,7 +139,7 @@ typedef ::cppu::WeakAggComponentImplHelper7<
// 0 to N - 1), whereas the Paragraph's index is the position within the text
// view/accessible parent (from 0 to M - 1). Paragraphs outside the currently
// visible range have an index of -1.
-class Paragraph:
+class Paragraph final:
private cppu::BaseMutex, public ParagraphBase, private ::comphelper::OCommonAccessibleText
{
public:
@@ -159,14 +159,13 @@ public:
void notifyEvent(::sal_Int16 nEventId, css::uno::Any const & rOldValue,
css::uno::Any const & rNewValue);
-protected:
+private:
// OCommonAccessibleText
virtual void implGetParagraphBoundary( css::i18n::Boundary& rBoundary,
::sal_Int32 nIndex ) override;
virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary,
::sal_Int32 nIndex ) override;
-private:
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext() override;
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx
index f2ef7294ba8e..bd2953bf77dd 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -44,7 +44,6 @@ protected:
public:
OAccessibleMenuComponent( Menu* pMenu );
- virtual ~OAccessibleMenuComponent() override;
// XInterface
DECLARE_XINTERFACE()
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx
index c632e2d99d38..5b5f46ae6f39 100644
--- a/accessibility/inc/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebox.hxx
@@ -142,7 +142,7 @@ protected:
*/
bool m_bHasListChild;
- virtual ~VCLXAccessibleBox() override;
+ virtual ~VCLXAccessibleBox() override = default;
/** Returns true when the object is valid.
*/
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx
index af9e49c4a938..9fb63b3b5088 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx
@@ -39,7 +39,7 @@ class VCLXAccessibleButton : public VCLXAccessibleTextComponent,
public VCLXAccessibleButton_BASE
{
protected:
- virtual ~VCLXAccessibleButton() override;
+ virtual ~VCLXAccessibleButton() override = default;
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx
index 8e0c6635d566..f41479c0ceef 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -42,7 +42,7 @@ class VCLXAccessibleEdit final : public VCLXAccessibleTextComponent,
private:
sal_Int32 m_nCaretPosition;
- virtual ~VCLXAccessibleEdit() override;
+ virtual ~VCLXAccessibleEdit() override = default;
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
index 0cb1d2f96813..e0becd208b1d 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
@@ -29,7 +29,7 @@
class VCLXAccessibleFixedHyperlink : public VCLXAccessibleTextComponent
{
protected:
- virtual ~VCLXAccessibleFixedHyperlink() override;
+ virtual ~VCLXAccessibleFixedHyperlink() override = default;
public:
VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow );
diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
index 98b70542f639..79f2c9940622 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
@@ -29,7 +29,7 @@
class VCLXAccessibleFixedText : public VCLXAccessibleTextComponent
{
protected:
- virtual ~VCLXAccessibleFixedText() override;
+ virtual ~VCLXAccessibleFixedText() override = default;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx
index 47890c9378ca..af0b7af3d153 100644
--- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx
@@ -43,7 +43,7 @@ public:
getSupportedServiceNames() override;
protected:
- virtual ~VCLXAccessibleListBox() override;
+ virtual ~VCLXAccessibleListBox() override = default;
virtual bool IsValid() const override;
};
diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx
index b44742c43866..7a7bb6f74b8f 100644
--- a/accessibility/inc/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -41,8 +41,7 @@ protected:
sal_Int32 implGetSelectedAccessibleChildCount();
public:
- VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu );
- virtual ~VCLXAccessibleMenu() override;
+ using VCLXAccessibleMenuItem::VCLXAccessibleMenuItem;
// XInterface
DECLARE_XINTERFACE()
diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index 41373b8e00c3..806c28728d65 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -57,7 +57,6 @@ protected:
public:
VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr );
- virtual ~VCLXAccessibleMenuItem() override;
// XInterface
DECLARE_XINTERFACE()
diff --git a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
index 2b4a49b7473b..b5939b4d9dbe 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
@@ -30,7 +30,6 @@ class VCLXAccessibleMenuSeparator : public OAccessibleMenuItemComponent
{
public:
VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos );
- virtual ~VCLXAccessibleMenuSeparator() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
index e576189c0048..64978216c38e 100644
--- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
@@ -32,8 +32,7 @@ protected:
virtual bool IsFocused() override;
public:
- VCLXAccessiblePopupMenu( Menu* pMenu );
- virtual ~VCLXAccessiblePopupMenu() override;
+ using OAccessibleMenuComponent::OAccessibleMenuComponent;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
index a3643a61c6e9..9706ac2c0312 100644
--- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
@@ -39,14 +39,14 @@ class VCLXAccessibleRadioButton : public VCLXAccessibleTextComponent,
public VCLXAccessibleRadioButton_BASE
{
protected:
- virtual ~VCLXAccessibleRadioButton() override;
+ virtual ~VCLXAccessibleRadioButton() override = default;
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
public:
- VCLXAccessibleRadioButton( VCLXWindow* pVCLXindow );
+ using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
// XInterface
DECLARE_XINTERFACE()