accessibility: cleanup constructors and destructors

Change-Id: Id9d420e633691cf87706088d7415aeb8ed1bdb8d Reviewed-on: https://gerrit.libreoffice.org/50307 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-02-25 16:31:38 +01:00
parent 6d7c82a573
commit d176877bc0
44 changed files with 29 additions and 147 deletions
@@ -54,7 +54,7 @@ public:
        ::svt::AccessibleBrowseBoxObjType eObjType );

 protected:
-    virtual ~AccessibleBrowseBoxTableBase() override;
+    virtual ~AccessibleBrowseBoxTableBase() override = default;

 public:
    // XAccessibleContext
@@ -43,7 +43,7 @@ class AccessibleGridControl final : public AccessibleGridControlBase
    ::svt::table::IAccessibleTable& _rTable
    );

-    virtual ~AccessibleGridControl() override;
+    virtual ~AccessibleGridControl() override = default;

    /** Cleans up members. */
    using AccessibleGridControlBase::disposing;
@@ -43,7 +43,7 @@ public:
            ::svt::table::IAccessibleTable& rTable);

 private:
-    virtual ~AccessibleGridControlTable() override;
+    virtual ~AccessibleGridControlTable() override = default;
    std::vector< AccessibleGridControlTableCell* > m_pCellVector;
    std::vector< css::uno::Reference< css::accessibility::XAccessible> > m_pAccessCellVector;
 public:
@@ -42,8 +42,9 @@ protected:
    // OCommonAccessibleComponent
    virtual css::awt::Rectangle implGetBounds(  ) override;

+    using OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent;
+
 public:
-    OAccessibleMenuComponent( Menu* pMenu );

    // XInterface
    DECLARE_XINTERFACE()
@@ -35,17 +35,16 @@ typedef ::cppu::ImplHelper2<
    css::accessibility::XAccessibleAction,
    css::accessibility::XAccessibleValue > VCLXAccessibleButton_BASE;

-class VCLXAccessibleButton : public VCLXAccessibleTextComponent,
+class VCLXAccessibleButton final : public VCLXAccessibleTextComponent,
                             public VCLXAccessibleButton_BASE
 {
-protected:
    virtual ~VCLXAccessibleButton() override = default;

    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;

 public:
-    VCLXAccessibleButton( VCLXWindow* pVCLXindow );
+    using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;

    // XInterface
    DECLARE_XINTERFACE()
@@ -42,7 +42,7 @@ private:
    bool    m_bChecked;
    bool    m_bIndeterminate;

-    virtual ~VCLXAccessibleCheckBox() override;
+    virtual ~VCLXAccessibleCheckBox() override = default;

    bool    IsChecked();
    bool    IsIndeterminate();
@@ -31,7 +31,7 @@
    object of the VCLXAccessibleList class which does not
    support selection at the moment.
 */
-class VCLXAccessibleComboBox
+class VCLXAccessibleComboBox final
    : public VCLXAccessibleBox
 {
 public:
@@ -43,8 +43,8 @@ public:
    virtual css::uno::Sequence< OUString > SAL_CALL
        getSupportedServiceNames() override;

-protected:
-    virtual ~VCLXAccessibleComboBox() override;
+private:
+    virtual ~VCLXAccessibleComboBox() override = default;

    virtual bool IsValid() const override;
 };
@@ -31,7 +31,7 @@
    VCLXAccessibleList class which does not support selection
    at the moment.
 */
-class VCLXAccessibleDropDownComboBox : public VCLXAccessibleBox
+class VCLXAccessibleDropDownComboBox final : public VCLXAccessibleBox
 {
 public:
    VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow);
@@ -42,8 +42,8 @@ public:
    virtual css::uno::Sequence< OUString > SAL_CALL
        getSupportedServiceNames() override;

-protected:
-    virtual ~VCLXAccessibleDropDownComboBox() override;
+private:
+    virtual ~VCLXAccessibleDropDownComboBox() override = default;

    virtual bool IsValid() const override;
    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override;
@@ -30,7 +30,7 @@
    of the VCLXAccessibleListBoxList class which does support
    selection.
 */
-class VCLXAccessibleDropDownListBox : public VCLXAccessibleBox
+class VCLXAccessibleDropDownListBox final : public VCLXAccessibleBox
 {
 public:
    VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow);
@@ -41,8 +41,8 @@ public:
    virtual css::uno::Sequence< OUString > SAL_CALL
        getSupportedServiceNames() override;

-protected:
-    virtual ~VCLXAccessibleDropDownListBox() override;
+private:
+    virtual ~VCLXAccessibleDropDownListBox() override = default;

    virtual bool IsValid() const override;

@@ -32,7 +32,7 @@ protected:
    virtual ~VCLXAccessibleFixedHyperlink() override = default;

 public:
-    VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow );
+    using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;

    // XServiceInfo
    virtual OUString SAL_CALL getImplementationName() override;
