diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-07 20:49:40 +0000 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-08 07:09:47 +0100 |
| commit | 5eba05a0582cbb836c3715089e5d3bfe1ee19ded (patch) | |
| tree | d44717ccdd517af09d639f757f994d2fb05ad587 /sw/source/ui/chrdlg | |
| parent | 7a683c31e090e5a81debadcef025df9cd61c75f0 (diff) | |
fix mismerge
thanks to noel
Change-Id: Id8c4fb92899e80bdb923b77ea9dff74961e84ea3
Reviewed-on: https://gerrit.libreoffice.org/50919
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/ui/chrdlg')
| -rw-r--r-- | sw/source/ui/chrdlg/break.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
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()); + } } } } |