diff options
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 18 | ||||
-rw-r--r-- | include/svtools/ivctrl.hxx | 1 | ||||
-rw-r--r-- | include/svtools/svtabbx.hxx | 3 | ||||
-rw-r--r-- | include/svtools/toolbarmenu.hxx | 1 | ||||
-rw-r--r-- | svtools/inc/vclxaccessibleheaderbaritem.hxx | 3 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.hxx | 3 | ||||
-rw-r--r-- | svtools/source/brwbox/editbrowsebox2.cxx | 10 | ||||
-rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 5 | ||||
-rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/vclxaccessibleheaderbaritem.cxx | 8 | ||||
-rw-r--r-- | svtools/source/uno/popupwindowcontroller.cxx | 1 |
12 files changed, 2 insertions, 63 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 8103789ac71a..8f66b137f852 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -607,16 +607,6 @@ namespace svt virtual void DeactivateCell(bool bUpdate = true); // Children --------------------------------------------------------------- - /** Creates the accessible object of a data table cell. - @param nRow - The row index of the cell. - @param nColumnId - The column ID of the cell. - @return - The XAccessible interface of the specified cell. */ - virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) override; - /** @return The count of additional controls of the control area. */ virtual sal_Int32 GetAccessibleControlCount() const override; @@ -628,14 +618,6 @@ namespace svt virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 nIndex ) override; - /** Creates the accessible object of a column header. - @param nColumnId - The column ID of the header. - @return - The XAccessible interface of the specified column header. */ - virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleRowHeader( sal_Int32 _nRow ) override; - /** Sets focus to current cell of the data table. */ virtual void GrabTableFocus() override; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 37f3a75fd880..27779afefe9b 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -209,7 +209,6 @@ protected: virtual void GetFocus() override; virtual void LoseFocus() override; void ClickIcon(); - virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; static void DrawEntryImage( diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index b779494300a3..03580f10ad2c 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -188,9 +188,8 @@ public: virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) override; virtual void SetNoSelection() override; - using SvListView::SelectAll; + using SvTabListBox::SelectAll; virtual void SelectAll() override; - virtual void SelectAll( bool bSelect, bool bPaint = true ) override; virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ) override; virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) override; virtual sal_Int32 GetSelectedRowCount() const override; diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index e2b47f4d92f6..840c641bca50 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -84,7 +84,6 @@ public: virtual void KeyInput( const KeyEvent& rKEvent ) override; virtual void Command( const CommandEvent& rCEvt ) override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; - virtual void RequestHelp( const HelpEvent& rHEvt ) override; virtual void GetFocus() override; virtual void LoseFocus() override; diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index 504de6e0c87c..182205144020 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -62,9 +62,6 @@ protected: // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; - // XComponent - virtual void SAL_CALL disposing() override; - public: VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); virtual ~VCLXAccessibleHeaderBarItem() override; diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index e8d0f8e774e8..a3e1604fc633 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -161,8 +161,7 @@ public: void DoOutstandingInvalidations(); void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) override; void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; - void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ) override - { Control::Invalidate( rRegion, nFlags ); } + using Control::Invalidate; protected: void StartRowDividerDrag( const Point& _rStartPos ); diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index f0ab7d045c01..153b5c7a2219 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -55,11 +55,6 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, return xReturn; } -Reference< XAccessible > EditBrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) -{ - return BrowseBox::CreateAccessibleCell( _nRow, _nColumnPos ); -} - sal_Int32 EditBrowseBox::GetAccessibleControlCount() const { return IsEditing() ? 1 : 0; @@ -104,11 +99,6 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleControl( sal_Int32 _nInd return m_aImpl->m_xActiveCell; } -Reference<XAccessible > EditBrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow ) -{ - return BrowseBox::CreateAccessibleRowHeader( _nRow ); -} - void EditBrowseBoxImpl::clearActiveCell() { try diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 0f2b90c20f93..2ded15f9c54f 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -325,12 +325,6 @@ void SvtIconChoiceCtrl::InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ) _pImpl->InvalidateEntry( pEntry ); } -void SvtIconChoiceCtrl::StateChanged( StateChangedType nType ) -{ - Control::StateChanged( nType ); -} - - void SvtIconChoiceCtrl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) || diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 4b07b1270426..c99df45dd3bb 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -736,11 +736,6 @@ void SvHeaderTabListBox::SelectAll() SvTreeListBox::SelectAll(true); } -void SvHeaderTabListBox::SelectAll( bool bSelect, bool bPaint ) -{ - // overwritten just to disambiguate the SelectAll() from the base' class SelectAll( bool, bool ) - SvTabListBox::SelectAll( bSelect, bPaint ); -} void SvHeaderTabListBox::SelectRow( long _nRow, bool _bSelect, bool ) { Select( GetEntry( _nRow ), _bSelect ); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 897c423905c0..6a73703ea57d 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1356,12 +1356,6 @@ void ToolbarMenu::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } -void ToolbarMenu::RequestHelp( const HelpEvent& rHEvt ) -{ - ToolbarPopup::RequestHelp( rHEvt ); -} - - void ToolbarMenu::StateChanged( StateChangedType nType ) { ToolbarPopup::StateChanged( nType ); diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index ddbcb0bf357e..3d7ed2a610dc 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -101,14 +101,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedC IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE ) -// XComponent - - -void VCLXAccessibleHeaderBarItem::disposing() -{ - OAccessibleExtendedComponentHelper::disposing(); -} - // XServiceInfo OUString VCLXAccessibleHeaderBarItem::getImplementationName() throw (RuntimeException, std::exception) { diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 09b688595590..f8d6f4775bd6 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -181,7 +181,6 @@ void SAL_CALL PopupWindowController::statusChanged( const frame::FeatureStateEve enable( rEvent.IsEnabled ); } -// XToolbarController Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() throw (RuntimeException, std::exception) { VclPtr< ToolBox > pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() ); |