From baa84a3f29dc7b36ea4898c5c63eab4f28c46566 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 6 Nov 2020 21:47:21 +0100 Subject: init fieldmark mode from options, TODO fails sw_layoutwriter Change-Id: Ied4302a60c0d7e0937b647e4e3a6a5f78ee31dc2 --- sw/source/core/layout/newfrm.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 ), -- cgit v1.2.1