loplugin:expandablemethods in accessibility

Change-Id: I51d13c12274d99623b97f611e30204bea624cbfc

10 files changed, 2 insertions, 42 deletions

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index 12948bcb2d9a..bc6f1a5ea384 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -211,9 +211,6 @@ public:
         ::svt::IAccessibleTableProvider& _rBrowseBox
     );
 
-    /// checks whether the accessible context is still alive
-    bool                            isContextAlive() const;
-
     /// returns the AccessibleContext belonging to this Accessible
     inline AccessibleBrowseBox*            getContext()         { return m_pContext; }
 
@@ -233,7 +230,7 @@ protected:
     void dispose() override;
     virtual bool isAlive() const override
     {
-        return isContextAlive();
+        return m_pContext && m_pContext->isAlive();
     }
     virtual css::uno::Reference< css::accessibility::XAccessible >
         getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) override
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index 70cab0dfb080..6d0ff563271f 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -198,9 +198,6 @@ protected:
     /** @attention  This method requires locked mutex's and a living object.
         @return  The column index of the specified cell index. */
     sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
-    /** @attention  This method requires locked mutex's and a living object.
-        @return  The child index of the specified cell address. */
-    sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  TRUE, if the specified row is selected. */
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index fed499099583..c99ac4ece64d 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -179,9 +179,6 @@ public:
         ::svt::table::IAccessibleTable& _rTable
     );
 
-    /// checks whether the accessible context is still alive
-    bool                            isContextAlive() const;
-
     /// returns the AccessibleContext belonging to this Accessible
     inline AccessibleGridControl*            getContext()         { return m_pContext; }
 
@@ -201,7 +198,7 @@ protected:
     void DisposeAccessImpl() override;
     virtual bool isAlive() const override
     {
-        return isContextAlive();
+        return m_pContext && m_pContext->isAlive();
     }
     virtual void commitCellEvent( sal_Int16 nEventId,
          const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
index 8a4d981b21c0..9276247f3a5a 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -158,18 +158,11 @@ protected:
     // internal helper methods
 
     /** @attention  This method requires locked mutex's and a living object.
-        @return  The number of cells of the table. */
-    sal_Int32 implGetChildCount() const;
-
-    /** @attention  This method requires locked mutex's and a living object.
         @return  The row index of the specified cell index. */
     sal_Int32 implGetRow( sal_Int32 nChildIndex ) const;
     /** @attention  This method requires locked mutex's and a living object.
         @return  The column index of the specified cell index. */
     sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
-    /** @attention  This method requires locked mutex's and a living object.
-        @return  The child index of the specified cell address. */
-    sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
 
     /** Fills a sequence with sorted indexes of completely selected rows.
         @attention  This method requires locked mutex's and a living object.
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index feb66df68ed2..8b54e3058a86 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -75,10 +75,6 @@ namespace accessibility
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
-        // XServiceInfo - static methods
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(css::uno::RuntimeException);
-        static OUString getImplementationName_Static() throw(css::uno::RuntimeException);
-
         // XAccessible
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index 680aade8a4ed..66cfc092bed6 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -118,10 +118,6 @@ namespace accessibility
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
-        // XServiceInfo - static methods
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(css::uno::RuntimeException);
-        static OUString getImplementationName_Static() throw(css::uno::RuntimeException);
-
         // XEventListener
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
 
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx
index d51458ec25c5..e8249be5d20a 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -88,10 +88,6 @@ namespace accessibility
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
-        // XServiceInfo - static methods
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(css::uno::RuntimeException);
-        static OUString getImplementationName_Static() throw(css::uno::RuntimeException);
-
         // XAccessible
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index 447324a6174a..55cb1bb3b440 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -143,10 +143,6 @@ namespace accessibility
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
-        // XServiceInfo - static methods
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(css::uno::RuntimeException);
-        static OUString getImplementationName_Static() throw(css::uno::RuntimeException);
-
         // XAccessible
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
index 5a41660d518f..6a12f2ad829b 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -48,8 +48,6 @@ private:
     /** Throws an exception, if nIndex is not a valid child index. */
     void ensureValidIndex( sal_Int32 _nIndex ) const;
 
-    /** Returns true, if the specified row is selected. */
-    bool implIsRowSelected( sal_Int32 _nRow ) const;
     /** Selects the specified row. */
     void implSelectRow( sal_Int32 _nRow, bool _bSelect );
 
@@ -59,8 +57,6 @@ private:
     sal_Int32 implGetColumnCount() const override;
     /** Returns the count of selected rows in the table. */
     sal_Int32 implGetSelRowCount() const;
-    /** Returns the total cell count in the table (including header). */
-    inline sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); }
 
     /** Returns the row index from cell index. */
     inline sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx
index 7c84e19f8ec7..e93fa0225ad1 100644
--- a/accessibility/inc/extended/listboxaccessible.hxx
+++ b/accessibility/inc/extended/listboxaccessible.hxx
@@ -53,10 +53,6 @@ namespace accessibility
     protected:
         virtual ~ListBoxAccessibleBase( );
 
-        // own overridables
-        /// will be called for any VclWindowEvent events broadcasted by our VCL window
-        void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
-
         /** will be called when our window broadcasts the VCLEVENT_OBJECT_DYING event
 
             <p>Usually, you derive your class from both ListBoxAccessibleBase and XComponent,