[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Justin Luth]

 sw/source/ui/misc/docfnote.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c63fe08c485baba133ebbeaef28fe97113dded35
Author: Justin Luth <justin_luth at sil.org>
Date:   Tue Jan 3 15:24:48 2017 +0300

    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: https://gerrit.libreoffice.org/32700
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Tested-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 15ca00601701c50ccdb3d8dbe08ba705787386a7)
    Reviewed-on: https://gerrit.libreoffice.org/32732

diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 30f053b..9feb8a1 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 )