diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-16 11:21:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-16 13:48:36 +0200 |
commit | a568abf851f24cb4b3f9cadb1699154ae41b8202 (patch) | |
tree | 5ba454e5496e2ded75474e2cdcb7296036998b81 | |
parent | b011e696f26618256ac65d0ea492553ee0a9cdd6 (diff) |
loplugin:unnecessaryvirtual
Change-Id: Iafad1df533d5fefd335066427a0fb9e2d8bfa91d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100817
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | compilerplugins/clang/unnecessaryvirtual-dead.results | 6 | ||||
-rw-r--r-- | compilerplugins/clang/unnecessaryvirtual.results | 22 | ||||
-rw-r--r-- | include/vcl/toolkit/treelistbox.hxx | 10 | ||||
-rw-r--r-- | vcl/source/treelist/svimpbox.cxx | 2 |
4 files changed, 23 insertions, 17 deletions
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results index b8426cadbc50..7f23e8490075 100644 --- a/compilerplugins/clang/unnecessaryvirtual-dead.results +++ b/compilerplugins/clang/unnecessaryvirtual-dead.results @@ -8,11 +8,11 @@ canvas/inc/base/graphicdevicebase.hxx:318 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,) include/basegfx/utils/unopolypolygon.hxx:94 void basegfx::unotools::UnoPolyPolygon::modifying()const -include/vcl/treelistbox.hxx:502 - void SvTreeListBox::NotifyEndScroll() +include/vcl/toolkit/treelistbox.hxx:512 + void SvTreeListBox::PreparePaint(class OutputDevice &,class SvTreeListEntry &,) sc/source/core/opencl/formulagroupcl.cxx:1069 void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,) -slideshow/source/engine/animationfactory.cxx:434 +slideshow/source/engine/animationfactory.cxx:593 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() vcl/inc/salframe.hxx:145 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index 5d8c213aefd6..57fadbf8b7f0 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -296,12 +296,18 @@ include/vcl/customweld.hxx:42 class rtl::OUString weld::CustomWidgetController::GetHelpText()const include/vcl/toolkit/dialog.hxx:96 void Dialog::set_content_area(class VclBox *,) -include/vcl/treelistbox.hxx:502 - void SvTreeListBox::NotifyEndScroll() -include/vcl/treelistbox.hxx:503 - void SvTreeListBox::NotifyScrolled() -include/vcl/treelistbox.hxx:648 - _Bool SvTreeListBox::Select(class SvTreeListEntry *,_Bool,) +include/vcl/toolkit/treelistbox.hxx:417 + void SvTreeListBox::SelectHdl() +include/vcl/toolkit/treelistbox.hxx:418 + void SvTreeListBox::DeselectHdl() +include/vcl/toolkit/treelistbox.hxx:419 + _Bool SvTreeListBox::DoubleClickHdl() +include/vcl/toolkit/treelistbox.hxx:512 + void SvTreeListBox::PreparePaint(class OutputDevice &,class SvTreeListEntry &,) +include/vcl/toolkit/treelistbox.hxx:584 + void SvTreeListBox::CheckButtonHdl() +include/vcl/toolkit/treelistbox.hxx:677 + class VclPtr<class PopupMenu> SvTreeListBox::CreateContextMenu() include/vcl/weld.hxx:95 void weld::Widget::set_visible(_Bool,) sc/source/core/opencl/formulagroupcl.cxx:1061 @@ -394,9 +400,9 @@ slideshow/source/engine/activities/activitiesfactory.cxx:536 void slideshow::internal::(anonymous namespace)::ValuesActivity::endAnimation() slideshow/source/engine/activities/activitiesfactory.cxx:581 void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd() -slideshow/source/engine/animationfactory.cxx:434 +slideshow/source/engine/animationfactory.cxx:593 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() -slideshow/source/engine/animationfactory.cxx:437 +slideshow/source/engine/animationfactory.cxx:596 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> &,) slideshow/source/inc/shape.hxx:221 void slideshow::internal::Shape::setIsForeground(const _Bool,) diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index f485ca967b89..fd2ce95cb755 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -414,9 +414,9 @@ public: void ExpandedHdl(); bool ExpandingHdl(); - virtual void SelectHdl(); - virtual void DeselectHdl(); - virtual bool DoubleClickHdl(); + void SelectHdl(); + void DeselectHdl(); + bool DoubleClickHdl(); SvTreeListEntry* GetHdlEntry() const { return pHdlEntry; } // Is called for an Entry that gets expanded with the Flag @@ -580,7 +580,7 @@ public: static const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ); static const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ); - virtual void CheckButtonHdl(); + void CheckButtonHdl(); void SetSublistOpenWithLeftRight(); // open/close sublist with cursor left/right @@ -673,7 +673,7 @@ public: void ShowFocusRect( const SvTreeListEntry* pEntry ); - virtual VclPtr<PopupMenu> CreateContextMenu(); + static VclPtr<PopupMenu> CreateContextMenu(); void EnableContextMenuHandling(); diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index e8bd4da9ca0c..a52e3419ad62 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -2935,7 +2935,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) } { - VclPtr<PopupMenu> pPopup = m_pView->CreateContextMenu(); + VclPtr<PopupMenu> pPopup = SvTreeListBox::CreateContextMenu(); if (pPopup) { // do action for selected entry in popup menu |