diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-06-24 10:48:53 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-06-24 13:37:30 +0200 |
| commit | e619d685a4ac4e8a20f047be3fe00f5b492553b8 (patch) | |
| tree | fa35cad30568f75f5eb6a15855ee63ce07e84136 | |
| parent | ee7b6c773eb22268fefee4bfcc10110b0bbbd8cf (diff) | |
sw: make postithelper.hxx self-contained
The problem was that the inline SwSidebarItem ctor/dtor needed a
complete type for sw::annotation::SwAnnotationWin, but AnnotationWin.hxx
already includes this header, so we can't include it.
Move the ctor/dtor to postithelper.cxx where we include
AnnotationWin.hxx already.
Change-Id: I619bd5d21493a80436a333c128eadfff2a6834b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97011
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | sw/inc/postithelper.hxx | 14 | ||||
| -rw-r--r-- | sw/source/core/fields/postithelper.cxx | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index c1536ef78524..4aae6100c14f 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -102,19 +102,9 @@ public: SwPostItHelper::SwLayoutStatus mLayoutStatus; SwLayoutInfo maLayoutInfo; - SwSidebarItem( const bool aFocus) - : pPostIt(nullptr) - , bShow(true) - , bFocus(aFocus) - , bPendingLayout(false) - , mLayoutStatus( SwPostItHelper::INVISIBLE ) - , maLayoutInfo() - { - } + SwSidebarItem( const bool aFocus); - virtual ~SwSidebarItem() - { - } + virtual ~SwSidebarItem(); SwSidebarItem(SwSidebarItem const &) = default; SwSidebarItem(SwSidebarItem &&) = default; diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx index 614d73cf2c9e..38917d5474fb 100644 --- a/sw/source/core/fields/postithelper.cxx +++ b/sw/source/core/fields/postithelper.cxx @@ -113,6 +113,18 @@ SwAnchoredObject* GetAnchoredObjectOfAnnotationMark(const sw::mark::IMark& rAnno } } +SwSidebarItem::SwSidebarItem(const bool aFocus) + : pPostIt(nullptr) + , bShow(true) + , bFocus(aFocus) + , bPendingLayout(false) + , mLayoutStatus(SwPostItHelper::INVISIBLE) + , maLayoutInfo() +{ +} + +SwSidebarItem::~SwSidebarItem() {} + SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos( SwLayoutInfo& o_rInfo, const SwPosition& rAnchorPos, |