diff options
| author | Justin Luth <justin.luth@collabora.com> | 2023-04-28 13:38:13 -0400 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2023-05-02 15:36:07 +0200 |
| commit | 751cb2cf874a2d017cae699a7983e4419dcbe6f6 (patch) | |
| tree | c81f96ce07be80622020519221352a983fea4562 /sw/source/ui | |
| parent | 453af38f46ad4c2eb3125b8d2967c91b950b3c50 (diff) | |
tdf#86630 sw page number wizard: add page total
1 - 3 is the format of the output.
Not totally clear, but it is at least not in English,
and I'm fairly certain I've seen this format used numerous times.
At least everything is there, and all the user needs to do is
modify the - to be whatever they want.
I checked to see if by some miracle localedata had a specification
for "X of Y" but it doesn't.
Change-Id: Iae1e74e612ec449f72086b3f5a5e32713fee4d27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151173
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/misc/pagenumberdlg.cxx | 7 |
3 files changed, 13 insertions, 0 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 6ec8e23a6304..90f7c6e34d84 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -647,6 +647,11 @@ bool AbstractSwPageNumberDlg_Impl::GetMirrorOnEvenPages() const return m_xDlg->GetMirrorOnEvenPages(); } +bool AbstractSwPageNumberDlg_Impl::GetIncludePageTotal() const +{ + return m_xDlg->GetIncludePageTotal(); +} + SvxNumType AbstractSwPageNumberDlg_Impl::GetPageNumberType() const { return m_xDlg->GetPageNumberType(); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 6d3f37aa6a47..0b6f67b1da23 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -167,6 +167,7 @@ public: virtual int GetPageNumberPosition() const override; virtual int GetPageNumberAlignment() const override; bool GetMirrorOnEvenPages() const override; + bool GetIncludePageTotal() const override; SvxNumType GetPageNumberType() const override; void SetPageNumberType(SvxNumType nSet) override; }; diff --git a/sw/source/ui/misc/pagenumberdlg.cxx b/sw/source/ui/misc/pagenumberdlg.cxx index 06facf1bff22..1b5084c5e94b 100644 --- a/sw/source/ui/misc/pagenumberdlg.cxx +++ b/sw/source/ui/misc/pagenumberdlg.cxx @@ -31,6 +31,7 @@ SwPageNumberDlg::SwPageNumberDlg(weld::Window* pParent) , m_xPageNumberPosition(m_xBuilder->weld_combo_box("positionCombo")) , m_xPageNumberAlignment(m_xBuilder->weld_combo_box("alignmentCombo")) , m_xMirrorOnEvenPages(m_xBuilder->weld_check_button("mirrorCheckbox")) + , m_xIncludePageTotal(m_xBuilder->weld_check_button("pagetotalCheckbox")) , m_xPageNumberTypeLB(new SvxPageNumberListBox(m_xBuilder->weld_combo_box("numfmtlb"))) , m_xPreviewImage(m_xBuilder->weld_image("previewImage")) , m_aPageNumberPosition(1) // bottom @@ -44,6 +45,7 @@ SwPageNumberDlg::SwPageNumberDlg(weld::Window* pParent) m_xPageNumberAlignment->set_active(m_aPageNumberAlignment); m_xMirrorOnEvenPages->set_sensitive(false); m_xMirrorOnEvenPages->set_state(TRISTATE_TRUE); + m_xIncludePageTotal->set_state(TRISTATE_FALSE); SvxNumOptionsTabPageHelper::GetI18nNumbering(m_xPageNumberTypeLB->get_widget(), ::std::numeric_limits<sal_uInt16>::max()); m_xPageNumberTypeLB->connect_changed(LINK(this, SwPageNumberDlg, NumberTypeSelectHdl)); @@ -80,6 +82,11 @@ bool SwPageNumberDlg::GetMirrorOnEvenPages() && m_xMirrorOnEvenPages->get_state() == TRISTATE_TRUE; } +bool SwPageNumberDlg::GetIncludePageTotal() +{ + return m_xIncludePageTotal->get_state() == TRISTATE_TRUE; +} + void SwPageNumberDlg::SetPageNumberType(SvxNumType nSet) { m_nPageNumberType = nSet; |