summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-11-06 21:47:21 +0100
committerMichael Stahl <michael.stahl@cib.de>2020-11-19 14:21:10 +0100
commitc0864f26f3143ea81c65d3826fae32a8fd54c531 (patch)
tree28f11c81b913cb1dcab50df954431932b7e90852
parentc74a2fd835474caf311be10703c985e2f916a83b (diff)
sw_fieldmarkhide: init fieldmark mode from options
Change-Id: Ied4302a60c0d7e0937b647e4e3a6a5f78ee31dc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105989 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
-rw-r--r--sw/source/core/layout/newfrm.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index cd527d13903c..0431299cdd72 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -414,7 +414,9 @@ SwRootFrame::SwRootFrame( SwFrameFormat *pFormat, SwViewShell * pSh ) :
mbCallbackActionEnabled ( false ),
mbLayoutFreezed ( false ),
mbHideRedlines(pFormat->GetDoc()->GetDocumentRedlineManager().IsHideRedlines()),
- m_FieldmarkMode(sw::FieldmarkMode::ShowBoth),
+ m_FieldmarkMode(pSh->GetViewOptions()->IsFieldName()
+ ? sw::FieldmarkMode::ShowCommand
+ : sw::FieldmarkMode::ShowResult),
mnBrowseWidth(MIN_BROWSE_WIDTH),
mpTurbo( nullptr ),
mpLastPage( nullptr ),