Make OGenericUnoDialog::destoryDialog non-virtual

...it is only ever called:

* either from dtors, where the virtual-ness doesn't acutally help (and would
  trigger loplugin:fragiledestructor if that were enabled)

* or, in module filter, from executeDialog members of (final) classes directly
  derived from OGenericUnODialog without overriding destroyDialog

Change-Id: If9a7370385a27952189423e5632b3f01e18ddbb5

2 files changed, 3 insertions, 9 deletions

diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 13053015af9d..4ba8b5feaf25 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -57,7 +57,10 @@ namespace pcr
         {
             ::osl::MutexGuard aGuard(m_aMutex);
             if (m_pDialog)
+            {
                 destroyDialog();
+                ControlCharacterDialog::destroyItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults);
+            }
         }
     }
 
@@ -150,14 +153,6 @@ namespace pcr
         return VclPtr<ControlCharacterDialog>::Create(_pParent, *m_pFontItems);
     }
 
-
-    void OControlFontDialog::destroyDialog()
-    {
-        OGenericUnoDialog::destroyDialog();
-        ControlCharacterDialog::destroyItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults);
-    }
-
-
     void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult)
     {
         OSL_ENSURE(m_pDialog, "OControlFontDialog::executedDialog: no dialog anymore?!!");
diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx
index de7917327aab..a7727a776d13 100644
--- a/extensions/source/propctrlr/controlfontdialog.hxx
+++ b/extensions/source/propctrlr/controlfontdialog.hxx
@@ -79,7 +79,6 @@ namespace pcr
     protected:
     // OGenericUnoDialog overridables
         virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
-        virtual void    destroyDialog() override;
         virtual void    executedDialog(sal_Int16 _nExecutionResult) override;
     };