diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-06-07 13:25:16 +0200 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-12 01:04:36 +0200 |
commit | 870c66694e7ed392141f0956ef74d1f71cdf8975 (patch) | |
tree | cd40e96a262bbbb9e40c230c29b2ed9210a8a371 /sw/source/ui/dialog | |
parent | 75099d6788672a98389d8592b88777c8d3a25fa6 (diff) |
MSForms: Introduce a properties dialog for date form field
* The dialog can be opened by the menu item and also by double click.
* The dialog contains a list to specify the date format.
Change-Id: I109a688752c5155f5bfabff272da3d6ab90dcded
Reviewed-on: https://gerrit.libreoffice.org/75439
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sw/source/ui/dialog')
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 14 | ||||
-rw-r--r-- | sw/source/ui/dialog/swuiexp.cxx | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index c08ec419eb9c..c94c75b1f428 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -39,6 +39,7 @@ #include <dbinsdlg.hxx> #include <docfnote.hxx> #include <docstdlg.hxx> +#include <DateFormFieldDialog.hxx> #include <DropDownFieldDialog.hxx> #include <DropDownFormFieldDialog.hxx> #include <envlop.hxx> @@ -181,6 +182,11 @@ short AbstractDropDownFormFieldDialog_Impl::Execute() return m_xDlg->run(); } +short AbstractDateFormFieldDialog_Impl::Execute() +{ + return m_xDlg->run(); +} + short AbstractSwLabDlg_Impl::Execute() { return m_xDlg->run(); @@ -872,6 +878,11 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateDropDownFormFieldD return VclPtr<AbstractDropDownFormFieldDialog_Impl>::Create(std::make_unique<sw::DropDownFormFieldDialog>(pParent, pDropDownField)); } +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateDateFormFieldDialog(weld::Widget *pParent, sw::mark::IFieldmark* pDateField) +{ + return VclPtr<AbstractDateFormFieldDialog_Impl>::Create(std::make_unique<sw::DateFormFieldDialog>(pParent, pDateField)); +} + VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 130343cf3330..8c70da33a556 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -50,6 +50,7 @@ namespace sw { class DropDownFieldDialog; class DropDownFormFieldDialog; +class DateFormFieldDialog; } #define DECL_ABSTDLG_BASE(Class,DialogClass) \ @@ -302,6 +303,17 @@ public: virtual short Execute() override; }; +class AbstractDateFormFieldDialog_Impl : public VclAbstractDialog +{ + std::unique_ptr<sw::DateFormFieldDialog> m_xDlg; +public: + explicit AbstractDateFormFieldDialog_Impl(std::unique_ptr<sw::DateFormFieldDialog> p) + : m_xDlg(std::move(p)) + { + } + virtual short Execute() override; +}; + class AbstractSwLabDlg_Impl : public AbstractSwLabDlg { std::unique_ptr<SwLabDlg> m_xDlg; @@ -640,6 +652,8 @@ public: virtual VclPtr<AbstractDropDownFieldDialog> CreateDropDownFieldDialog(weld::Widget* pParent, SwWrtShell &rSh, SwField* pField, bool bPrevButton, bool bNextButton) override; virtual VclPtr<VclAbstractDialog> CreateDropDownFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDropDownField) override; + virtual VclPtr<VclAbstractDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDateField) override; + virtual VclPtr<SfxAbstractTabDialog> CreateSwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) override; virtual VclPtr<AbstractSwLabDlg> CreateSwLabDlg(weld::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) override; diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index 048904334f8b..6dd7f675f793 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -28,6 +28,7 @@ #include <dbinsdlg.hxx> #include <DropDownFieldDialog.hxx> #include <DropDownFormFieldDialog.hxx> +#include <DateFormFieldDialog.hxx> #include <fldtdlg.hxx> #include <glossary.hxx> #include <inpdlg.hxx> |