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/source/core/doc/docftn.cxx | |
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/source/core/doc/docftn.cxx')
-rw-r--r-- | sw/source/core/doc/docftn.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 49afc0c9d42b..2b911947ab53 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -228,7 +228,7 @@ void SwEndNoteInfo::SwClientNotify( const SwModify& rModify, const SfxHint& rHin const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote(); if ( rFootnote.IsEndNote() == m_bEndNote ) { - pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr()); + pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumberRLHidden(), rFootnote.GetNumStr()); } } } @@ -337,7 +337,7 @@ void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo) SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ]; const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote(); if ( !rFootnote.IsEndNote() ) - pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr()); + pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumberRLHidden(), rFootnote.GetNumStr()); } } } @@ -407,7 +407,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ]; const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote(); if ( rFootnote.IsEndNote() ) - pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr()); + pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumberRLHidden(), rFootnote.GetNumStr()); } } } @@ -473,7 +473,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr, pUndo->GetHistory().Add( *pTextFootnote ); } - pTextFootnote->SetNumber(rFootnote.GetNumber(), rNumStr); + pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumberRLHidden(), rNumStr); if( rFootnote.IsEndNote() != bIsEndNote ) { const_cast<SwFormatFootnote&>(rFootnote).SetEndNote( bIsEndNote ); @@ -503,7 +503,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr, pUndo->GetHistory().Add( *pTextFootnote ); } - pTextFootnote->SetNumber(rFootnote.GetNumber(), rNumStr); + pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumberRLHidden(), rNumStr); if( rFootnote.IsEndNote() != bIsEndNote ) { const_cast<SwFormatFootnote&>(rFootnote).SetEndNote( bIsEndNote ); |