summaryrefslogtreecommitdiff
path: root/cui/source/factory
diff options
context:
space:
mode:
authorHeiko Tietze <tietze.heiko@gmail.com>2020-08-03 09:03:23 +0200
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2020-08-08 07:56:12 +0200
commit13d788b476adb3901689282733cc2700e7934212 (patch)
tree9e420195a712a4ddaaaed122db84daa6453ce979 /cui/source/factory
parentd04260e5318fad36b3a29deaf9a823052bc6bea9 (diff)
Clean-up of abstdlg
Unnecessary functions regarding the about dialog removed Change-Id: I739a6b1383a0096ec46e2316da3c5327dafe1675 Follow-up to 39e83e2e4257c56adef13ed1dfeee013a4f45376 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99985 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'cui/source/factory')
-rw-r--r--cui/source/factory/dlgfact.cxx9
-rw-r--r--cui/source/factory/dlgfact.hxx16
2 files changed, 3 insertions, 22 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 35209dba8035..01925f1fdb0a 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1418,11 +1418,6 @@ short SvxMacroAssignDialog::Execute()
return m_xDialog->run();
}
-short AbstractAboutDialog_Impl::Execute()
-{
- return m_xDlg->run();
-}
-
short AbstractAdditionsDialog_Impl::Execute()
{
return m_xDlg->run();
@@ -1691,10 +1686,10 @@ VclPtr<AbstractAdditionsDialog> AbstractDialogFactory_Impl::CreateAdditionsDialo
#endif
}
-VclPtr<AbstractAboutDialog>
+VclPtr<VclAbstractDialog>
AbstractDialogFactory_Impl::CreateAboutDialog(weld::Window* pParent)
{
- return VclPtr<AbstractAboutDialog_Impl>::Create(
+ return VclPtr<CuiAbstractController_Impl>::Create(
std::make_unique<AboutDialog>(pParent));
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 5519dba2dd72..f3306065f959 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -740,20 +740,6 @@ public:
virtual short Execute() override;
};
-class AboutDialog;
-class AbstractAboutDialog_Impl : public AbstractAboutDialog
-{
-protected:
- std::unique_ptr<AboutDialog> m_xDlg;
-
-public:
- explicit AbstractAboutDialog_Impl(std::unique_ptr<AboutDialog> p)
- : m_xDlg(std::move(p))
- {
- }
- virtual short Execute() override;
-};
-
class AbstractAdditionsDialog_Impl : public AbstractAdditionsDialog
{
protected:
@@ -970,7 +956,7 @@ public:
virtual VclPtr<AbstractAdditionsDialog>
CreateAdditionsDialog(weld::Window* pParent, const OUString& sAdditionsTag) override;
- virtual VclPtr<AbstractAboutDialog> CreateAboutDialog(weld::Window* pParent) override;
+ virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* pParent) override;
virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* pParent) override;