include/sfx2/charwin.hxx | 2 -- sfx2/source/control/charwin.cxx | 15 ++++++--------- vcl/source/app/salvtables.cxx | 2 -- 3 files changed, 6 insertions(+), 13 deletions(-)
New commits: commit 5e08982f7634df742ceefdf5bc6efcdaf7aa65b2 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Dec 10 21:53:56 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 12 13:25:21 2025 +0100 vcl: Drop unnecessary "forward declaration" The class is already defined in the included header, so there is no need for a forward declaration here. Change-Id: I41030b7a7297f4ed802a4857a9d05fb73e3f6dfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195408 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index e3b50b9f1dbe..e575e5b777bc 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -3465,8 +3465,6 @@ IMPL_LINK(SalInstanceEntry, CursorListener, VclWindowEvent&, rEvent, void) IMPL_LINK_NOARG(SalInstanceEntry, ActivateHdl, Edit&, bool) { return m_aActivateHdl.Call(*this); } -class SalInstanceTreeView; - static SalInstanceTreeView* g_DragSource; namespace commit d25feefee3ded1cd6f7c54217a6679bcfb8e6508 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Dec 10 16:38:03 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 12 13:25:13 2025 +0100 sfx2: Merge SvxCharView::ContextMenuSelect into only caller No need to have this as a public method. Change-Id: Ibbeccae1d20e3b937117f4a64b599390e6eae6ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195400 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx index 9a7b440ee39d..4714f202ba67 100644 --- a/include/sfx2/charwin.hxx +++ b/include/sfx2/charwin.hxx @@ -69,8 +69,6 @@ public: void setMouseClickHdl(const Link<SvxCharView*,void> &rLink); void setClearClickHdl(const Link<SvxCharView*,void> &rLink); void setClearAllClickHdl(const Link<SvxCharView*,void> &rLink); - - void ContextMenuSelect(std::u16string_view rIdent); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index 105be1906ff4..cd5a14e30982 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -171,17 +171,14 @@ void SvxCharView::createContextMenu(const Point& rPosition) std::unique_ptr<weld::Builder> xBuilder( Application::CreateBuilder(pDrawingArea, u"sfx/ui/charviewmenu.ui"_ustr)); std::unique_ptr<weld::Menu> xItemMenu(xBuilder->weld_menu(u"charviewmenu"_ustr)); - ContextMenuSelect( - xItemMenu->popup_at_rect(pDrawingArea, tools::Rectangle(rPosition, Size(1, 1)))); - Invalidate(); -} - -void SvxCharView::ContextMenuSelect(std::u16string_view rMenuId) -{ - if (rMenuId == u"clearchar") + const OUString sMenuId + = xItemMenu->popup_at_rect(pDrawingArea, tools::Rectangle(rPosition, Size(1, 1))); + if (sMenuId == u"clearchar") maClearClickHdl.Call(this); - else if (rMenuId == u"clearallchar") + else if (sMenuId == u"clearallchar") maClearAllClickHdl.Call(this); + + Invalidate(); } void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
