diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-20 10:09:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-20 19:14:06 +0200 |
| commit | 6b9ff63cf448da9b49ca9485b276c7ecc1023a23 (patch) | |
| tree | ef895042b5fb4527d74f6539ca9462bfd018ba78 | |
| parent | 9851311055da1a050405f7bc0b7e12ad7cff3cbe (diff) | |
remove hole in SwFrameAreaDefinition struct
since this is used in various performance sensitive places
Change-Id: Ibdce6bd0de458a5a970654a88b984aff49210ef4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167863
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sw/source/core/inc/frame.hxx | 3 | ||||
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 399ab4d0b448..d878bebf8f11 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -143,6 +143,8 @@ private: // When identical to FrameArea, Pos() will be (0, 0) and Size identical. SwRect maFramePrintArea; + sal_uInt32 mnFrameId; + // bitfield bool mbFrameAreaPositionValid : 1; bool mbFrameAreaSizeValid : 1; @@ -151,7 +153,6 @@ private: // #i65250# // frame ID is now in general available - used for layout loop control static sal_uInt32 snLastFrameId; - const sal_uInt32 mnFrameId; protected: // write access to mb*Valid flags diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index e238893c3fe3..68035e025695 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -72,10 +72,10 @@ using namespace ::com::sun::star; SwFrameAreaDefinition::SwFrameAreaDefinition() -: mbFrameAreaPositionValid(false), +: mnFrameId(SwFrameAreaDefinition::snLastFrameId++), + mbFrameAreaPositionValid(false), mbFrameAreaSizeValid(false), - mbFramePrintAreaValid(false), - mnFrameId(SwFrameAreaDefinition::snLastFrameId++) + mbFramePrintAreaValid(false) { } |