diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-17 10:46:27 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-17 13:15:54 +0200 |
| commit | 6fd0d2af5069ec23b25b7e7e2e024df9e3319a0a (patch) | |
| tree | 4bb90bf1e35cc99f97f23606e40ac86d868293b3 | |
| parent | b5870d727685ec10447e8ae446ada895250fec2e (diff) | |
Rename SaturatingSet[XY] to SaturatingSetPos[XY]
... to align with commit 4639ca2f878b04ffc50d9c20d92e90464d2d67a7
Change-Id: Ibec7a451a61ca7f2d141a9624369a6f9656ed468
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120562
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | include/tools/gen.hxx | 4 | ||||
| -rw-r--r-- | starmath/source/mathml/import.cxx | 4 | ||||
| -rw-r--r-- | starmath/source/mathml/mathmlimport.cxx | 4 | ||||
| -rw-r--r-- | tools/source/generic/gen.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 5cc23bf83654..a9cf170952e6 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -591,8 +591,8 @@ public: * Sanitizing variants for handling data from the outside */ void SaturatingSetSize(const Size& rSize); - void SaturatingSetX(tools::Long x); - void SaturatingSetY(tools::Long y); + void SaturatingSetPosX(tools::Long x); + void SaturatingSetPosY(tools::Long y); private: tools::Long nLeft = 0; diff --git a/starmath/source/mathml/import.cxx b/starmath/source/mathml/import.cxx index e9e94b0f3cc6..39b81b9aaed9 100644 --- a/starmath/source/mathml/import.cxx +++ b/starmath/source/mathml/import.cxx @@ -1267,12 +1267,12 @@ void SmMLImport::SetViewSettings(const Sequence<PropertyValue>& aViewProps) if (rValue.Name == "ViewAreaTop") { rValue.Value >>= nTmp; - aRect.SaturatingSetY(nTmp); + aRect.SaturatingSetPosY(nTmp); } else if (rValue.Name == "ViewAreaLeft") { rValue.Value >>= nTmp; - aRect.SaturatingSetX(nTmp); + aRect.SaturatingSetPosX(nTmp); } else if (rValue.Name == "ViewAreaWidth") { diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx index 270e6911281c..131eda86bb9f 100644 --- a/starmath/source/mathml/mathmlimport.cxx +++ b/starmath/source/mathml/mathmlimport.cxx @@ -2599,12 +2599,12 @@ void SmXMLImport::SetViewSettings(const Sequence<PropertyValue>& aViewProps) if (rValue.Name == "ViewAreaTop") { rValue.Value >>= nTmp; - aRect.SaturatingSetY(nTmp); + aRect.SaturatingSetPosY(nTmp); } else if (rValue.Name == "ViewAreaLeft") { rValue.Value >>= nTmp; - aRect.SaturatingSetX(nTmp); + aRect.SaturatingSetPosX(nTmp); } else if (rValue.Name == "ViewAreaWidth") { diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index 027c7b9356b1..29e7da9b98fa 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -69,14 +69,14 @@ void tools::Rectangle::SaturatingSetSize(const Size& rSize) SetHeightEmpty(); } -void tools::Rectangle::SaturatingSetX(tools::Long x) +void tools::Rectangle::SaturatingSetPosX(tools::Long x) { if (!IsWidthEmpty()) nRight = o3tl::saturating_add(nRight, x - nLeft); nLeft = x; } -void tools::Rectangle::SaturatingSetY(tools::Long y) +void tools::Rectangle::SaturatingSetPosY(tools::Long y) { if (!IsHeightEmpty()) nBottom = o3tl::saturating_add(nBottom, y - nTop); |