[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/ui/misc/docfnote.cxx |    6 ++----
 sw/source/ui/misc/impfnote.hxx |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 3bacb560c60e6484f217b3edc251d91725b64b84
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 4 15:52:45 2017 +0100

    sw: more implicit int conversions in SwEndNoteOptionPage
    
    Change-Id: I66033eeff8ebb636d5f55d61102a0f30f3353f85

diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 45ce954..755aeb4 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -250,7 +250,7 @@ VclPtr<SfxTabPage> SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxI
 
 // Different kinds of numbering; because the Listbox has varying numbers of
 // entries, here are functions to set and query the intended kind of numbering.
-void SwEndNoteOptionPage::SelectNumbering(int eNum)
+void SwEndNoteOptionPage::SelectNumbering(SwFootnoteNum const eNum)
 {
     OUString sSelect;
     switch(eNum)
@@ -264,10 +264,8 @@ void SwEndNoteOptionPage::SelectNumbering(int eNum)
         case FTNNUM_CHAPTER:
             sSelect = aNumChapter;
         break;
-#if OSL_DEBUG_LEVEL > 0
         default:
-            OSL_FAIL("Which numbering type?");
-#endif
+            assert(false);
     }
     m_pNumCountBox->SelectEntry(sSelect);
     NumCountHdl(*m_pNumCountBox);
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 4fd2c95..4cde50d 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -60,7 +60,7 @@ class SwEndNoteOptionPage : public SfxTabPage
     bool    bPosDoc;
     bool    bEndNote;
 
-    inline void SelectNumbering(int eNum);
+    inline void SelectNumbering(SwFootnoteNum eNum);
     SwFootnoteNum GetNumbering() const;
 
     DECL_LINK(PosPageHdl, Button*, void);