diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2020-08-02 17:50:53 +0200 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2020-08-03 08:48:51 +0200 |
| commit | e865acdcc9321a08fac00bd1fb2c27a7580d3cec (patch) | |
| tree | 634a39aca1f0d66fc2b80cc65ad084749e961dda /cui | |
| parent | 39e83e2e4257c56adef13ed1dfeee013a4f45376 (diff) | |
Clean-up of abstdlg
Unnecessary functions removed
Change-Id: I32dab4b4c5fe8ff351277cbbd32e0b462443d031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99959
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 10 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 16 |
2 files changed, 4 insertions, 22 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 8ebff9022b23..35209dba8035 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1428,11 +1428,6 @@ short AbstractAdditionsDialog_Impl::Execute() return m_xDlg->run(); } -short AbstractTipOfTheDayDialog_Impl::Execute() -{ - return m_xDlg->run(); -} - short AbstractDiagramDialog_Impl::Execute() { return m_xDlg->run(); @@ -1703,10 +1698,11 @@ AbstractDialogFactory_Impl::CreateAboutDialog(weld::Window* pParent) std::make_unique<AboutDialog>(pParent)); } -VclPtr<AbstractTipOfTheDayDialog> +VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateTipOfTheDayDialog(weld::Window* pParent) { - return VclPtr<AbstractTipOfTheDayDialog_Impl>::Create(std::make_unique<TipOfTheDayDialog>(pParent)); + return VclPtr<CuiAbstractController_Impl>::Create( + std::make_unique<TipOfTheDayDialog>(pParent)); } VclPtr<AbstractDiagramDialog> diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index cc4f90bd82ea..5519dba2dd72 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -767,20 +767,6 @@ public: virtual short Execute() override; }; -class TipOfTheDayDialog; -class AbstractTipOfTheDayDialog_Impl : public AbstractTipOfTheDayDialog -{ -protected: - std::unique_ptr<TipOfTheDayDialog> m_xDlg; - -public: - explicit AbstractTipOfTheDayDialog_Impl(std::unique_ptr<TipOfTheDayDialog> p) - : m_xDlg(std::move(p)) - { - } - virtual short Execute() override; -}; - class DiagramDialog; /** Edit Diagram dialog */ @@ -986,7 +972,7 @@ public: virtual VclPtr<AbstractAboutDialog> CreateAboutDialog(weld::Window* pParent) override; - virtual VclPtr<AbstractTipOfTheDayDialog> CreateTipOfTheDayDialog(weld::Window* pParent) override; + virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* pParent) override; virtual VclPtr<AbstractDiagramDialog> CreateDiagramDialog( weld::Window* pParent, |