compilerplugins/clang/unnecessaryvirtual-dead.results | 10 +--
compilerplugins/clang/unnecessaryvirtual.results | 50 +++++++++---------
include/vcl/combobox.hxx | 3 -
include/vcl/field.hxx | 2
include/vcl/tabpage.hxx | 2
include/vcl/treelistbox.hxx | 6 +-
vcl/source/control/combobox.cxx | 11 ---
vcl/source/control/tabctrl.cxx | 1
vcl/source/control/wizardmachine.cxx | 1
vcl/source/window/tabpage.cxx | 4 -
10 files changed, 36 insertions(+), 54 deletions(-)
New commits:
commit 128a5f3a0378bda2e580b1dd4e55e5632e7f05ae
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 15 19:05:58 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 15 22:00:52 2020 +0200
loplugin:unnecessaryvirtual
Change-Id: Ibb37c7e840a32453b1d52854d5f958c0285cd26a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94326
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 0fb442b60037..e122268806bf 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -6,18 +6,18 @@ canvas/inc/base/graphicdevicebase.hxx:305
void canvas::GraphicDeviceBase::removePropertyChangeListener(const class
rtl::OUString &,const class com::sun::star::uno::Reference<class
com::sun::star::beans::XPropertyChangeListener> &,)
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:97
+include/basegfx/utils/unopolypolygon.hxx:94
void basegfx::unotools::UnoPolyPolygon::modifying()const
-include/vcl/lstbox.hxx:132
- void ListBox::UserDraw(const class UserDrawEvent &,)
+include/vcl/combobox.hxx:63
+ void ComboBox::UserDraw(const class UserDrawEvent &,)
+include/vcl/tabpage.hxx:50
+ void TabPage::ActivatePage()
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:437
void slideshow::internal::(anonymous
namespace)::GenericAnimation::prefetch()
vcl/inc/salframe.hxx:145
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salframe.hxx:264
- void SalFrame::BeginSheet(class SalFrame *,)const
vcl/inc/salinst.hxx:203
void SalInstance::releaseMainThread()
vcl/inc/salmenu.hxx:81
diff --git a/compilerplugins/clang/unnecessaryvirtual.results
b/compilerplugins/clang/unnecessaryvirtual.results
index bbc588345b83..bf8eb7832aa7 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -246,7 +246,7 @@ forms/source/xforms/namedcollection.hxx:101
class com::sun::star::uno::Sequence<class rtl::OUString>
NamedCollection::getElementNames()
forms/source/xforms/namedcollection.hxx:106
unsigned char NamedCollection::hasByName(const class rtl::OUString &,)
-include/basegfx/utils/unopolypolygon.hxx:97
+include/basegfx/utils/unopolypolygon.hxx:94
void basegfx::unotools::UnoPolyPolygon::modifying()const
include/comphelper/interaction.hxx:54
void comphelper::OInteraction::select()
@@ -282,31 +282,41 @@ include/vbahelper/vbacollectionimpl.hxx:295
class com::sun::star::uno::Any ScVbaCollectionBase::Item(const class
com::sun::star::uno::Any &,const class com::sun::star::uno::Any &,)
include/vbahelper/vbacollectionimpl.hxx:324
unsigned char ScVbaCollectionBase::hasElements()
-include/vbahelper/vbahelperinterface.hxx:77
+include/vbahelper/vbahelperinterface.hxx:74
int InheritedHelperInterfaceImpl::getCreator()
-include/vbahelper/vbahelperinterface.hxx:81
+include/vbahelper/vbahelperinterface.hxx:78
class com::sun::star::uno::Reference<class ooo::vba::XHelperInterface>
InheritedHelperInterfaceImpl::getParent()
-include/vbahelper/vbahelperinterface.hxx:83
+include/vbahelper/vbahelperinterface.hxx:80
class com::sun::star::uno::Any InheritedHelperInterfaceImpl::Application()
-include/vbahelper/vbahelperinterface.hxx:91
+include/vbahelper/vbahelperinterface.hxx:88
class rtl::OUString InheritedHelperInterfaceImpl::getImplementationName()
-include/vbahelper/vbahelperinterface.hxx:92
+include/vbahelper/vbahelperinterface.hxx:89
unsigned char InheritedHelperInterfaceImpl::supportsService(const class
rtl::OUString &,)
-include/vbahelper/vbahelperinterface.hxx:102
+include/vbahelper/vbahelperinterface.hxx:99
class com::sun::star::uno::Sequence<class rtl::OUString>
InheritedHelperInterfaceImpl::getSupportedServiceNames()
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/combobox.hxx:63
+ void ComboBox::UserDraw(const class UserDrawEvent &,)
+include/vcl/combobox.hxx:64
+ void ComboBox::Select()
include/vcl/customweld.hxx:42
class rtl::OUString weld::CustomWidgetController::GetHelpText()const
-include/vcl/lstbox.hxx:132
- void ListBox::UserDraw(const class UserDrawEvent &,)
-include/vcl/treelistbox.hxx:686
- _Bool SvTreeListBox::Expand(class SvTreeListEntry *,)
-include/vcl/treelistbox.hxx:687
- _Bool SvTreeListBox::Collapse(class SvTreeListEntry *,)
-include/vcl/weld.hxx:103
+include/vcl/field.hxx:154
+ void NumericFormatter::SetValueFromString(const class rtl::OUString &,)
+include/vcl/tabpage.hxx:50
+ void TabPage::ActivatePage()
+include/vcl/toolkit/dialog.hxx:96
+ void Dialog::set_content_area(class VclBox *,)
+include/vcl/treelistbox.hxx:449
+ void SvTreeListBox::ExpandedHdl()
+include/vcl/treelistbox.hxx:450
+ _Bool SvTreeListBox::ExpandingHdl()
+include/vcl/treelistbox.hxx:472
+ enum TriState SvTreeListBox::NotifyMoving(class SvTreeListEntry *,class
SvTreeListEntry *,class SvTreeListEntry *&,unsigned long &,)
+include/vcl/weld.hxx:105
void weld::Widget::set_visible(_Bool,)
sc/source/core/opencl/formulagroupcl.cxx:1061
_Bool sc::opencl::(anonymous
namespace)::DynamicKernelSlidingArgument::NeedParallelReduction()const
@@ -410,8 +420,6 @@ vcl/inc/salframe.hxx:145
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
vcl/inc/salframe.hxx:194
void SalFrame::Flush(const class tools::Rectangle &,)
-vcl/inc/salframe.hxx:264
- void SalFrame::BeginSheet(class SalFrame *,)const
vcl/inc/salinst.hxx:93
_Bool SalInstance::SVMainHook(int *,)
vcl/inc/salinst.hxx:203
@@ -426,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:226
+vcl/inc/skia/gdiimpl.hxx:223
void SkiaSalGraphicsImpl::createSurface()
vcl/inc/unx/gtk/gtkdata.hxx:121
int GtkSalDisplay::CaptureMouse(class SalFrame *,)
@@ -472,12 +480,6 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:69
void writerfilter::ooxml::OOXMLFactory_ns::endAction(class
writerfilter::ooxml::OOXMLFastContextHandler *,)
writerfilter/source/ooxml/OOXMLFactory.hxx:70
void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class
writerfilter::ooxml::OOXMLFastContextHandler *,int,const class
tools::SvRef<class writerfilter::ooxml::OOXMLValue> &,)
-xmloff/source/forms/elementimport.hxx:574
- class rtl::Reference<class SvXMLImportContext>
xmloff::OContainerImport::CreateChildContext(unsigned short,const class
rtl::OUString &,const class com::sun::star::uno::Reference<class
com::sun::star::xml::sax::XAttributeList> &,)
-xmloff/source/forms/elementimport.hxx:577
- void xmloff::OContainerImport::EndElement()
-xmloff/source/forms/elementimport.hxx:582
- class com::sun::star::uno::Reference<class
com::sun::star::beans::XPropertySet> xmloff::OContainerImport::createElement()
-xmloff/source/forms/elementimport.hxx:609
+xmloff/source/forms/elementimport.hxx:573
class com::sun::star::uno::Reference<class
com::sun::star::beans::XPropertySet> xmloff::OColumnImport::createElement()
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index ec38c293a601..88693051ace6 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -60,8 +60,7 @@ public:
virtual void StateChanged( StateChangedType nType ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- virtual void UserDraw( const UserDrawEvent& rUDEvt );
- virtual void Select();
+ void Select();
void DoubleClick();
virtual void Modify() override;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index a8620f876ffd..24a6eab793b3 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -151,7 +151,7 @@ public:
sal_Int64 Denormalize( sal_Int64 nValue ) const;
OUString GetValueString() const;
- virtual void SetValueFromString(const OUString& rStr);
+ void SetValueFromString(const OUString& rStr);
protected:
sal_Int64 mnLastValue;
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 17270d9b6c0f..fd2cf24131b5 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -47,8 +47,6 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- virtual void ActivatePage();
-
//To-Do, consider inheriting from VclContainer
virtual void SetPosSizePixel(const Point& rNewPos, const Size&
rNewSize) override;
virtual void SetPosPixel(const Point& rNewPos) override;
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index 5836c915b07c..565a943c41a5 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -446,8 +446,8 @@ public:
void SetCustomRenderHdl(const Link<svtree_render_args, void>& rLink) {
aCustomRenderHdl = rLink; }
void SetCustomMeasureHdl(const Link<svtree_measure_args, Size>& rLink) {
aCustomMeasureHdl = rLink; }
- virtual void ExpandedHdl();
- virtual bool ExpandingHdl();
+ void ExpandedHdl();
+ bool ExpandingHdl();
virtual void SelectHdl();
virtual void DeselectHdl();
virtual bool DoubleClickHdl();
@@ -469,7 +469,7 @@ public:
SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource );
// Return value: TRISTATE_TRUE == Ok, TRISTATE_FALSE == Cancel,
TRISTATE_INDET == Ok and Make visible moved entry
- virtual TriState NotifyMoving(
+ TriState NotifyMoving(
SvTreeListEntry* pTarget, // D'n'D DropPosition in GetModel()
SvTreeListEntry* pEntry, // Entry to be moved from
GetSourceListBox()->GetModel()
SvTreeListEntry*& rpNewParent, // New TargetParent
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 092a30eb41a1..1bdbaa975a9e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -88,7 +88,6 @@ struct ComboBox::Impl
DECL_LINK( ImplClickBtnHdl, void*, void );
DECL_LINK( ImplPopupModeEndHdl, FloatingWindow*, void );
DECL_LINK( ImplSelectionChangedHdl, sal_Int32, void );
- DECL_LINK( ImplUserDrawHdl, UserDrawEvent*, void );
DECL_LINK( ImplAutocompleteHdl, Edit&, void );
DECL_LINK( ImplListItemSelectHdl , LinkParamNone*, void );
};
@@ -237,7 +236,6 @@ void ComboBox::ImplInit( vcl::Window* pParent, WinBits
nStyle )
m_pImpl->m_pImplLB->SetSelectHdl( LINK(m_pImpl.get(), ComboBox::Impl,
ImplSelectHdl) );
m_pImpl->m_pImplLB->SetCancelHdl( LINK(m_pImpl.get(), ComboBox::Impl,
ImplCancelHdl) );
m_pImpl->m_pImplLB->SetDoubleClickHdl( LINK(m_pImpl.get(), ComboBox::Impl,
ImplDoubleClickHdl) );
- m_pImpl->m_pImplLB->SetUserDrawHdl( LINK(m_pImpl.get(), ComboBox::Impl,
ImplUserDrawHdl) );
m_pImpl->m_pImplLB->SetSelectionChangedHdl( LINK(m_pImpl.get(),
ComboBox::Impl, ImplSelectionChangedHdl) );
m_pImpl->m_pImplLB->SetListItemSelectHdl( LINK(m_pImpl.get(),
ComboBox::Impl, ImplListItemSelectHdl) );
m_pImpl->m_pImplLB->Show();
@@ -1255,15 +1253,6 @@ void ComboBox::Draw( OutputDevice* pDev, const Point&
rPos, const Size& rSize, D
}
-IMPL_LINK(ComboBox::Impl, ImplUserDrawHdl, UserDrawEvent*, pEvent, void)
-{
- m_rThis.UserDraw(*pEvent);
-}
-
-void ComboBox::UserDraw( const UserDrawEvent& )
-{
-}
-
void ComboBox::SetUserDrawHdl(const Link<UserDrawEvent*, void>& rLink)
{
m_pImpl->m_pImplLB->SetUserDrawHdl(rLink);
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 3d492a9a6b0f..e5d990f041de 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -680,7 +680,6 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId,
sal_uInt16 nOldId )
pCtrlParent->SetHelpId( pPage->GetHelpId() );
}
- pPage->ActivatePage();
pPage->Show();
if ( pOldPage && pOldPage->HasChildPathFocus() )
diff --git a/vcl/source/control/wizardmachine.cxx
b/vcl/source/control/wizardmachine.cxx
index c9e323620332..a696749f2af7 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -277,7 +277,6 @@ namespace vcl
if ( pTabPage )
{
ImplPosTabPage();
- pTabPage->ActivatePage();
pTabPage->Show();
}
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index d09ef10d542d..365feaf4ce53 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -168,10 +168,6 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, Dr
pDev->Pop();
}
-void TabPage::ActivatePage()
-{
-}
-
Size TabPage::GetOptimalSize() const
{
if (isLayoutEnabled(this))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
