summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-09-01 18:26:29 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-09-02 19:08:49 +0200
commitc1c679deca078209bc3008ccd9ccc0a8715929a1 (patch)
tree6f5a1a1207636b4b7f1b0575f36cbf579f7c85af /include
parent58da51715425d781b5b8b9b9e412c98daf80b601 (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/editeng/editeng.hxx7
-rw-r--r--include/editeng/editview.hxx5
-rw-r--r--include/editeng/outliner.hxx5
3 files changed, 10 insertions, 7 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index c1fb0c2c8ffb..9f078cc5f0ab 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -214,8 +214,9 @@ public:
/// bRestoring is used for LOK to update cursor visibility, specifically,
/// when true, it means we are restoring the update mode after internally
/// disabling it (f.e. during SetText to set/delete default text in Impress).
- void SetUpdateMode(bool bUpdate, bool bRestoring = false);
- bool GetUpdateMode() const;
+ /// @return previous value of update
+ bool SetUpdateLayout(bool bUpdate, bool bRestoring = false);
+ bool IsUpdateLayout() const;
void SetBackgroundColor( const Color& rColor );
Color const & GetBackgroundColor() const;
@@ -620,7 +621,7 @@ public:
const ViewsType& GetEditViews() const;
void SetUndoMode(bool b);
- void FormatAndUpdate(EditView* pCurView, bool bCalledFromUndo = false);
+ void FormatAndLayout(EditView* pCurView, bool bCalledFromUndo = false);
void Undo(EditView* pView);
void Redo(EditView* pView);
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index c981c544f9e1..8332e516915d 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -283,8 +283,9 @@ public:
css::uno::Reference<css::datatransfer::XTransferable> GetTransferable() const;
// An EditView, so that when TRUE the update will be free from flickering:
- void SetEditEngineUpdateMode( bool bUpdate );
- void ForceUpdate();
+ // @return the previous bUpdateLayout state
+ bool SetEditEngineUpdateLayout( bool bUpdate );
+ void ForceLayoutCalculation();
const SfxStyleSheet* GetStyleSheet() const;
SfxStyleSheet* GetStyleSheet();
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index c340bd15c8c0..999981c69af0 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -697,8 +697,9 @@ public:
void SetMaxDepth( sal_Int16 nDepth );
sal_Int16 GetMaxDepth() const { return nMaxDepth; }
- void SetUpdateMode( bool bUpdate );
- bool GetUpdateMode() const;
+ /// @return previous value of bUpdateLayout state
+ bool SetUpdateLayout( bool bUpdate );
+ bool IsUpdateLayout() const;
void Clear();