rename UpdateMode -> UpdateLayout in editeng class

... because "update" is such a generic term I keep forgetting what we
are turning on and off

Also return the previous value from SetUpdateLayout to
make the save/restore code more compact.

Change-Id: Iae1764c837a92e58c9b17521f130e8fc80311d22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121479
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 11 insertions, 11 deletions

diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 3f9758ae8bc0..f7c0d0046b5e 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -269,7 +269,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
 
     // What follows now is the counterpart of SdrTextObject::SetText()
     Outliner aOutliner(nullptr, OutlinerMode::TextObject);
-    aOutliner.SetUpdateMode( false );
+    aOutliner.SetUpdateLayout( false );
     aOutliner.SetText( *pOutlinerParaObj );
     OUString aText( aOutliner.GetText( aOutliner.GetParagraph(0),
                                      aOutliner.GetParagraphCount() ) );
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 19f663f9895c..aeb18ab29fe8 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -316,7 +316,7 @@ void SwAnnotationWin::InitControls()
     SwDocShell* aShell = mrView.GetDocShell();
     mpOutliner.reset(new Outliner(&aShell->GetPool(),OutlinerMode::TextObject));
     aShell->GetDoc()->SetCalcFieldValueHdl( mpOutliner.get() );
-    mpOutliner->SetUpdateMode( true );
+    mpOutliner->SetUpdateLayout( true );
 
     mpOutlinerView.reset(new OutlinerView(mpOutliner.get(), nullptr));
     mpOutliner->InsertView(mpOutlinerView.get());
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index 939890805425..8106f0b32191 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -81,7 +81,7 @@ SdrHHCWrapper::~SdrHHCWrapper()
         SdrView *pSdrView = pView->GetWrtShell().GetDrawView();
         OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" );
         pSdrView->SdrEndTextEdit( true );
-        SetUpdateMode(false);
+        SetUpdateLayout(false);
         pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1, 1) ) );
     }
     RemoveView( pOutlView.get() );
@@ -102,7 +102,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
         SdrView *pSdrView = pView->GetWrtShell().GetDrawView();
         OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" );
         pSdrView->SdrEndTextEdit( true );
-        SetUpdateMode(false);
+        SetUpdateLayout(false);
         pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1, 1) ) );
         SetPaperSize( Size(1, 1) );
         Clear();
@@ -131,7 +131,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
                 //!! work correctly because the document may not be properly
                 //!! formatted when some information is accessed, and thus
                 //!! incorrect results get returned.
-                SetUpdateMode(true);
+                SetUpdateLayout(true);
                 if (HasConvertibleTextPortion( nSourceLang ))
                 {
                     SdrView *pSdrView = pView->GetWrtShell().GetDrawView();
@@ -141,13 +141,13 @@ bool SdrHHCWrapper::ConvertNextDocument()
                     bNextDoc = true;
                     pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1,1)));
                     SetPaperSize( pTextObj->GetLogicRect().GetSize() );
-                    SetUpdateMode(true);
+                    SetUpdateLayout(true);
                     pView->GetWrtShell().MakeVisible(SwRect(pTextObj->GetLogicRect()));
 
                     pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), false, this, pOutlView.get(), true, true);
                 }
                 else
-                    SetUpdateMode(false);
+                    SetUpdateLayout(false);
             }
 
             if ( !bNextDoc )
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 2ee297ae4095..ad089f373e42 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1769,7 +1769,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
     // do not flicker
     pOLV->HideCursor();
     Outliner * pOutliner = pOLV->GetOutliner();
-    pOutliner->SetUpdateMode(false);
+    pOutliner->SetUpdateLayout(false);
 
     SfxItemSet aOldSet( pOLV->GetAttribs() );
     SfxItemSet aFontSet(
@@ -1813,7 +1813,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
     pOLV->SetAttribs( aFontSet );
 
     // From now on show it again
-    pOutliner->SetUpdateMode(true);
+    pOutliner->SetUpdateLayout(true);
     pOLV->ShowCursor();
 
     rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) );
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index d7cdea7018d7..2cb86428b65b 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -732,7 +732,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
     // do not flicker
     pOLV->HideCursor();
     SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
-    pOutliner->SetUpdateMode(false);
+    pOutliner->SetUpdateLayout(false);
 
     SfxItemSet aOldSet( pOLV->GetAttribs() );
     SfxItemSet aFontSet(
@@ -776,7 +776,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
     pOLV->SetAttribs( aFontSet );
 
     // From now on show again
-    pOutliner->SetUpdateMode(true);
+    pOutliner->SetUpdateLayout(true);
     pOLV->ShowCursor();
 
     rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) );