diff options
authorJustin Luth <>2017-01-03 15:24:48 +0300
committerJustin Luth <>2017-01-05 04:28:24 +0000
commitc63fe08c485baba133ebbeaef28fe97113dded35 (patch)
parentf7879b26ea7ab04d4e8bbfcc2ca2439c13a0504f (diff)
tdf#43370 docfnote.cxx: return correct FTNNUM for GetNumbering
way back in 2001 commit a7afc46b3766e4000ae5a9b8a914ede36bbd2991 removed the option to select per-chapter footnote-numbering for footnotes placed at the end of the document (or perhaps chapter since the variable is called FTNPOS_CHAPTER, but the UI refers to it as document). So only "Per Document" remained. However the function GetNumbering was never updated to reflect that fact that 2 options were removed from the list now, instead of one. So, the UI reported the choice as "Per Page", the only dropdown choice available was "Per Document", and the actual implemented choice was "Per Chapter". How's that for a mess? Change-Id: Ib8dc3d07c0ef62d39afdd2a1c78c14527649c6df Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Justin Luth <> Tested-by: Justin Luth <> Reviewed-by: Michael Stahl <> (cherry picked from commit 15ca00601701c50ccdb3d8dbe08ba705787386a7) Reviewed-on:
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 30f053bf4a57..9feb8a1273ee 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -276,7 +276,7 @@ void SwEndNoteOptionPage::SelectNumbering(int eNum)
int SwEndNoteOptionPage::GetNumbering() const
const sal_Int32 nPos = m_pNumCountBox->GetSelectEntryPos();
- return (int) bPosDoc? nPos + 1: nPos;
+ return (int) bPosDoc? nPos + 2: nPos;
void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )