diff options
-rw-r--r-- | compilerplugins/clang/unnecessaryvirtual-dead.results | 4 | ||||
-rw-r--r-- | compilerplugins/clang/unnecessaryvirtual.results | 24 | ||||
-rw-r--r-- | include/vcl/lstbox.hxx | 2 | ||||
-rw-r--r-- | include/vcl/treelistbox.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/listbox.hxx | 1 | ||||
-rw-r--r-- | vcl/source/control/listbox.cxx | 11 |
6 files changed, 14 insertions, 32 deletions
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results index edda0c78ce2c..0fb442b60037 100644 --- a/compilerplugins/clang/unnecessaryvirtual-dead.results +++ b/compilerplugins/clang/unnecessaryvirtual-dead.results @@ -8,6 +8,8 @@ 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 void basegfx::unotools::UnoPolyPolygon::modifying()const +include/vcl/lstbox.hxx:132 + void ListBox::UserDraw(const class UserDrawEvent &,) 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 @@ -16,7 +18,7 @@ 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:202 +vcl/inc/salinst.hxx:203 void SalInstance::releaseMainThread() vcl/inc/salmenu.hxx:81 void SalMenu::RemoveMenuBarButton(unsigned short,) diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index 811776b8e263..bbc588345b83 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -300,18 +300,12 @@ include/vbahelper/vbareturntypes.hxx:41 type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue() include/vcl/customweld.hxx:42 class rtl::OUString weld::CustomWidgetController::GetHelpText()const -include/vcl/lstbox.hxx:135 - void ListBox::DoubleClick() -include/vcl/treelistbox.hxx:458 - _Bool SvTreeListBox::NotifyAcceptDrop(class SvTreeListEntry *,) -include/vcl/treelistbox.hxx:470 - enum TriState SvTreeListBox::NotifyCopying(class SvTreeListEntry *,class SvTreeListEntry *,class SvTreeListEntry *&,unsigned long &,) -include/vcl/treelistbox.hxx:493 - class rtl::OUString SvTreeListBox::GetEntryAltText(class SvTreeListEntry *,)const -include/vcl/treelistbox.hxx:494 - class rtl::OUString SvTreeListBox::GetEntryLongDescription(class SvTreeListEntry *,)const -include/vcl/treelistbox.hxx:669 - long SvTreeListBox::GetTabPos(const class SvTreeListEntry *,class SvLBoxTab *,) +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 void weld::Widget::set_visible(_Bool,) sc/source/core/opencl/formulagroupcl.cxx:1061 @@ -418,9 +412,9 @@ 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:92 +vcl/inc/salinst.hxx:93 _Bool SalInstance::SVMainHook(int *,) -vcl/inc/salinst.hxx:202 +vcl/inc/salinst.hxx:203 void SalInstance::releaseMainThread() vcl/inc/salmenu.hxx:80 _Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,) @@ -432,7 +426,7 @@ vcl/inc/salobj.hxx:49 void SalObject::Enable(_Bool,) vcl/inc/salprn.hxx:116 enum SalPrinterError SalPrinter::GetErrorCode() -vcl/inc/skia/gdiimpl.hxx:222 +vcl/inc/skia/gdiimpl.hxx:226 void SkiaSalGraphicsImpl::createSurface() vcl/inc/unx/gtk/gtkdata.hxx:121 int GtkSalDisplay::CaptureMouse(class SalFrame *,) diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 3ad859a927db..386d8e89c217 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -101,7 +101,6 @@ private: DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void ); DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent*, void ); DECL_DLLPRIVATE_LINK( ImplFocusHdl, sal_Int32, void ); DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl, LinkParamNone*, void ); @@ -129,7 +128,6 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Select(); void DoubleClick(); diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index 96f019094e02..f00e5ac78582 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -683,8 +683,8 @@ public: void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); - virtual bool Expand( SvTreeListEntry* pParent ); - virtual bool Collapse( SvTreeListEntry* pParent ); + bool Expand( SvTreeListEntry* pParent ); + bool Collapse( SvTreeListEntry* pParent ); virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect ); void SelectAll( bool bSelect ); diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index dd71d65943f2..2fae0dc78422 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -579,7 +579,6 @@ public: void SetImage( const Image& rImg ) { maImage = rImg; } void SetMBDownHdl( const Link<void*,void>& rLink ) { maMBDownHdl = rLink; } - void SetUserDrawHdl( const Link<UserDrawEvent*, void>& rLink ) { maUserDrawHdl = rLink; } void EnableUserDraw( bool bUserDraw ) { mbUserDrawEnabled = bUserDraw; } bool IsUserDrawEnabled() const { return mbUserDrawEnabled; } diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 07bdb413ac02..7dae30310bb9 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -118,7 +118,6 @@ void ListBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) mpImplWin = VclPtr<ImplWin>::Create( this, (nStyle & (WB_LEFT|WB_RIGHT|WB_CENTER))|WB_NOBORDER ); mpImplWin->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) ); - mpImplWin->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) ); mpImplWin->Show(); mpImplWin->GetDropTarget()->addDropTargetListener(xDrop); mpImplWin->SetEdgeBlending(false); @@ -138,7 +137,6 @@ void ListBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) mpImplLB->SetScrollHdl( LINK( this, ListBox, ImplScrollHdl ) ); mpImplLB->SetCancelHdl( LINK( this, ListBox, ImplCancelHdl ) ); mpImplLB->SetDoubleClickHdl( LINK( this, ListBox, ImplDoubleClickHdl ) ); - mpImplLB->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) ); mpImplLB->SetFocusHdl( LINK( this, ListBox, ImplFocusHdl ) ); mpImplLB->SetListItemSelectHdl( LINK( this, ListBox, ImplListItemSelectHdl ) ); mpImplLB->SetPosPixel( Point() ); @@ -1319,15 +1317,6 @@ void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines } } -IMPL_LINK( ListBox, ImplUserDrawHdl, UserDrawEvent*, pEvent, void ) -{ - UserDraw( *pEvent ); -} - -void ListBox::UserDraw( const UserDrawEvent& ) -{ -} - void ListBox::SetReadOnly( bool bReadOnly ) { if ( mpImplLB->IsReadOnly() != bReadOnly ) |