diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2018-05-10 10:51:42 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@libreoffice.org> | 2018-05-13 12:04:26 +0200 |
| commit | 439f17c5cf43b38092b1b834bb006420220262e1 (patch) | |
| tree | 04c4312f6401f07240057d7dbd70a4faf3901737 /sw/inc | |
| parent | 8bdd059a1d64a1818ee0093d7a512fe38c4e2b20 (diff) | |
dont use SwClient/SwModify in unocore: HeadFootText
Change-Id: Icf0fa7ec07c8c52981c50bc03a34ae0fa9683fcf
Reviewed-on: https://gerrit.libreoffice.org/54184
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/calbck.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/frmfmt.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/section.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/unotextbodyhf.hxx | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index f5748d50a728..913a7f6e173e 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -83,6 +83,10 @@ namespace sw class SW_DLLPUBLIC BroadcasterMixin { SvtBroadcaster m_aNotifier; public: + BroadcasterMixin& operator=(const BroadcasterMixin&) + { + return *this; // Listeners are never copied or moved. + } SvtBroadcaster& GetNotifier() { return m_aNotifier; } }; /// refactoring out the some of the more sane SwClient functionality diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 787988467407..a8f61f3cf17a 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -53,7 +53,9 @@ namespace sw class SwFrameFormats; /// Style of a layout element. -class SW_DLLPUBLIC SwFrameFormat: public SwFormat +class SW_DLLPUBLIC SwFrameFormat + : public SwFormat + , public sw::BroadcasterMixin { friend class SwDoc; friend class SwPageDesc; ///< Is allowed to call protected CTor. diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index eb4cc6913f38..30b582b89a80 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -270,7 +270,6 @@ enum class SectionSort { Not, Pos }; class SW_DLLPUBLIC SwSectionFormat : public SwFrameFormat , public ::sfx2::Metadatable - , public sw::BroadcasterMixin { friend class SwDoc; diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index 11aa3cbf794f..439d434dade0 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -116,7 +116,6 @@ public: static css::uno::Reference< css::text::XText > CreateXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader); - static bool IsXHeadFootText(SwClient const *const pClient); // XInterface virtual css::uno::Any SAL_CALL queryInterface( |