include/sfx2/thumbnailview.hxx | 2 +- include/svtools/valueset.hxx | 2 +- include/svx/charmap.hxx | 2 +- include/svx/dlgctrl.hxx | 4 ++-- include/svx/frmsel.hxx | 2 +- include/svx/graphctl.hxx | 2 +- include/svx/weldeditview.hxx | 2 +- include/vcl/customweld.hxx | 6 ++---- include/vcl/menu.hxx | 8 ++++---- sc/source/ui/app/inputwin.cxx | 2 +- sc/source/ui/dbgui/csvgrid.cxx | 2 +- sc/source/ui/dbgui/csvruler.cxx | 2 +- sc/source/ui/inc/csvgrid.hxx | 2 +- sc/source/ui/inc/csvruler.hxx | 2 +- sc/source/ui/inc/inputwin.hxx | 2 +- sc/source/ui/inc/tphfedit.hxx | 2 +- sc/source/ui/pagedlg/tphfedit.cxx | 2 +- sfx2/source/control/thumbnailview.cxx | 2 +- starmath/inc/view.hxx | 2 +- starmath/source/view.cxx | 2 +- svtools/source/control/valueset.cxx | 2 +- svx/source/dialog/charmap.cxx | 2 +- svx/source/dialog/dlgctrl.cxx | 4 ++-- svx/source/dialog/frmsel.cxx | 2 +- svx/source/dialog/graphctl.cxx | 2 +- svx/source/dialog/weldeditview.cxx | 2 +- vcl/source/window/menu.cxx | 20 ++++++++++---------- 27 files changed, 42 insertions(+), 44 deletions(-)
New commits: commit 51fac08aacdd51318a99a715a7c9533d1208361e Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jun 25 17:21:54 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 27 09:08:43 2025 +0200 a11y: Return OAccessible in CustomWidgetController::CreateAccessible ... instead of a reference to the abstract XAccessible interface. Change-Id: Ifc795c67eab391d3d74021fdcf9ba9d8e08d34c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186994 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index bfc566860939..ca309f494dc1 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -248,7 +248,7 @@ protected: virtual OUString RequestHelp(tools::Rectangle& rRect) override; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; SAL_DLLPRIVATE const rtl::Reference<ThumbnailViewAcc> & getAccessible() const; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 31893b482aef..5a792ef0a24e 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -258,7 +258,7 @@ private: ValueSet & operator= (const ValueSet &) = delete; protected: - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; public: ValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 556d10154f36..16699f4949a0 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -112,7 +112,7 @@ private: virtual void LoseFocus() override; virtual bool Command(const CommandEvent& rCEvt) override; - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; virtual FactoryFunction GetUITestFactory() const override; protected: diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index fa8ee330e13e..fd8d7c674d04 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -126,7 +126,7 @@ public: tools::Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const; css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } RectPoint GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const; @@ -189,7 +189,7 @@ public: void Reset(); css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } - SAL_DLLPRIVATE virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + SAL_DLLPRIVATE virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } static tools::Long GetSquares() { return nSquares ; } diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 9264a36d8f2a..efd1c3b7b0e6 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -158,7 +158,7 @@ public: // accessibility css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } /** Returns the accessibility child object of the specified frame border (if enabled). */ diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 872ce7c7cc0b..9a59b5b6d3a9 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -125,7 +125,7 @@ public: void SetSdrMode(bool b); Point GetPositionInDialog() const; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; }; class GraphCtrlView final : public SdrView diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx index 8bfc56fc35c4..b54c4adeb632 100644 --- a/include/svx/weldeditview.hxx +++ b/include/svx/weldeditview.hxx @@ -85,7 +85,7 @@ public: void SetAcceptsTab(bool bAcceptsTab) { m_bAcceptsTab = bAcceptsTab; } protected: - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; virtual void EditViewInvalidate(const tools::Rectangle& rRect) override { Invalidate(rRect); } diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx index b875e4963423..df8b788eada2 100644 --- a/include/vcl/customweld.hxx +++ b/include/vcl/customweld.hxx @@ -10,6 +10,7 @@ #ifndef INCLUDED_VCL_CUSTOMWELD_HXX #define INCLUDED_VCL_CUSTOMWELD_HXX +#include <comphelper/OAccessible.hxx> #include <vcl/weld.hxx> class InputContext; @@ -24,10 +25,7 @@ private: DECL_LINK(DragBeginHdl, weld::DrawingArea&, bool); public: - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() - { - return css::uno::Reference<css::accessibility::XAccessible>(); - } + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() { return {}; } // rRect is in Logical units rather than Pixels virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) = 0; virtual void Resize() { Invalidate(); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 315f190c5666..4ae5205ae4ae 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2217,7 +2217,7 @@ void ScTextWnd::SetDrawingArea(weld::DrawingArea* pDrawingArea) EnableRTL(false); // EditEngine can't be used with VCL EnableRTL } -css::uno::Reference< css::accessibility::XAccessible > ScTextWnd::CreateAccessible() +rtl::Reference<comphelper::OAccessible> ScTextWnd::CreateAccessible() { pAcc = new ScAccessibleEditLineObject(this); return pAcc; diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 7e7375a964fc..0790f43b459a 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -1406,7 +1406,7 @@ tools::Rectangle ScCsvGrid::GetFocusRect() // accessibility ============================================================== -css::uno::Reference<css::accessibility::XAccessible> ScCsvGrid::CreateAccessible() +rtl::Reference<comphelper::OAccessible> ScCsvGrid::CreateAccessible() { rtl::Reference<ScAccessibleCsvGrid> xRef(new ScAccessibleCsvGrid(*this)); mxAccessible = xRef; diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index b8be5c88bd99..a4f8c9091cc2 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -655,7 +655,7 @@ void ScCsvRuler::ImplSetMousePointer( sal_Int32 nPos ) // accessibility ============================================================== -css::uno::Reference<css::accessibility::XAccessible> ScCsvRuler::CreateAccessible() +rtl::Reference<comphelper::OAccessible> ScCsvRuler::CreateAccessible() { rtl::Reference<ScAccessibleCsvRuler> xRef(new ScAccessibleCsvRuler(*this)); mxAccessible = xRef; diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 49bb6d492cd3..484e82b6e08f 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -308,7 +308,7 @@ private: // accessibility ---------------------------------------------------------- protected: /** Creates a new accessible object. */ - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index 730d5ac186b3..53e55457bc57 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -174,7 +174,7 @@ private: // accessibility ---------------------------------------------------------- protected: /** Creates a new accessible object. */ - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 4f72230fad34..5d60aef1ecbb 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -91,7 +91,7 @@ public: virtual void SetFormulaMode( bool bSet ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 4685d0c3c8b1..c65049b7e9cc 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -55,7 +55,7 @@ public: void SetNumType(SvxNumType eNumType); - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; ScHeaderEditEngine* GetEditEngine() const override; void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; } diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 5a98e65dd3fd..f69c790c19ff 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -249,7 +249,7 @@ bool ScEditWindow::MouseButtonDown(const MouseEvent& rMEvt) return bRet; } -css::uno::Reference< css::accessibility::XAccessible > ScEditWindow::CreateAccessible() +rtl::Reference<comphelper::OAccessible> ScEditWindow::CreateAccessible() { rtl::Reference<ScAccessibleEditControlObject> tmp = new ScAccessibleEditControlObject(this, ScAccessibleEditObject::EditControl); mxAcc = tmp.get(); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 606999e2ad2d..195bb804a67c 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -363,7 +363,7 @@ void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*) { } -css::uno::Reference< css::accessibility::XAccessible > ThumbnailView::CreateAccessible() +rtl::Reference<comphelper::OAccessible> ThumbnailView::CreateAccessible() { mxAccessible.set(new ThumbnailViewAcc(this)); return mxAccessible; diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index ee338fc9b32f..c24a97817b10 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -124,7 +124,7 @@ public: } // for Accessibility - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + virtual rtl::Reference<comphelper::OAccessible> CreateAccessible() override; SmGraphicAccessible* GetAccessible_Impl() { diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 430745e33644..af0533d14ebb 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -906,7 +906,7 @@ void SmGraphicWindow::ZoomToFitInWindow() } } -uno::Reference< XAccessible > SmGraphicWidget::CreateAccessible() +rtl::Reference<comphelper::OAccessible> SmGraphicWidget::CreateAccessible() { if (!mxAccessible.is()) { diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index a56e6edf763a..4e970c49c90b 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -116,7 +116,7 @@ void ValueSet::SetDrawingArea(weld::DrawingArea* pDrawingArea) maVirDev->EnableRTL(pDrawingArea->get_direction()); } -Reference<XAccessible> ValueSet::CreateAccessible() +rtl::Reference<comphelper::OAccessible> ValueSet::CreateAccessible() { if (!mxAccessible) mxAccessible.set(new ValueSetAcc(this)); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index acdfbf9f490f..65b500ae33f0 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -862,7 +862,7 @@ SvxShowCharSet::~SvxShowCharSet() #endif } -css::uno::Reference< XAccessible > SvxShowCharSet::CreateAccessible() +rtl::Reference<comphelper::OAccessible> SvxShowCharSet::CreateAccessible() { #if !ENABLE_WASM_STRIP_ACCESSIBILITY OSL_ENSURE(!m_xAccessible.is(),"Accessible already created!"); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 5dc6a4220e0e..ab8fe31c94ae 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -557,7 +557,7 @@ tools::Rectangle SvxRectCtl::CalculateFocusRectangle( RectPoint eRectPoint ) con return aRet; } -Reference< XAccessible > SvxRectCtl::CreateAccessible() +rtl::Reference<comphelper::OAccessible> SvxRectCtl::CreateAccessible() { #if !ENABLE_WASM_STRIP_ACCESSIBILITY pAccContext = new SvxRectCtlAccessibleContext(this); @@ -579,7 +579,7 @@ void SvxRectCtl::DoCompletelyDisable(bool bNew) // Control for editing bitmaps -css::uno::Reference< css::accessibility::XAccessible > SvxPixelCtl::CreateAccessible() +rtl::Reference<comphelper::OAccessible> SvxPixelCtl::CreateAccessible() { #if !ENABLE_WASM_STRIP_ACCESSIBILITY if (!m_xAccess.is()) diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 3984432b28d3..8eb734c3bfb4 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1042,7 +1042,7 @@ SvxBorderLineStyle FrameSelector::getCurrentStyleLineStyle() const } // accessibility -Reference< XAccessible > FrameSelector::CreateAccessible() +rtl::Reference<comphelper::OAccessible> FrameSelector::CreateAccessible() { #if !ENABLE_WASM_STRIP_ACCESSIBILITY if( !mxAccess.is() ) diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 34145c88255a..681644359521 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -835,7 +835,7 @@ Point GraphCtrl::GetPositionInDialog() const return Point(); } -css::uno::Reference< css::accessibility::XAccessible > GraphCtrl::CreateAccessible() +rtl::Reference<comphelper::OAccessible> GraphCtrl::CreateAccessible() { #if !ENABLE_WASM_STRIP_ACCESSIBILITY if(mpAccContext == nullptr ) diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index 05cf3132758e..6630432d8808 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -800,7 +800,7 @@ public: } }; -css::uno::Reference<css::accessibility::XAccessible> WeldEditView::CreateAccessible() +rtl::Reference<comphelper::OAccessible> WeldEditView::CreateAccessible() { #if !ENABLE_WASM_STRIP_ACCESSIBILITY if (!m_xAccessible.is()) commit 3421dfae1412e8c8e34841a6401504d2b8d0e481 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jun 25 16:57:01 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 27 09:08:33 2025 +0200 vcl: Make some Menu::HandleMenu* methods non-const ... instead of const_casting inside of them. Change-Id: I8d4dfb0908bfdc89c2861d6e6ba3474e350317d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186993 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 74dc9534f52c..3a4ef3b32faa 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -388,9 +388,9 @@ public: void HighlightItem( sal_uInt16 nItemPos ); void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID - bool HandleMenuCommandEvent(Menu *pMenu, sal_uInt16 nEventId) const; - bool HandleMenuActivateEvent(Menu *pMenu) const; - bool HandleMenuDeActivateEvent(Menu *pMenu) const; + bool HandleMenuCommandEvent(Menu* pMenu, sal_uInt16 nEventId); + bool HandleMenuActivateEvent(Menu* pMenu); + bool HandleMenuDeActivateEvent(Menu* pMenu); /** * Sets an ID. @@ -457,7 +457,7 @@ public: SAL_DLLPRIVATE void ShowButtons( bool bClose, bool bFloat, bool bHide ); SAL_DLLPRIVATE virtual void SelectItem(sal_uInt16 nId) override; - SAL_DLLPRIVATE bool HandleMenuHighlightEvent(Menu *pMenu, sal_uInt16 nEventId) const; + SAL_DLLPRIVATE bool HandleMenuHighlightEvent(Menu* pMenu, sal_uInt16 nEventId); bool HandleMenuButtonEvent(sal_uInt16 nEventId); void SetCloseButtonClickHdl( const Link<void*,void>& rLink ) { maCloseHdl = rLink; } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 9adbf24969a7..76dad48fc003 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2609,13 +2609,13 @@ void MenuBar::SelectItem(sal_uInt16 nId) } // handler for native menu selection and command events -bool Menu::HandleMenuActivateEvent( Menu *pMenu ) const +bool Menu::HandleMenuActivateEvent(Menu* pMenu) { if( pMenu ) { ImplMenuDelData aDelData( this ); - pMenu->pStartedFrom = const_cast<Menu*>(this); + pMenu->pStartedFrom = this; pMenu->bInCallback = true; pMenu->Activate(); @@ -2625,13 +2625,13 @@ bool Menu::HandleMenuActivateEvent( Menu *pMenu ) const return true; } -bool Menu::HandleMenuDeActivateEvent( Menu *pMenu ) const +bool Menu::HandleMenuDeActivateEvent(Menu* pMenu) { if( pMenu ) { ImplMenuDelData aDelData( this ); - pMenu->pStartedFrom = const_cast<Menu*>(this); + pMenu->pStartedFrom = this; pMenu->bInCallback = true; pMenu->Deactivate(); if( !aDelData.isDeleted() ) @@ -2640,10 +2640,10 @@ bool Menu::HandleMenuDeActivateEvent( Menu *pMenu ) const return true; } -bool MenuBar::HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nHighlightEventId ) const +bool MenuBar::HandleMenuHighlightEvent(Menu* pMenu, sal_uInt16 nHighlightEventId) { if( !pMenu ) - pMenu = const_cast<MenuBar*>(this)->ImplFindMenu(nHighlightEventId); + pMenu = ImplFindMenu(nHighlightEventId); if( pMenu ) { ImplMenuDelData aDelData( pMenu ); @@ -2656,7 +2656,7 @@ bool MenuBar::HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nHighlightEventI pMenu->mnHighlightedItemPos = pMenu->GetItemPos( nHighlightEventId ); pMenu->nSelectedId = nHighlightEventId; pMenu->sSelectedIdent = pMenu->GetItemIdent( nHighlightEventId ); - pMenu->pStartedFrom = const_cast<MenuBar*>(this); + pMenu->pStartedFrom = this; pMenu->ImplCallHighlight( pMenu->mnHighlightedItemPos ); } return true; @@ -2665,15 +2665,15 @@ bool MenuBar::HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nHighlightEventI return false; } -bool Menu::HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nCommandEventId ) const +bool Menu::HandleMenuCommandEvent(Menu* pMenu, sal_uInt16 nCommandEventId) { if( !pMenu ) - pMenu = const_cast<Menu*>(this)->ImplFindMenu(nCommandEventId); + pMenu = ImplFindMenu(nCommandEventId); if( pMenu ) { pMenu->nSelectedId = nCommandEventId; pMenu->sSelectedIdent = pMenu->GetItemIdent(nCommandEventId); - pMenu->pStartedFrom = const_cast<Menu*>(this); + pMenu->pStartedFrom = this; pMenu->ImplSelect(); return true; }