@@ -26,15 +26,14 @@
 //  class VCLXAccessibleFixedText


-class VCLXAccessibleFixedText : public VCLXAccessibleTextComponent
+class VCLXAccessibleFixedText final : public VCLXAccessibleTextComponent
 {
-protected:
    virtual ~VCLXAccessibleFixedText() override = default;

    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;

 public:
-    VCLXAccessibleFixedText( VCLXWindow* pVCLXindow );
+    using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;

    // XServiceInfo
    virtual OUString SAL_CALL getImplementationName() override;
@@ -142,7 +142,7 @@ private:
    sal_Int32   m_nCurSelectedPos;


-    virtual ~VCLXAccessibleList() override;
+    virtual ~VCLXAccessibleList() override = default;

    /** This function is called from the implementation helper during a
        XComponent::dispose call.  Free the list of items and the items themselves.
@@ -31,7 +31,7 @@
    VCLXAccessibleListBoxList class which does support
    selection.
 */
-class VCLXAccessibleListBox : public VCLXAccessibleBox
+class VCLXAccessibleListBox final : public VCLXAccessibleBox
 {
 public:
    VCLXAccessibleListBox (VCLXWindow* pVCLXindow);
@@ -42,7 +42,7 @@ public:
    virtual css::uno::Sequence< OUString > SAL_CALL
        getSupportedServiceNames() override;

-protected:
+private:
    virtual ~VCLXAccessibleListBox() override = default;

    virtual bool IsValid() const override;
@@ -68,7 +68,7 @@ private:
    rtl::Reference< VCLXAccessibleList >                     m_xParent;
    css::uno::Reference< css::accessibility::XAccessibleContext > m_xParentContext;

-    virtual ~VCLXAccessibleListItem() override;
+    virtual ~VCLXAccessibleListItem() override = default;
    /** this function is called upon disposing the component
    */
    virtual void SAL_CALL   disposing() override;
@@ -39,13 +39,13 @@ class VCLXAccessibleScrollBar : public VCLXAccessibleComponent,
                                public VCLXAccessibleScrollBar_BASE
 {
 protected:
-    virtual ~VCLXAccessibleScrollBar() override;
+    virtual ~VCLXAccessibleScrollBar() override = default;

    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;

 public:
-    VCLXAccessibleScrollBar( VCLXWindow* pVCLXindow );
+    using VCLXAccessibleComponent::VCLXAccessibleComponent;

    // XInterface
    DECLARE_XINTERFACE()
@@ -53,7 +53,6 @@ private:

 public:
    VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow );
-    virtual ~VCLXAccessibleStatusBar() override;

    // XServiceInfo
    virtual OUString SAL_CALL getImplementationName() override;
@@ -77,7 +77,6 @@ private:

 public:
    VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId );
-    virtual ~VCLXAccessibleStatusBarItem() override;

    // XInterface
    DECLARE_XINTERFACE()
@@ -61,7 +61,6 @@ private:

 public:
    VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow );
-    virtual ~VCLXAccessibleTabControl() override;

    // XInterface
    DECLARE_XINTERFACE()
@@ -47,7 +47,6 @@ protected:

 public:
    VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow );
