From 538635e089cac31ddf433f650e86de5e2b7f03cc Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 15 Sep 2016 09:17:14 +0200 Subject: 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 --- filter/source/flash/swfdialog.hxx | 9 +++++---- filter/source/pdf/pdfdialog.hxx | 5 +++-- filter/source/svg/svgdialog.hxx | 9 +++++---- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'filter') diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index f8a403d4ac92..8875a7e07b61 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -30,10 +30,11 @@ namespace vcl { class Window; } class ResMgr; -class SWFDialog : public ::svt::OGenericUnoDialog, - public ::comphelper::OPropertyArrayUsageHelper< SWFDialog >, - public css::beans::XPropertyAccess, - public css::document::XExporter +class SWFDialog final: + public ::svt::OGenericUnoDialog, + public ::comphelper::OPropertyArrayUsageHelper< SWFDialog >, + public css::beans::XPropertyAccess, + public css::document::XExporter { private: diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index b20cd4cd65a7..c40adedd9c13 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -30,8 +30,9 @@ namespace vcl { class Window; } typedef ::cppu::ImplInheritanceHelper < ::svt::OGenericUnoDialog, XPropertyAccess, XExporter > PDFDialog_Base; -class PDFDialog : public PDFDialog_Base, - public ::comphelper::OPropertyArrayUsageHelper< PDFDialog > +class PDFDialog final: + public PDFDialog_Base, + public ::comphelper::OPropertyArrayUsageHelper< PDFDialog > { private: Sequence< PropertyValue > maMediaDescriptor; diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 24f80de25c69..80a4e283aa36 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -30,10 +30,11 @@ class ResMgr; -class SVGDialog : public ::svt::OGenericUnoDialog, - public ::comphelper::OPropertyArrayUsageHelper< SVGDialog >, - public css::beans::XPropertyAccess, - public css::document::XExporter +class SVGDialog final: + public ::svt::OGenericUnoDialog, + public ::comphelper::OPropertyArrayUsageHelper< SVGDialog >, + public css::beans::XPropertyAccess, + public css::document::XExporter { private: -- cgit