sw/source/uibase/utlui/content.cxx | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 30e427d4091277839f6cbe30d7232498c0b48ef9
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Mon Sep 19 13:21:13 2022 -0800
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 20 09:59:05 2022 +0200
tdf#150604 related: fix logic used in determining inclusion of
a separator in the Navigator content tree context menu
In commit fbc9c8e3759ab79fce457565cd725c5a5353186e, https://
gerrit.libreoffice.org/c/core/+/139628, made to include the content
type name in the 'Delete' menu item in the content type content entry
context menu, I mistakenly used logical OR'ing where logical AND'ing
should be used to determine if a 'Delete' menu item is present, which
is used in determining wheather menu item separator, 'Separator2', is
included.
Change-Id: I4a49895db9e39a0a2feedac8ec3d3440945e8abd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140211
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 8da8aae28676..9e3984333715 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1878,18 +1878,18 @@ IMPL_LINK(SwContentTree, CommandHdl, const
CommandEvent&, rCEvt, bool)
if (bRemoveDeleteFieldEntry)
xPop->remove("deletefield");
- const bool bRemoveDeleteEntry =
- bRemoveDeleteChapterEntry ||
- bRemoveDeleteFrameEntry ||
- bRemoveDeleteImageEntry ||
- bRemoveDeleteOLEObjectEntry ||
- bRemoveDeleteBookmarkEntry ||
- bRemoveDeleteHyperlinkEntry ||
- bRemoveDeleteIndexEntry ||
- bRemoveDeleteCommentEntry ||
- bRemoveDeleteDrawingObjectEntry ||
- bRemoveDeleteFieldEntry ||
- bRemoveDeleteTableEntry;
+ bool bRemoveDeleteEntry =
+ bRemoveDeleteChapterEntry &&
+ bRemoveDeleteTableEntry &&
+ bRemoveDeleteFrameEntry &&
+ bRemoveDeleteImageEntry &&
+ bRemoveDeleteOLEObjectEntry &&
+ bRemoveDeleteBookmarkEntry &&
+ bRemoveDeleteHyperlinkEntry &&
+ bRemoveDeleteIndexEntry &&
+ bRemoveDeleteCommentEntry &&
+ bRemoveDeleteDrawingObjectEntry &&
+ bRemoveDeleteFieldEntry;
if (bRemoveRenameEntry)
xPop->remove(OString::number(502));
