diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-16 13:51:54 +0200 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-15 15:10:00 +0100 |
commit | fe1d3328997741b55202aca7b3dc566ca833a5f4 (patch) | |
tree | 7c574b532e3f70e08b843fc2ebc01fcf4984e1ea /sw/inc/ftnidx.hxx | |
parent | 80ffd0d8cf638808ad73c8de69b8a0fa19b16604 (diff) |
sw_redlinehide_3: add second footnote number
Add a separate footnote number to SwFormatFootnote for the case when
the layout hides redlines.
If the footnote is in a delete redline, the value will be an arbitrary
number, let's use the same number as the last visible footnote for
simplicity.
Change-Id: Ic7fff9d1bb2c90f5ad811b859c6501a193b7ae70
Diffstat (limited to 'sw/inc/ftnidx.hxx')
-rw-r--r-- | sw/inc/ftnidx.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index 41205a34b540..3dfb118a1f6b 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -23,6 +23,7 @@ #include <sal/types.h> #include <o3tl/sorted_vector.hxx> +class IDocumentRedlineAccess; class SwTextFootnote; class SwNodeIndex; class SwSectionNode; @@ -51,7 +52,7 @@ public: class SwUpdFootnoteEndNtAtEnd { std::vector<const SwSectionNode*> aFootnoteSects, aEndSects; - std::vector<sal_uInt16> aFootnoteNums, aEndNums; + std::vector<std::pair<sal_uInt16, sal_uInt16>> aFootnoteNums, aEndNums; public: SwUpdFootnoteEndNtAtEnd() : aFootnoteSects(), aEndSects() {} @@ -59,8 +60,11 @@ public: static const SwSectionNode* FindSectNdWithEndAttr( const SwTextFootnote& rTextFootnote ); - sal_uInt16 GetNumber( const SwTextFootnote& rTextFootnote, const SwSectionNode& rNd ); - sal_uInt16 ChkNumber( const SwTextFootnote& rTextFootnote ); + std::pair<sal_uInt16, sal_uInt16> GetNumber( + IDocumentRedlineAccess const&, const SwTextFootnote& rTextFootnote, + const SwSectionNode& rNd); + std::pair<sal_uInt16, sal_uInt16> ChkNumber( + IDocumentRedlineAccess const&, const SwTextFootnote& rTextFootnote); }; #endif // INCLUDED_SW_INC_FTNIDX_HXX |