sw/source/ui/chrdlg/break.cxx  |    7 ++++++-
 sw/source/uibase/inc/break.hxx |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 5eba05a0582cbb836c3715089e5d3bfe1ee19ded
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Mar 7 20:49:40 2018 +0000

    fix mismerge
    
    thanks to noel
    
    Change-Id: Id8c4fb92899e80bdb923b77ea9dff74961e84ea3
    Reviewed-on: https://gerrit.libreoffice.org/50919
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 5611fafbe0c5..68f2e3241474 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -52,7 +52,12 @@ short SwBreakDlg::run()
             const int nPos = m_xPageCollBox->get_active();
             if (nPos != 0 && nPos != -1)
             {
-                oPgNum = static_cast<sal_uInt16>(m_xPageNumEdit->get_value());
+                m_aTemplate = m_xPageCollBox->get_active_text();
+                oPgNum = boost::none;
+                if (m_xPageNumBox->get_active())
+                {
+                    oPgNum = 
static_cast<sal_uInt16>(m_xPageNumEdit->get_value());
+                }
             }
         }
     }
diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx
index 58b5faecfe43..4f39f55674b1 100644
--- a/sw/source/uibase/inc/break.hxx
+++ b/sw/source/uibase/inc/break.hxx
@@ -43,7 +43,7 @@ class SwBreakDlg
     std::unique_ptr<weld::SpinButton> m_xPageNumEdit;
     std::unique_ptr<weld::Button> m_xOkBtn;
 
-    OUString        aTemplate;
+    OUString        m_aTemplate;
     sal_uInt16      nKind;
     ::boost::optional<sal_uInt16>      oPgNum;
 
@@ -60,7 +60,7 @@ class SwBreakDlg
 public:
     SwBreakDlg(weld::Window *pParent, SwWrtShell &rSh);
     short run();
-    const OUString& GetTemplateName() const { return aTemplate; }
+    const OUString& GetTemplateName() const { return m_aTemplate; }
     sal_uInt16 GetKind() const { return nKind; }
     const ::boost::optional<sal_uInt16>&  GetPageNumber() const { return 
oPgNum; }
 };
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to