diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-21 13:36:13 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-21 14:03:49 +0200 |
| commit | 1cfa72a83101d7ea1f89b2c20a6c29d12e8da933 (patch) | |
| tree | 318032bd20ff9943c9039b539c8a68c6a71b4e10 /include/editeng | |
| parent | flatten TableType in ColumnSpanSet (diff) | |
| download | core-1cfa72a83101d7ea1f89b2c20a6c29d12e8da933.tar.gz core-1cfa72a83101d7ea1f89b2c20a6c29d12e8da933.zip | |
IsVertical->IsEffectivelyVertical, GetDirectVertical->GetVertical
Before commit 653b53287ca09a9ffe3f5ce0242919e719c1086c, editengine
objects had a pair IsVertical/SetVertical, which queried and set
a boolean flag (and SetVertical also had a second argument to set
another flag).
The mentioned commit had introduced an inconsistency, changing
SetVertical to only set a single flag, but at the same time making
IsVertical to return a synthesized result from two values: vertical
and rotation. Additionally, GetDirectVertical was introduced to
complement SetVertical.
In many places, the use of synthetic IsVertical looks suspicious,
especially where it is used in combinations with SetVertical. But
here I don't change existing logic, and only rename the methods,
so that in case someone sees an actual problem, it would be easier
to spot the method mismatch.
The end result is that now we have a proper getter/setter pair
GetVertical/SetVertical, and also IsEffectivelyVertical, named to
reflect that it calculates its return value.
Change-Id: I38e2b7c5bd7af0787dd7a1c48e1385138dac80b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119315
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/editeng.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/editobj.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/outlobj.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 630cbc50dbeb..c1fb0c2c8ffb 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -237,9 +237,9 @@ public: const Size& GetPaperSize() const; void SetVertical( bool bVertical ); - bool IsVertical() const; + bool IsEffectivelyVertical() const; bool IsTopToBottom() const; - bool GetDirectVertical() const; + bool GetVertical() const; void SetRotation(TextRotation nRotation); TextRotation GetRotation() const; diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index fdc0db57d09f..5badaf8e8a2a 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -72,8 +72,8 @@ public: virtual OutlinerMode GetUserType() const = 0; // For OutlinerMode, it can however not save in compatible format virtual void SetUserType( OutlinerMode n ) = 0; - virtual bool IsVertical() const = 0; - virtual bool GetDirectVertical() const = 0; + virtual bool IsEffectivelyVertical() const = 0; + virtual bool GetVertical() const = 0; virtual bool IsTopToBottom() const = 0; virtual void SetVertical( bool bVertical ) = 0; virtual void SetRotation( TextRotation nRotation ) = 0; diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx index 0b961e9f30f3..b2c00a1683ff 100644 --- a/include/editeng/outlobj.hxx +++ b/include/editeng/outlobj.hxx @@ -87,8 +87,8 @@ public: void SetOutlinerMode(OutlinerMode nNew); // vertical access - bool IsVertical() const; - bool GetDirectVertical() const; + bool IsEffectivelyVertical() const; + bool GetVertical() const; bool IsTopToBottom() const; void SetVertical(bool bNew); void SetRotation(TextRotation nRotation); |