sfx2/source/toolbox/weldutils.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b9644a230cbaa1cf0478506c9a766c2a93276133
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Feb 28 15:45:04 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Feb 29 16:55:14 2020 +0100
skip non-uno dispatch toolbar entries
Change-Id: Ifaf3bf5d361cb154831391e26502fc30fffa52e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89724
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sfx2/source/toolbox/weldutils.cxx
b/sfx2/source/toolbox/weldutils.cxx
index 3b16543242aa..1be8559d4d87 100644
--- a/sfx2/source/toolbox/weldutils.cxx
+++ b/sfx2/source/toolbox/weldutils.cxx
@@ -87,7 +87,10 @@ ToolbarUnoDispatcher::ToolbarUnoDispatcher(weld::Toolbar&
rToolbar,
for (int i = 0, nItems = rToolbar.get_n_items(); i < nItems; ++i)
{
- OUString sCommand = OUString::fromUtf8(rToolbar.get_item_ident(i));
+ OString sIdent(rToolbar.get_item_ident(i));
+ if (!sIdent.startsWith(".uno:"))
+ continue;
+ OUString sCommand = OUString::fromUtf8(sIdent);
if (bRTL && lcl_RTLizeCommandURL(sCommand))
rToolbar.set_item_ident(i, sCommand.toUtf8());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
