core.git: sw/inc sw/source

[Caolán McNamara (via logerrit)]

 sw/inc/viewopt.hxx                  |    2 ++
 sw/source/core/view/viewsh.cxx      |    9 +--------
 sw/source/uibase/config/viewopt.cxx |   12 ++++++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 9e917a7ce95d1564814e90188bc915a38ac69468
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 25 09:51:24 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jan 25 13:26:43 2024 +0100

    extract this to a explanatory SyncLayoutRelatedViewOptions function
    
    no change intended here
    
    Change-Id: I67e7279d27e9cea31c9c26d1775f8dd28bd74e48
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162561
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 72659849a627..95c547e5c691 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -856,6 +856,8 @@ public:
 
     // Useful for when getting the current view SwViewOption is not possible 
otherwise
     static const SwViewOption& GetCurrentViewOptions();
+
+    void SyncLayoutRelatedViewOptions(const SwViewOption& rOpt);
 };
 
 inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 9ad7015e236f..a7222d95b049 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2217,14 +2217,7 @@ void SwViewShell::ApplyViewOptions( const SwViewOption 
&rOpt )
         if(&rSh == this)
             continue;
         SwViewOption aOpt( *rSh.GetViewOptions() );
-        aOpt.SetFieldName( rOpt.IsFieldName() );
-        aOpt.SetShowHiddenField( rOpt.IsShowHiddenField() );
-        aOpt.SetShowHiddenPara( rOpt.IsShowHiddenPara() );
-        aOpt.SetShowHiddenChar( rOpt.IsShowHiddenChar() );
-        aOpt.SetViewLayoutBookMode( rOpt.IsViewLayoutBookMode() );
-        aOpt.SetHideWhitespaceMode(rOpt.IsHideWhitespaceMode());
-        aOpt.SetViewLayoutColumns(rOpt.GetViewLayoutColumns());
-        aOpt.SetPostIts(rOpt.IsPostIts());
+        aOpt.SyncLayoutRelatedViewOptions(rOpt);
         if ( !(aOpt == *rSh.GetViewOptions()) )
             rSh.ImplApplyViewOptions( aOpt );
     }
diff --git a/sw/source/uibase/config/viewopt.cxx 
b/sw/source/uibase/config/viewopt.cxx
index 3cf82bee15ab..abd8bbc85768 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -612,6 +612,18 @@ bool SwViewOption::IsIgnoreProtectedArea()
     return gIgnoreProtectedArea.get();
 }
 
+void SwViewOption::SyncLayoutRelatedViewOptions(const SwViewOption& rOpt)
+{
+    SetFieldName(rOpt.IsFieldName());
+    SetShowHiddenField(rOpt.IsShowHiddenField());
+    SetShowHiddenPara(rOpt.IsShowHiddenPara());
+    SetShowHiddenChar(rOpt.IsShowHiddenChar());
+    SetViewLayoutBookMode(rOpt.IsViewLayoutBookMode());
+    SetHideWhitespaceMode(rOpt.IsHideWhitespaceMode());
+    SetViewLayoutColumns(rOpt.GetViewLayoutColumns());
+    SetPostIts(rOpt.IsPostIts());
+}
+
 const SwViewOption& SwViewOption::GetCurrentViewOptions()
 {
     SfxViewShell* pCurrentShell = SfxViewShell::Current();