-    virtual ~VCLXAccessibleTabPageWindow() override;

    // XAccessibleContext
    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
@@ -51,7 +51,6 @@ protected:

 public:
    VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow );
-    virtual ~VCLXAccessibleTextComponent() override;

    // XInterface
    DECLARE_XINTERFACE()
@@ -66,7 +66,7 @@ public:
        getSupportedServiceNames() override;

 protected:
-    virtual ~VCLXAccessibleTextField() override;
+    virtual ~VCLXAccessibleTextField() override = default;

    /** With this method the text of the currently selected item is made
        available to the VCLXAccessibleTextComponent base class.
@@ -46,10 +46,6 @@ AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
 {
 }

-AccessibleBrowseBoxTableBase::~AccessibleBrowseBoxTableBase()
-{
-}
-
 // XAccessibleContext ---------------------------------------------------------

 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount()
@@ -48,11 +48,6 @@ AccessibleGridControl::AccessibleGridControl(
 }


-AccessibleGridControl::~AccessibleGridControl()
-{
-}
-
-
 void SAL_CALL AccessibleGridControl::disposing()
 {
    SolarMutexGuard g;
@@ -39,12 +39,6 @@ AccessibleGridControlTable::AccessibleGridControlTable(
        const Reference< XAccessible >& rxParent,
        IAccessibleTable& rTable) :
    AccessibleGridControlTableBase( rxParent, rTable, TCTYPE_TABLE )
-        ,m_pCellVector( )
-        ,m_pAccessCellVector( )
-{
-}
-
-AccessibleGridControlTable::~AccessibleGridControlTable()
 {
 }

@@ -45,7 +45,6 @@ namespace accessibility
    // Ctor() and Dtor()

    AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl, const Reference< XAccessible >& _xParent ) :
-
        VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ),
        m_xParent       ( _xParent )
    {
@@ -22,10 +22,10 @@

 #include <toolkit/awt/vclxaccessiblecomponent.hxx>

-class FloatingWindowAccessible : public VCLXAccessibleComponent
+class FloatingWindowAccessible final : public VCLXAccessibleComponent
 {
 public:
-    FloatingWindowAccessible( VCLXWindow* pWindow );
+    using VCLXAccessibleComponent::VCLXAccessibleComponent;

    virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
 };
@@ -46,12 +46,6 @@ using namespace ::comphelper;
 // class OAccessibleMenuComponent


-OAccessibleMenuComponent::OAccessibleMenuComponent( Menu* pMenu )
-    :OAccessibleMenuBaseComponent( pMenu )
-{
-}
-
-
 bool OAccessibleMenuComponent::IsEnabled()
 {
    return true;
@@ -27,10 +27,6 @@ namespace uno = ::com::sun::star::uno;

 using ::com::sun::star::accessibility::AccessibleRelation;
 namespace AccessibleRelationType = ::com::sun::star::accessibility::AccessibleRelationType;
-FloatingWindowAccessible::FloatingWindowAccessible(VCLXWindow* pWindow) :
-    VCLXAccessibleComponent(pWindow)
-{
-}

 void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet)
 {
@@ -44,12 +44,6 @@ using namespace ::comphelper;
 // VCLXAccessibleButton


-VCLXAccessibleButton::VCLXAccessibleButton( VCLXWindow* pVCLWindow )
-    :VCLXAccessibleTextComponent( pVCLWindow )
-{
-}
-
-
 void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
    switch ( rVclWindowEvent.GetId() )
@@ -53,11 +53,6 @@ VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
 }


-VCLXAccessibleCheckBox::~VCLXAccessibleCheckBox()
-{
-}
-
-
 bool VCLXAccessibleCheckBox::IsChecked()
 {
    bool bChecked = false;
@@ -37,10 +37,6 @@ VCLXAccessibleComboBox::VCLXAccessibleComboBox (VCLXWindow* pVCLWindow)
 }


-VCLXAccessibleComboBox::~VCLXAccessibleComboBox()
-{
-}
-
 bool VCLXAccessibleComboBox::IsValid() const
 {
    return GetWindow().get() != nullptr;
@@ -51,10 +51,6 @@ VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCL
 }


-VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox()
-{
-}
-
 bool VCLXAccessibleDropDownComboBox::IsValid() const
 {
    return GetWindow().get() != nullptr;
@@ -50,10 +50,6 @@ VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWi
 }


-VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox()
-{
-}
-
 bool VCLXAccessibleDropDownListBox::IsValid() const
 {
    return GetWindow().get() != nullptr;
@@ -25,12 +25,6 @@ using namespace ::com::sun::star;
 // VCLXAccessibleFixedHyperlink


-VCLXAccessibleFixedHyperlink::VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLWindow )
-    :VCLXAccessibleTextComponent( pVCLWindow )
-{
-}
-
-
 // XServiceInfo


@@ -33,12 +33,6 @@ using namespace ::com::sun::star::accessibility;
 // VCLXAccessibleFixedText


-VCLXAccessibleFixedText::VCLXAccessibleFixedText( VCLXWindow* pVCLWindow )
-    :VCLXAccessibleTextComponent( pVCLWindow )
-{
-}
-
-
 void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
    VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
@@ -97,11 +97,6 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
 }


-VCLXAccessibleList::~VCLXAccessibleList()
-{
-}
-
-
 void VCLXAccessibleList::SetIndexInParent (sal_Int32 nIndex)
 {
    m_nIndexInParent = nIndex;
@@ -78,10 +78,6 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, const
        m_sEntryText = pListBoxHelper->GetEntry(static_cast<sal_uInt16>(_nIndexInParent));
 }

-VCLXAccessibleListItem::~VCLXAccessibleListItem()
-{
-}
-
 void VCLXAccessibleListItem::SetSelected( bool _bSelected )
 {
    if ( m_bSelected != _bSelected )
@@ -45,17 +45,6 @@ using namespace ::comphelper;
 // VCLXAccessibleScrollBar


-VCLXAccessibleScrollBar::VCLXAccessibleScrollBar( VCLXWindow* pVCLWindow )
-    :VCLXAccessibleComponent( pVCLWindow )
-{
-}
-
-
-VCLXAccessibleScrollBar::~VCLXAccessibleScrollBar()
-{
-}
-
-
 void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
    switch ( rVclWindowEvent.GetId() )
@@ -45,11 +45,6 @@ VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow )
 }


-VCLXAccessibleStatusBar::~VCLXAccessibleStatusBar()
-{
-}
-
-
 void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, bool bShowing )
 {
    if ( i >= 0 && i < static_cast<sal_Int32>(m_aAccessibleChildren.size()) )
@@ -58,11 +58,6 @@ VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar,
 }


-VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem()
-{
-}
-
-
 bool VCLXAccessibleStatusBarItem::IsShowing()
 {
    bool bShowing = false;
@@ -55,11 +55,6 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
 }


-VCLXAccessibleTabControl::~VCLXAccessibleTabControl()
-{
-}
-
-
 void VCLXAccessibleTabControl::UpdateFocused()
 {
    for (Reference<XAccessible>& xChild : m_aAccessibleChildren)
@@ -58,11 +58,6 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo
 }


-VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow()
-{
-}
-
-
 // OCommonAccessibleComponent


@@ -55,11 +55,6 @@ VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindo
 }


-VCLXAccessibleTextComponent::~VCLXAccessibleTextComponent()
-{
-}
-
-
 void VCLXAccessibleTextComponent::SetText( const OUString& sText )
 {
    Any aOldValue, aNewValue;
@@ -37,19 +37,13 @@ using namespace ::com::sun::star::accessibility;


 VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const Reference< XAccessible >& _xParent) :
-
    VCLXAccessibleTextComponent (pVCLWindow),
-
    m_xParent( _xParent )

 {
 }


-VCLXAccessibleTextField::~VCLXAccessibleTextField()
-{
-}
-
 OUString VCLXAccessibleTextField::implGetText()
 {
    OUString aText;