sw/source/core/layout/newfrm.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c0864f26f3143ea81c65d3826fae32a8fd54c531
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Nov 6 21:47:21 2020 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Thu Nov 19 14:21:10 2020 +0100
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.st...@cib.de>
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 ),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
