[Libreoffice-commits] core.git: cui/source include/sfx2 include/vcl sfx2/source

[Heiko Tietze (via logerrit)]

 cui/source/factory/dlgfact.cxx |    9 ++-------
 cui/source/factory/dlgfact.hxx |   16 +---------------
 include/sfx2/sfxdlg.hxx        |    2 ++
 include/vcl/abstdlg.hxx        |   10 ----------
 include/vcl/weld.hxx           |   12 ------------
 sfx2/source/appl/appserv.cxx   |    2 +-
 6 files changed, 6 insertions(+), 45 deletions(-)

New commits:
commit 13d788b476adb3901689282733cc2700e7934212
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Mon Aug 3 09:03:23 2020 +0200
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Sat Aug 8 07:56:12 2020 +0200

    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 at documentfoundation.org>
    Tested-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

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;
 
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 1f9109744cd0..9bd600828f0e 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -144,6 +144,8 @@ public:
     virtual VclPtr<VclAbstractDialog>  CreateOptionsDialog(
         weld::Window* pParent, const OUString& rExtensionId ) = 0;
 
+    virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* _pParent) = 0;
+
     virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* _pParent) = 0;
 };
 
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index e5c6ec59c3e0..2a58f6af7355 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -125,12 +125,6 @@ protected:
     virtual ~AbstractQrCodeGenDialog() override = default;
 };
 
-class VCL_DLLPUBLIC AbstractAboutDialog : public VclAbstractDialog
-{
-protected:
-    virtual ~AbstractAboutDialog() override = default;
-};
-
 class VCL_DLLPUBLIC AbstractAdditionsDialog : public VclAbstractDialog
 {
 protected:
@@ -179,10 +173,6 @@ public:
     virtual VclPtr<AbstractScreenshotAnnotationDlg> CreateScreenshotAnnotationDlg(
         weld::Dialog& rParentDialog) = 0;
 
-    // create about dialog
-    virtual VclPtr<AbstractAboutDialog>
-    CreateAboutDialog(weld::Window* pParent) = 0;
-
     // create additions dialog
     virtual VclPtr<AbstractAdditionsDialog>
         CreateAdditionsDialog(weld::Window* pParent, const OUString& sAdditionsTag) = 0;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 8a796040bc78..4707d3905176 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -520,18 +520,6 @@ public:
     virtual Container* weld_message_area() = 0;
 };
 
-class VCL_DLLPUBLIC AboutDialog : virtual public Dialog
-{
-public:
-    virtual void set_version(const OUString& rVersion) = 0;
-    virtual void set_copyright(const OUString& rCopyright) = 0;
-    virtual void set_website(const OUString& rURL) = 0;
-    virtual void set_website_label(const OUString& rLabel) = 0;
-    virtual OUString get_website_label() const = 0;
-    virtual void set_logo(const css::uno::Reference<css::graphic::XGraphic>& rImage) = 0;
-    virtual void set_background(const css::uno::Reference<css::graphic::XGraphic>& rImage) = 0;
-};
-
 class VCL_DLLPUBLIC Assistant : virtual public Dialog
 {
 protected:
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 0c843bc6b83c..68f80d7e99e3 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -653,7 +653,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_ABOUT:
         {
-            VclAbstractDialogFactory* pFact = VclAbstractDialogFactory::Create();
+            SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
             ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateAboutDialog(rReq.GetFrameWeld()));
             pDlg->Execute();
             bDone = true;