summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/wsfrm.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-09-13 17:26:19 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-09-13 19:36:43 +0200
commit0a398f5af0c03c7912c32576f51824d6fcc3a862 (patch)
tree15a81177f98f4cf888c91a083a28324660ff392c /sw/source/core/layout/wsfrm.cxx
parent88f7ac5ccd358069e356c544888386b745c82732 (diff)
sw: move frame id SwFrame to SwFrameAreaDefinition
Otherwise it's not easy to see which frame position was invalidated in SwFrameAreaDefinition::setFrameAreaPositionValid() in a SAL_DEBUG() statement. Change-Id: I5771a81b98524bbce6557653a1a366e7a91c583e Reviewed-on: https://gerrit.libreoffice.org/60443 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
-rw-r--r--sw/source/core/layout/wsfrm.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 42b6fb90d0cd..e1b388914bc9 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -61,7 +61,8 @@ SwFrameAreaDefinition::SwFrameAreaDefinition()
maFramePrintArea(),
mbFrameAreaPositionValid(false),
mbFrameAreaSizeValid(false),
- mbFramePrintAreaValid(false)
+ mbFramePrintAreaValid(false),
+ mnFrameId(SwFrameAreaDefinition::mnLastFrameId++)
{
}
@@ -282,7 +283,6 @@ SwFrame::SwFrame( SwModify *pMod, SwFrame* pSib )
: SwFrameAreaDefinition(),
SwClient( pMod ),
SfxBroadcaster(),
- mnFrameId( SwFrame::mnLastFrameId++ ),
mpRoot( pSib ? pSib->getRootFrame() : nullptr ),
mpUpper(nullptr),
mpNext(nullptr),