sw/source/uibase/utlui/content.cxx | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 81a60c1589593504bad27558f0c9f20861b9752c
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Tue Jul 14 13:56:56 2020 -0800
Commit: Jim Raykowski <rayk...@gmail.com>
CommitDate: Wed Jul 15 18:50:14 2020 +0200
Show Navigator Headings context menu outline items in ro mode
This patch makes available Expand/Collapse All, Outline Tracking, and
Outline Level context menu items fo all entries of Navigator Heading in
the content tree when in read-only mode. Currently these items are only
available for Headings root entry when in read-only mode.
Change-Id: I6a683f4f0d5fb7f3c79d542bdecc6d3023aca1b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98793
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <rayk...@gmail.com>
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index fd71114b8a40..e9d498d2b426 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1254,7 +1254,17 @@ IMPL_LINK(SwContentTree, CommandHdl, const
CommandEvent&, rCEvt, bool)
ContentTypeId::INDEX == nContentType ||
ContentTypeId::DRAWOBJECT == nContentType);
- if (!bReadonly && (bEditable || bDeletable))
+ if(ContentTypeId::OUTLINE == nContentType)
+ {
+ bOutline = true;
+ bRemoveToggleExpandEntry =
lcl_InsertExpandCollapseAllItem(*m_xTreeView, *xEntry, *xPop);
+ if (!bReadonly)
+ {
+ bRemoveSelectEntry = false;
+ bRemoveChapterEntries = false;
+ }
+ }
+ else if (!bReadonly && (bEditable || bDeletable))
{
if(ContentTypeId::INDEX == nContentType)
{
@@ -1279,13 +1289,6 @@ IMPL_LINK(SwContentTree, CommandHdl, const
CommandEvent&, rCEvt, bool)
xPop->set_sensitive(OString::number(404), bProt);
bRemoveDeleteEntry = false;
}
- else if(ContentTypeId::OUTLINE == nContentType)
- {
- bOutline = true;
- bRemoveToggleExpandEntry =
lcl_InsertExpandCollapseAllItem(*m_xTreeView, *xEntry, *xPop);
- bRemoveSelectEntry = false;
- bRemoveChapterEntries = false;
- }
else if(ContentTypeId::DRAWOBJECT == nContentType)
{
bRemoveDeleteEntry = false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
