[Libreoffice-commits] core.git: compilerplugins/clang include/svtools include/svx svtools/source vcl/inc

Noel Grandin noel.grandin at collabora.co.uk
Mon Jun 11 08:46:03 UTC 2018


 compilerplugins/clang/unnecessaryvirtual-dead.results |    6 +---
 compilerplugins/clang/unnecessaryvirtual.results      |   24 ++++++++++--------
 include/svtools/valueset.hxx                          |    3 --
 include/svx/dialcontrol.hxx                           |    2 -
 include/svx/svdobj.hxx                                |    2 -
 svtools/source/control/valueset.cxx                   |    6 ----
 vcl/inc/headless/svpgdi.hxx                           |    2 -
 7 files changed, 20 insertions(+), 25 deletions(-)

New commits:
commit ff130af9661a57d290dbf89b54a4c0ce8d0f71ea
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Jun 11 08:29:20 2018 +0200

    loplugin:unnecessaryvirtual
    
    Change-Id: I2ff0f1fff7302cbf884e35879c72df0dc09eede4
    Reviewed-on: https://gerrit.libreoffice.org/55597
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results
index dc3fa6cd6d5a..6c9fef9d3ab8 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -1,9 +1,5 @@
 basic/source/comp/codegen.cxx:462
     void OffSetAccumulator::start(const unsigned char *,)
-forms/source/component/entrylisthelper.hxx:138
-    void frm::OEntryListHelper::connectedExternalListSource()
-forms/source/component/entrylisthelper.hxx:142
-    void frm::OEntryListHelper::disconnectedExternalListSource()
 include/basegfx/utils/unopolypolygon.hxx:97
     void basegfx::unotools::UnoPolyPolygon::modifying()const
 include/canvas/base/bufferedgraphicdevicebase.hxx:108
@@ -12,6 +8,8 @@ include/canvas/base/graphicdevicebase.hxx:302
     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:315
     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:498
+    void SvtValueSet::UserDraw(const class UserDrawEvent &,)
 slideshow/source/engine/animationfactory.cxx:442
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,)
 vcl/inc/salframe.hxx:135
diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results
index 13d089a6dc94..04c9dbad7855 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -18,7 +18,7 @@ basic/source/comp/codegen.cxx:515
     void BufferTransformer::processOpCode2(enum SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
 basic/source/comp/codegen.cxx:525
     _Bool BufferTransformer::processParams()
-chart2/source/inc/WeakListenerAdapter.hxx:58
+chart2/source/inc/WeakListenerAdapter.hxx:57
     void chart::WeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,)
 extensions/source/dbpilots/unoautopilot.hxx:98
     class cppu::IPropertyArrayHelper * dbp::OUnoAutoPilot::createArrayHelper()const
@@ -102,8 +102,6 @@ include/sfx2/itemwrapper.hxx:156
     const type-parameter-0-0 & sfx::IdentItemWrapper::GetItemValue(const type-parameter-0-0 &,)const
 include/sfx2/itemwrapper.hxx:158
     void sfx::IdentItemWrapper::SetItemValue(type-parameter-0-0 &,const type-parameter-0-0 &,)const
-include/sfx2/tabdlg.hxx:254
-    void SfxTabDialogController::RefreshInputSet()
 include/svl/svdde.hxx:244
     class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
 include/svl/svdde.hxx:245
@@ -118,6 +116,14 @@ include/svl/svdde.hxx:307
     void DdeService::~DdeService()
 include/svtools/treelistbox.hxx:722
     void SvTreeListBox::SelectAll(_Bool,_Bool,)
+include/svtools/valueset.hxx:497
+    void SvtValueSet::Select()
+include/svtools/valueset.hxx:498
+    void SvtValueSet::UserDraw(const class UserDrawEvent &,)
+include/svx/dialcontrol.hxx:234
+    void svx::SvxDialControl::HandleMouseEvent(const class Point &,_Bool,)
+include/svx/svdobj.hxx:346
+    class SdrPage * SdrObject::getSdrPageFromSdrObject()const
 include/toolkit/controls/geometrycontrolmodel.hxx:191
     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
@@ -142,9 +148,9 @@ 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/weld.hxx:288
+include/vcl/weld.hxx:298
     void weld::TreeView::append_text(const class rtl::OUString &,)
