sw/source/core/inc/frame.hxx | 2 +-
sw/source/core/layout/newfrm.cxx | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9f16b69431bd020deeacb4cac9efa01f89851978
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Jul 13 21:13:03 2025 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jul 21 12:56:58 2025 +0200
const up SwRectFnCollections
Change-Id: Ie1470cdc86e64694ee43a7f6f5f57bcf7069ca7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187831
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit 13df519a04d8b92d6bccbf1528311e82b9756dde)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188075
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 955ebf799221..a47b421ce507 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1399,7 +1399,7 @@ struct SwRectFnCollection
SwRectSetTwice fnSetTopAndHeight;
};
-typedef SwRectFnCollection* SwRectFn;
+typedef const SwRectFnCollection* SwRectFn;
// This class allows to use proper methods regardless of orientation (LTR/RTL,
horizontal or vertical)
extern SwRectFn fnRectHori, fnRectVert, fnRectVertL2R, fnRectVertL2RB2T;
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 737c453fb411..9c9a905dd5e3 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -59,7 +59,7 @@ static tools::Long SwIncrement( tools::Long nA, tools::Long
nAdd )
static tools::Long SwDecrement( tools::Long nA, tools::Long nSub )
{ return nA - nSub; }
-static SwRectFnCollection aHorizontal = {
+const SwRectFnCollection aHorizontal = {
/*.fnGetTop =*/&SwRect::Top_,
/*.fnGetBottom =*/&SwRect::Bottom_,
/*.fnGetLeft =*/&SwRect::Left_,
@@ -114,7 +114,7 @@ static SwRectFnCollection aHorizontal = {
/*.fnSetTopAndHeight =*/&SwRect::SetTopAndHeight
};
-static SwRectFnCollection aVertical = {
+const SwRectFnCollection aVertical = {
/*.fnGetTop =*/&SwRect::Right_,
/*.fnGetBottom =*/&SwRect::Left_,
/*.fnGetLeft =*/&SwRect::Top_,
@@ -169,7 +169,7 @@ static SwRectFnCollection aVertical = {
/*.fnSetTopAndHeight =*/&SwRect::SetRightAndWidth
};
-static SwRectFnCollection aVerticalLeftToRight = {
+const SwRectFnCollection aVerticalLeftToRight = {
/*.fnGetTop =*/&SwRect::Left_,
/*.fnGetBottom =*/&SwRect::Right_,
/*.fnGetLeft =*/&SwRect::Top_,
@@ -229,7 +229,7 @@ static SwRectFnCollection aVerticalLeftToRight = {
* This means logical top is physical left, bottom is right, left is bottom,
* finally right is top. Values map from logical to physical.
*/
-static SwRectFnCollection aVerticalLeftToRightBottomToTop = {
+const SwRectFnCollection aVerticalLeftToRightBottomToTop = {
/*.fnGetTop =*/&SwRect::Left_,
/*.fnGetBottom =*/&SwRect::Right_,
/*.fnGetLeft =*/&SwRect::Bottom_,
