commit 6433dc223f6d21570e7132c4a580d186a5d5a334
author Michael Stahl <michael.stahl@allotropia.de> Fri Nov 19 16:08:57 2021 +0100
committer Thorsten Behrens <thorsten.behrens@allotropia.de> Thu Dec 23 12:08:38 2021 +0100
tree dc630b38e7d4cc9267b60499d086773e24b8615d
parent a7fb9ec83d08d28383918a40a0f9ccbbdccbf506

Revert "Revert "sw_fieldmarkhide: init fieldmark mode from options""

This reverts commit 70dd95aabd11b2146e2556c1da87da4a22d6f7b5.

Looks like we might get some time to fix bugs.

Change-Id: I7038c5e854676e2540011dd2a8dcfb8870788502
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125558
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 657de5fba12b0e9afcdee361654d2a2d0dbd7311)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127261
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>

sw/source/core/layout/newfrm.cxx

diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index b433436..c09c557 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -415,7 +415,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 ),

sw/source/core/view/viewsh.cxx

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 0f8284c5..b16b2d0 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2285,9 +2285,16 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
    // - fieldnames apply or not ...
    // ( - SwEndPortion must _no_ longer be generated. )
    // - Of course, the screen is something completely different than the printer ...
    bReformat = bReformat || mpOpt->IsFieldName() != rOpt.IsFieldName();
    bool const isToggleFieldNames(mpOpt->IsFieldName() != rOpt.IsFieldName());

    if (mpOpt->IsFieldName() != rOpt.IsFieldName())
    {
        GetLayout()->SetFieldmarkMode( rOpt.IsFieldName()
                    ? sw::FieldmarkMode::ShowCommand
                    : sw::FieldmarkMode::ShowResult );
        bReformat = true;
    }

    // The map mode is changed, minima/maxima will be attended by UI
    if( mpOpt->GetZoom() != rOpt.GetZoom() && !IsPreview() )
    {