-include/vcl/weld.hxx:291
+include/vcl/weld.hxx:301
     void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,)
 sc/source/core/opencl/formulagroupcl.cxx:870
     void sc::opencl::DynamicKernelMixedArgument::GenNumDeclRef(class std::basic_stringstream<char> &,)const
@@ -234,13 +240,13 @@ slideshow/source/engine/animationfactory.cxx:446
     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()
+vcl/inc/headless/svpgdi.hxx:227
+    void SvpSalGraphics::drawBitmap(const struct SalTwoRect &,struct BitmapBuffer *,)
 vcl/inc/salframe.hxx:135
     void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
 vcl/inc/salframe.hxx:179
     void SalFrame::Flush(const class tools::Rectangle &,)
-vcl/inc/salinst.hxx:167
-    class weld::Builder * SalInstance::CreateInterimBuilder(class vcl::Window *,const class rtl::OUString &,const class rtl::OUString &,)
-vcl/inc/sallayout.hxx:179
+vcl/inc/sallayout.hxx:185
     _Bool SalLayout::GetBoundRect(class SalGraphics &,class tools::Rectangle &,)const
 vcl/inc/salmenu.hxx:79
     _Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,)
@@ -252,8 +258,6 @@ vcl/inc/salobj.hxx:46
     void SalObject::Enable(_Bool,)
 vcl/inc/salprn.hxx:112
     enum SalPrinterError SalPrinter::GetErrorCode()
-vcl/inc/unx/glyphcache.hxx:121
-    void FreetypeFont::~FreetypeFont()
 vcl/inc/unx/gtk/gtkdata.hxx:164
     int GtkSalDisplay::CaptureMouse(class SalFrame *,)
 vcl/inc/unx/saldata.hxx:65
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 5530adf33da8..9d831bdeaafe 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -494,8 +494,7 @@ public:
     virtual void    StyleUpdated() override;
     virtual OUString RequestHelp(tools::Rectangle& rHelpRect) override;
 
-    virtual void    Select();
-    virtual void    UserDraw( const UserDrawEvent& rUDEvt );
+    void            Select();
 
     OUString        GetText() const { return maText; }
     void            SetText(const OUString& rText) { maText = rText; }
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 6388a0d2c2aa..19744fce1488 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -231,7 +231,7 @@ protected:
     };
     std::unique_ptr< DialControl_Impl > mpImpl;
 
-    virtual void        HandleMouseEvent( const Point& rPos, bool bInitial );
+    void                HandleMouseEvent( const Point& rPos, bool bInitial );
     void                HandleEscapeEvent();
 
     void                SetRotation( sal_Int32 nAngle, bool bBroadcast );
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 828206e246ac..2f1273716bbe 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -343,7 +343,7 @@ public:
     SdrObject(SdrModel& rSdrModel);
 
     // SdrModel/SdrPage access on SdrObject level
-    virtual SdrPage* getSdrPageFromSdrObject() const;
+    SdrPage* getSdrPageFromSdrObject() const;
     SdrModel& getSdrModelFromSdrObject() const;
     SdrObjList* getParentOfSdrObject() const;
     virtual SdrObjList* getChildrenOfSdrObject() const;
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 292c89a097b2..a71349721ef7 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2360,10 +2360,6 @@ void SvtValueSet::Select()
     maSelectHdl.Call( this );
 }
 
-void SvtValueSet::UserDraw( const UserDrawEvent& )
-{
-}
-
 size_t SvtValueSet::ImplGetItem( const Point& rPos ) const
 {
     if (!mbHasVisibleItems)
@@ -3376,8 +3372,6 @@ void SvtValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, SvtV
 
         if (pItem->meType == VALUESETITEM_USERDRAW)
         {
-            UserDrawEvent aUDEvt(nullptr, maVirDev.get(), aRect, pItem->mnId);
-            UserDraw(aUDEvt);
         }
         else
         {
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index c5a0639498ca..c77e5dae4612 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -224,7 +224,7 @@ public:
                                       SalGraphics* pSrcGraphics ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap ) override;
-    virtual void            drawBitmap( const SalTwoRect& rPosAry,
+    void                    drawBitmap( const SalTwoRect& rPosAry,
                                         BitmapBuffer* pBuffer );
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,


More information about the Libreoffice-commits mailing list