diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-15 09:17:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-15 09:30:05 +0200 |
| commit | 538635e089cac31ddf433f650e86de5e2b7f03cc (patch) | |
| tree | 1f0e246954203f0d480e5ec61c049feec0ec76f1 /extensions | |
| parent | c3c4ae5fdac0341f01eeed8d5c633d203eed8b2a (diff) | |
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
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/controlfontdialog.cxx | 11 | ||||
| -rw-r--r-- | extensions/source/propctrlr/controlfontdialog.hxx | 1 |
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; }; |