cui/source/customize/SvxMenuConfigPage.cxx | 6 ++++--
cui/source/customize/SvxToolbarConfigPage.cxx | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 1ca386b8ed93957c47628ffe1e88e214a06d6c4e
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Jul 31 09:51:21 2020 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Jul 31 16:09:25 2020 +0200
tdf#135321: fix crash when right click empty in Command list
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=163797
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=d54202ff690e4e97e018461cc6dc3dfadd36a702
author Sarper Akdemir <q.sarperakde...@gmail.com> 2020-02-14 13:17:46
+0300
committer Muhammet Kara <muhammet.k...@collabora.com> 2020-02-28
18:32:54 +0100
commit d54202ff690e4e97e018461cc6dc3dfadd36a702 (patch)
tree 5f60f9c473b30e0f59bbf13a6f773595e1e4e759
parent 531f078f3371e909b03b358bc5c9d70df083555f (diff)
tdf#112135: Provide controls through context menu in lists of Customize
dialog
Change-Id: I73031811257e1d128bb6bdc11c481f7a63bbc05e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99850
Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx
b/cui/source/customize/SvxMenuConfigPage.cxx
index ca685311e8d3..c73502c573c7 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -520,7 +520,8 @@ IMPL_LINK( SvxMenuConfigPage, ContentContextMenuHdl, const
CommandEvent&, rCEvt,
// Select clicked entry
std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator());
- rTreeView.get_dest_row_at_pos( rCEvt.GetMousePosPixel(), xIter.get(),
false );
+ if (! rTreeView.get_dest_row_at_pos( rCEvt.GetMousePosPixel(),
xIter.get(), false ))
+ return false;
rTreeView.select(*xIter);
SelectMenuEntry( rTreeView );
@@ -563,7 +564,8 @@ IMPL_LINK( SvxMenuConfigPage, FunctionContextMenuHdl, const
CommandEvent&, rCEvt
// Select clicked entry
std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator());
- rTreeView.get_dest_row_at_pos( rCEvt.GetMousePosPixel(), xIter.get(),
false );
+ if (! rTreeView.get_dest_row_at_pos( rCEvt.GetMousePosPixel(),
xIter.get(), false ))
+ return false;
rTreeView.select(*xIter);
SelectFunctionHdl( rTreeView );
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx
b/cui/source/customize/SvxToolbarConfigPage.cxx
index ea17c407c0f2..7b929d2ad70e 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -880,7 +880,8 @@ IMPL_LINK( SvxToolbarConfigPage, ContentContextMenuHdl,
const CommandEvent&, rCE
// Select clicked entry
std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator());
- rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get(),
false);
+ if (! rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get(),
false))
+ return false;
rTreeView.select(*xIter);
SelectToolbarEntry( rTreeView );
@@ -925,7 +926,8 @@ IMPL_LINK( SvxToolbarConfigPage, FunctionContextMenuHdl,
const CommandEvent&, rC
// Select clicked entry
std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator());
- rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get(),
false);
+ if (! rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get(),
false))
+ return false;
rTreeView.select(*xIter);
SelectFunctionHdl( rTreeView );
std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(
&rTreeView, "cui/ui/entrycontextmenu.ui" ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
