compilerplugins/clang/unnecessaryvirtual-dead.results | 6 +-- compilerplugins/clang/unnecessaryvirtual.results | 36 ++++++++++-------- include/svtools/valueset.hxx | 1 svtools/source/control/valueset.cxx | 6 --- 4 files changed, 24 insertions(+), 25 deletions(-)
New commits: commit ddfe8011df9a35a140e3c53c9efd71f5dd63ecb8 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Jan 23 08:43:49 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jan 23 10:04:39 2020 +0100 loplugin:unnecessaryvirtual Change-Id: I262ebd2479df0bfbca102d47e82d62bf98b339a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87234 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results index 355a5e83fad6..a219ee8c5882 100644 --- a/compilerplugins/clang/unnecessaryvirtual-dead.results +++ b/compilerplugins/clang/unnecessaryvirtual-dead.results @@ -8,16 +8,16 @@ include/canvas/base/graphicdevicebase.hxx:306 void canvas::GraphicDeviceBase::removePropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertyChangeListener> &,) include/canvas/base/graphicdevicebase.hxx:319 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,) +include/svtools/valueset.hxx:301 + void ValueSet::UserDraw(const class UserDrawEvent &,) sc/source/core/opencl/formulagroupcl.cxx:1062 void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,) -slideshow/source/engine/animationfactory.cxx:439 +slideshow/source/engine/animationfactory.cxx:437 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() vcl/inc/salframe.hxx:145 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) vcl/inc/salinst.hxx:202 void SalInstance::releaseMainThread() -vcl/inc/salmenu.hxx:71 - void SalMenu::SetItemBits(unsigned int,enum MenuItemBits,) vcl/inc/salmenu.hxx:81 void SalMenu::RemoveMenuBarButton(unsigned short,) vcl/inc/salobj.hxx:49 diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index a4dcb05f9d81..bf1f92f1c9d7 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -82,8 +82,8 @@ include/svl/svdde.hxx:244 _Bool DdeTopic::StartAdviseLoop() include/svl/svdde.hxx:300 void DdeService::~DdeService() -include/svx/svdtext.hxx:60 - const class SfxItemSet & SdrText::GetItemSet()const +include/svtools/valueset.hxx:301 + void ValueSet::UserDraw(const class UserDrawEvent &,) include/toolkit/controls/geometrycontrolmodel.hxx:183 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 include/vbahelper/vbacollectionimpl.hxx:290 @@ -108,7 +108,7 @@ include/vbahelper/vbareturntypes.hxx:40 void ooo::vba::DefaultReturnHelper::setValue(type-parameter-0-0,) include/vbahelper/vbareturntypes.hxx:41 type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue() -include/vcl/customweld.hxx:41 +include/vcl/customweld.hxx:42 class rtl::OUString weld::CustomWidgetController::GetHelpText()const include/vcl/weld.hxx:101 void weld::Widget::set_visible(_Bool,) @@ -188,23 +188,23 @@ sc/source/ui/vba/vbapagebreak.hxx:49 class com::sun::star::uno::Reference<class ooo::vba::excel::XRange> ScVbaPageBreak::Location() 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:173 +slideshow/source/engine/activities/activitiesfactory.cxx:172 void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation() -slideshow/source/engine/activities/activitiesfactory.cxx:242 +slideshow/source/engine/activities/activitiesfactory.cxx:241 void slideshow::internal::(anonymous namespace)::FromToByActivity::endAnimation() -slideshow/source/engine/activities/activitiesfactory.cxx:332 +slideshow/source/engine/activities/activitiesfactory.cxx:331 void slideshow::internal::(anonymous namespace)::FromToByActivity::performEnd() -slideshow/source/engine/activities/activitiesfactory.cxx:345 +slideshow/source/engine/activities/activitiesfactory.cxx:344 void slideshow::internal::(anonymous namespace)::FromToByActivity::dispose() -slideshow/source/engine/activities/activitiesfactory.cxx:527 +slideshow/source/engine/activities/activitiesfactory.cxx:526 void slideshow::internal::(anonymous namespace)::ValuesActivity::startAnimation() -slideshow/source/engine/activities/activitiesfactory.cxx:538 +slideshow/source/engine/activities/activitiesfactory.cxx:537 void slideshow::internal::(anonymous namespace)::ValuesActivity::endAnimation() -slideshow/source/engine/activities/activitiesfactory.cxx:583 +slideshow/source/engine/activities/activitiesfactory.cxx:582 void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd() -slideshow/source/engine/animationfactory.cxx:439 +slideshow/source/engine/animationfactory.cxx:437 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() -slideshow/source/engine/animationfactory.cxx:442 +slideshow/source/engine/animationfactory.cxx:440 void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,) sw/inc/flypos.hxx:37 void SwPosFlyFrame::~SwPosFlyFrame() @@ -216,8 +216,6 @@ vcl/inc/salinst.hxx:92 _Bool SalInstance::SVMainHook(int *,) vcl/inc/salinst.hxx:202 void SalInstance::releaseMainThread() -vcl/inc/salmenu.hxx:71 - void SalMenu::SetItemBits(unsigned int,enum MenuItemBits,) vcl/inc/salmenu.hxx:80 _Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,) vcl/inc/salmenu.hxx:81 @@ -228,7 +226,7 @@ vcl/inc/salobj.hxx:49 void SalObject::Enable(_Bool,) vcl/inc/salprn.hxx:116 enum SalPrinterError SalPrinter::GetErrorCode() -vcl/inc/skia/gdiimpl.hxx:210 +vcl/inc/skia/gdiimpl.hxx:212 void SkiaSalGraphicsImpl::createSurface() vcl/inc/unx/gtk/gtkdata.hxx:121 int GtkSalDisplay::CaptureMouse(class SalFrame *,) @@ -258,6 +256,14 @@ vcl/inc/unx/salframe.h:207 void X11SalFrame::updateGraphics(_Bool,) vcl/inc/unx/salinst.h:44 class SalX11Display * X11SalInstance::CreateDisplay()const +workdir/../vcl/inc/qt5/Qt5Frame.hxx:161 + void Qt5Frame::registerDragSource(class Qt5DragSource *,) +workdir/../vcl/inc/qt5/Qt5Frame.hxx:162 + void Qt5Frame::deregisterDragSource(const class Qt5DragSource *,) +workdir/../vcl/inc/qt5/Qt5Frame.hxx:163 + void Qt5Frame::registerDropTarget(class Qt5DropTarget *,) +workdir/../vcl/inc/qt5/Qt5Frame.hxx:164 + void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *,) writerfilter/source/ooxml/OOXMLFactory.hxx:72 void writerfilter::ooxml::OOXMLFactory_ns::startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,) writerfilter/source/ooxml/OOXMLFactory.hxx:73 diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 5135afa0affa..bc62b131c2ef 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -298,7 +298,6 @@ public: virtual FactoryFunction GetUITestFactory() const override; virtual void Select(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); /// Insert @rImage item. void InsertItem(sal_uInt16 nItemId, const Image& rImage); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index b3dcd2adfa38..e05e316e0e64 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -273,8 +273,6 @@ void ValueSet::ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* if (pItem->meType == VALUESETITEM_USERDRAW) { - UserDrawEvent aUDEvt(this, &rRenderContext, aRect, pItem->mnId); - UserDraw(aUDEvt); } else { @@ -1495,10 +1493,6 @@ void ValueSet::Select() maSelectHdl.Call( this ); } -void ValueSet::UserDraw( const UserDrawEvent& ) -{ -} - void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage ) { std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits