diff options
| -rwxr-xr-x | compilerplugins/clang/unnecessaryvirtual.py | 4 | ||||
| -rw-r--r-- | compilerplugins/clang/unnecessaryvirtual.results | 40 | ||||
| -rw-r--r-- | include/sfx2/templatelocalview.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/tabctrl.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/uitest/uiobject.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 2 |
6 files changed, 34 insertions, 18 deletions
diff --git a/compilerplugins/clang/unnecessaryvirtual.py b/compilerplugins/clang/unnecessaryvirtual.py index dda83d8b43fc..1e0e1509a810 100755 --- a/compilerplugins/clang/unnecessaryvirtual.py +++ b/compilerplugins/clang/unnecessaryvirtual.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 import io import re @@ -10,7 +10,7 @@ overridingSet = set() nonEmptySet = set() -with io.open("workdir/loplugin.unnecessaryvirtual.log", "rb", buffering=1024*1024) as txt: +with io.open("workdir/loplugin.unnecessaryvirtual.log", "r", buffering=1024*1024) as txt: for line in txt: tokens = line.strip().split("\t") if tokens[0] == "definition:": diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index 9280ca91b736..752569761d81 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -260,17 +260,19 @@ include/comphelper/unique_disposing_ptr.hxx:169 void comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-0-0 *,) include/comphelper/weakeventlistener.hxx:120 void comphelper::OWeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,) -include/svl/svdde.hxx:235 - class DdeData * DdeTopic::Get(enum SotClipboardFormatId,) +include/sfx2/templatelocalview.hxx:83 + void TemplateLocalView::reload() include/svl/svdde.hxx:236 - _Bool DdeTopic::Put(const class DdeData *,) + class DdeData * DdeTopic::Get(enum SotClipboardFormatId,) include/svl/svdde.hxx:237 + _Bool DdeTopic::Put(const class DdeData *,) +include/svl/svdde.hxx:238 _Bool DdeTopic::Execute(const class rtl::OUString *,) -include/svl/svdde.hxx:239 +include/svl/svdde.hxx:240 _Bool DdeTopic::MakeItem(const class rtl::OUString &,) -include/svl/svdde.hxx:242 +include/svl/svdde.hxx:243 _Bool DdeTopic::StartAdviseLoop() -include/svl/svdde.hxx:299 +include/svl/svdde.hxx:300 void DdeService::~DdeService() include/vbahelper/vbacollectionimpl.hxx:289 int ScVbaCollectionBase::getCount() @@ -294,11 +296,15 @@ include/vbahelper/vbareturntypes.hxx:38 void ooo::vba::DefaultReturnHelper::setValue(type-parameter-0-0,) include/vbahelper/vbareturntypes.hxx:39 type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue() -include/vcl/customweld.hxx:42 +include/vcl/customweld.hxx:45 class rtl::OUString weld::CustomWidgetController::GetHelpText()const +include/vcl/tabctrl.hxx:114 + void TabControl::ActivatePage() include/vcl/toolkit/dialog.hxx:96 void Dialog::set_content_area(class VclBox *,) -include/vcl/weld.hxx:95 +include/vcl/uitest/uiobject.hxx:130 + class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > WindowUIObject::get_visible_child(const class rtl::OUString &,) +include/vcl/weld.hxx:96 void weld::Widget::set_visible(_Bool,) sc/source/core/opencl/formulagroupcl.cxx:1061 _Bool sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::NeedParallelReduction()const @@ -374,6 +380,8 @@ sc/source/ui/vba/vbapagebreak.hxx:48 void ScVbaPageBreak::Delete() sc/source/ui/vba/vbapagebreak.hxx:49 class com::sun::star::uno::Reference<class ooo::vba::excel::XRange> ScVbaPageBreak::Location() +sd/source/ui/remotecontrol/ZeroconfService.hxx:37 + void sd::ZeroconfService::~ZeroconfService() shell/inc/i_xml_parser_event_handler.hxx:41 void i_xml_parser_event_handler::~i_xml_parser_event_handler() slideshow/source/engine/activities/activitiesfactory.cxx:172 @@ -398,13 +406,15 @@ slideshow/source/inc/shape.hxx:221 void slideshow::internal::Shape::setIsForeground(const _Bool,) sw/inc/flypos.hxx:37 void SwPosFlyFrame::~SwPosFlyFrame() +sw/source/ui/dbui/createaddresslistdialog.cxx:65 + void (anonymous namespace)::SwAddressFragment::~SwAddressFragment() toolkit/inc/controls/geometrycontrolmodel.hxx:182 void OGeometryControlModel::fillProperties(class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,)const -vcl/inc/jsdialog/jsdialogbuilder.hxx:119 +vcl/inc/jsdialog/jsdialogbuilder.hxx:109 void JSWidget::show() -vcl/inc/jsdialog/jsdialogbuilder.hxx:125 +vcl/inc/jsdialog/jsdialogbuilder.hxx:115 void JSWidget::hide() -vcl/inc/jsdialog/jsdialogbuilder.hxx:131 +vcl/inc/jsdialog/jsdialogbuilder.hxx:121 void JSWidget::set_sensitive(_Bool,) vcl/inc/salframe.hxx:145 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) @@ -424,7 +434,7 @@ vcl/inc/salobj.hxx:49 void SalObject::Enable(_Bool,) vcl/inc/salprn.hxx:116 enum SalPrinterError SalPrinter::GetErrorCode() -vcl/inc/skia/gdiimpl.hxx:230 +vcl/inc/skia/gdiimpl.hxx:236 void SkiaSalGraphicsImpl::createSurface() vcl/inc/unx/gtk/gtkdata.hxx:121 int GtkSalDisplay::CaptureMouse(class SalFrame *,) @@ -454,6 +464,10 @@ vcl/inc/unx/salframe.h:207 void X11SalFrame::updateGraphics(_Bool,) vcl/inc/unx/salinst.h:41 class SalX11Display * X11SalInstance::CreateDisplay()const +workdir/../vcl/inc/qt5/Qt5FilePicker.hxx:154 + void Qt5FilePicker::addCustomControl(short,) +workdir/../vcl/inc/qt5/Qt5FilePicker.hxx:172 + void Qt5FilePicker::updateAutomaticFileExtension() workdir/../vcl/inc/qt5/Qt5Frame.hxx:160 void Qt5Frame::registerDragSource(class Qt5DragSource *,) workdir/../vcl/inc/qt5/Qt5Frame.hxx:161 @@ -462,6 +476,8 @@ workdir/../vcl/inc/qt5/Qt5Frame.hxx:162 void Qt5Frame::registerDropTarget(class Qt5DropTarget *,) workdir/../vcl/inc/qt5/Qt5Frame.hxx:163 void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *,) +workdir/../vcl/inc/qt5/Qt5Instance.hxx:83 + class Qt5FilePicker * Qt5Instance::createPicker(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,enum QFileDialog::FileMode,) writerfilter/source/dmapper/TableManager.hxx:484 void writerfilter::dmapper::TableManager::tableExceptionProps(const class tools::SvRef<class writerfilter::dmapper::TablePropertyMap> &,) writerfilter/source/ooxml/OOXMLFactory.hxx:66 diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 69019ab2451c..e87d37e9aef5 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -80,7 +80,7 @@ public: // Fill view with template folders thumbnails void Populate (); - virtual void reload (); + void reload (); virtual void showAllTemplates (); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 9369086b043b..0eb067fd1110 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -111,7 +111,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual void ActivatePage(); + void ActivatePage(); bool DeactivatePage(); virtual Size GetOptimalSize() const override; diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index 8f8be274b3a9..b4c7f437e9e3 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -127,7 +127,7 @@ public: virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override; - virtual std::unique_ptr<UIObject> get_visible_child(const OUString& rID); + std::unique_ptr<UIObject> get_visible_child(const OUString& rID); virtual std::set<OUString> get_children() const override; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 3ea6f5ba58ac..e910fc476a61 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -62,7 +62,7 @@ struct SwAddressFragment m_xEntry->set_grid_top_attach(nLine); } - virtual ~SwAddressFragment() + ~SwAddressFragment() { m_pGrid->move(m_xEntry.get(), nullptr); m_pGrid->move(m_xLabel.get(), nullptr); |