sw/inc/pagedesc.hxx | 8 ++++---- sw/source/core/layout/pagedesc.cxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit f73385982c5b11e230987b3208b866b3c0d797ee Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Fri Feb 7 11:24:45 2020 +0100 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Fri Feb 7 17:09:56 2020 +0100 sw: fix misnamed m_IsFootnoteInfo Silly copypasta in f3bb701223953df02f005b98d2eee13e82016bd7 Change-Id: Idf20017a7eb180e6a9f429e6976cea8c13cff066 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88194 Reviewed-by: Michael Stahl <michael.st...@cib.de> Tested-by: Jenkins diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 86e3fc075a7c..632861e84d02 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -160,7 +160,7 @@ class SW_DLLPUBLIC SwPageDesc bool m_IsHidden; /// Footnote information. - SwPageFootnoteInfo m_IsFootnoteInfo; + SwPageFootnoteInfo m_FootnoteInfo; /// Backref to the assigned SwPageDescs list to handle renames. SwPageDescs *m_pdList; @@ -193,9 +193,9 @@ public: const SvxNumberType &GetNumType() const { return m_NumType; } void SetNumType(const SvxNumberType& rNew) { m_NumType = rNew; } - const SwPageFootnoteInfo &GetFootnoteInfo() const { return m_IsFootnoteInfo; } - SwPageFootnoteInfo &GetFootnoteInfo() { return m_IsFootnoteInfo; } - void SetFootnoteInfo(const SwPageFootnoteInfo &rNew) { m_IsFootnoteInfo = rNew; } + const SwPageFootnoteInfo &GetFootnoteInfo() const { return m_FootnoteInfo; } + SwPageFootnoteInfo &GetFootnoteInfo() { return m_FootnoteInfo; } + void SetFootnoteInfo(const SwPageFootnoteInfo &rNew) { m_FootnoteInfo = rNew; } inline bool IsHeaderShared() const; inline bool IsFooterShared() const; diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index f56f25b20c15..c9c242435250 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -79,7 +79,7 @@ SwPageDesc::SwPageDesc( const SwPageDesc &rCpy ) , m_eUse( rCpy.ReadUseOn() ) , m_IsLandscape( rCpy.GetLandscape() ) , m_IsHidden( rCpy.IsHidden() ) - , m_IsFootnoteInfo( rCpy.GetFootnoteInfo() ) + , m_FootnoteInfo( rCpy.GetFootnoteInfo() ) , m_pdList( nullptr ) { if (rCpy.m_pTextFormatColl && rCpy.m_aDepends.IsListeningTo(rCpy.m_pTextFormatColl)) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits