summaryrefslogtreecommitdiffstats
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-06 21:56:41 +0100
commitbaa84a3f29dc7b36ea4898c5c63eab4f28c46566 (patch)
treec70630778831d56f46dfa33a580be73b8a5d2fd5
parentWIP draft (diff)
downloadcore-private/mst/sw_fieldmarkhide.tar.gz
core-private/mst/sw_fieldmarkhide.zip
init fieldmark mode from options, TODO fails sw_layoutwriter private/mst/sw_fieldmarkhide
Change-Id: Ied4302a60c0d7e0937b647e4e3a6a5f78ee31dc2
-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 ),