chart2/source/inc/DataInterpreter.hxx | 2
chart2/source/model/template/ChartTypeTemplate.cxx | 2
compilerplugins/clang/unnecessaryvirtual-dead.results | 6 -
compilerplugins/clang/unnecessaryvirtual.results | 58 ++++++++----------
4 files changed, 31 insertions(+), 37 deletions(-)
New commits:
commit 7e5036bb5790e1ee753d890e8b270eaceee74ce7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Feb 17 11:07:22 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 17 13:36:48 2022 +0100
loplugin:unnecessaryvirtual
Change-Id: I44c70bd930380d0e3f76524f37e6276cf4faeccc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130061
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/inc/DataInterpreter.hxx
b/chart2/source/inc/DataInterpreter.hxx
index 5c426bab7eee..cdb0db5cc909 100644
--- a/chart2/source/inc/DataInterpreter.hxx
+++ b/chart2/source/inc/DataInterpreter.hxx
@@ -133,7 +133,7 @@ public:
interpretDataSource()( <code>xSource</code> ),
the result of this method should be <code>xSource</code>.</p>
*/
- virtual rtl::Reference< ::chart::DataSource > mergeInterpretedData(
+ static rtl::Reference< ::chart::DataSource > mergeInterpretedData(
const InterpretedData& aInterpretedData );
/** Get chart information that is specific to a particular chart
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 1398785066fe..ba8d28c781bb 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -203,7 +203,7 @@ void ChartTypeTemplate::changeDiagram( const
rtl::Reference< Diagram >& xDiagram
}
else
{
- rtl::Reference< DataSource > xSource(
xInterpreter->mergeInterpretedData( aData ));
+ rtl::Reference< DataSource > xSource =
DataInterpreter::mergeInterpretedData( aData );
// todo: get a "range-union" from the data provider by calling
// OUString aRange = getRangeRepresentationByData( xSource );
// xSource.set( getDataByRangeRepresentation( aRange, aParam ));
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results
b/compilerplugins/clang/unnecessaryvirtual-dead.results
index b09f822608b3..db84d04128cb 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -1,4 +1,4 @@
-basic/source/comp/codegen.cxx:478
+basic/source/comp/codegen.cxx:477
void (anonymous namespace)::OffSetAccumulator::start(const unsigned char
*,)
canvas/inc/base/bufferedgraphicdevicebase.hxx:105
void canvas::BufferedGraphicDeviceBase::destroyBuffers()
@@ -14,9 +14,9 @@ slideshow/source/engine/animationfactory.cxx:616
void slideshow::internal::(anonymous
namespace)::GenericAnimation::prefetch()
vcl/inc/salframe.hxx:147
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salinst.hxx:201
+vcl/inc/salinst.hxx:204
void SalInstance::releaseMainThread()
-vcl/inc/salinst.hxx:210
+vcl/inc/salinst.hxx:213
void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
vcl/inc/salobj.hxx:49
void SalObject::Enable(_Bool,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.results
b/compilerplugins/clang/unnecessaryvirtual.results
index 3d939a4764c4..a108383cd1a4 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -1,22 +1,22 @@
-basic/source/comp/codegen.cxx:478
+basic/source/comp/codegen.cxx:477
void (anonymous namespace)::OffSetAccumulator::start(const unsigned char
*,)
-basic/source/comp/codegen.cxx:479
+basic/source/comp/codegen.cxx:478
void (anonymous namespace)::OffSetAccumulator::processOpCode0(enum
SbiOpcode,)
-basic/source/comp/codegen.cxx:480
+basic/source/comp/codegen.cxx:479
void (anonymous namespace)::OffSetAccumulator::processOpCode1(enum
SbiOpcode,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:481
+basic/source/comp/codegen.cxx:480
void (anonymous namespace)::OffSetAccumulator::processOpCode2(enum
SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:490
+basic/source/comp/codegen.cxx:489
_Bool (anonymous namespace)::OffSetAccumulator::processParams()
-basic/source/comp/codegen.cxx:501
+basic/source/comp/codegen.cxx:500
void (anonymous namespace)::BufferTransformer::start(const unsigned char
*,)
-basic/source/comp/codegen.cxx:502
+basic/source/comp/codegen.cxx:501
void (anonymous namespace)::BufferTransformer::processOpCode0(enum
SbiOpcode,)
-basic/source/comp/codegen.cxx:506
+basic/source/comp/codegen.cxx:505
void (anonymous namespace)::BufferTransformer::processOpCode1(enum
SbiOpcode,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:531
+basic/source/comp/codegen.cxx:530
void (anonymous namespace)::BufferTransformer::processOpCode2(enum
SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:540
+basic/source/comp/codegen.cxx:539
_Bool (anonymous namespace)::BufferTransformer::processParams()
canvas/inc/base/basemutexhelper.hxx:58
void canvas::BaseMutexHelper::disposing()
@@ -212,8 +212,8 @@ canvas/inc/rendering/irendermodule.hxx:59
void canvas::IRenderModule::~IRenderModule()
canvas/inc/rendering/isurface.hxx:34
void canvas::ISurface::~ISurface()
-chart2/source/inc/ModifyListenerCallBack.hxx:40
- void chart::ModifyListenerCallBack::~ModifyListenerCallBack()
+chart2/source/inc/DataInterpreter.hxx:136
+ class rtl::Reference<class chart::DataSource>
chart::DataInterpreter::mergeInterpretedData(const struct
chart::InterpretedData &,)
chart2/source/inc/WeakListenerAdapter.hxx:56
void chart::WeakListenerAdapter::disposing(const struct
com::sun::star::lang::EventObject &,)
extensions/source/dbpilots/unoautopilot.hxx:80
@@ -260,10 +260,6 @@ include/comphelper/unique_disposing_ptr.hxx:169
void
comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-0-0 *,)
include/comphelper/weakeventlistener.hxx:120
void comphelper::OWeakListenerAdapter::disposing(const struct
com::sun::star::lang::EventObject &,)
-include/drawinglayer/primitive2d/baseprimitive2d.hxx:156
- class drawinglayer::primitive2d::Primitive2DContainer
drawinglayer::primitive2d::BasePrimitive2D::getDecomposition(const class
com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,)
-include/drawinglayer/primitive2d/baseprimitive2d.hxx:162
- struct com::sun::star::geometry::RealRectangle2D
drawinglayer::primitive2d::BasePrimitive2D::getRange(const class
com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,)
include/svl/svdde.hxx:236
class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
include/svl/svdde.hxx:237
@@ -276,8 +272,6 @@ include/svl/svdde.hxx:243
_Bool DdeTopic::StartAdviseLoop()
include/svl/svdde.hxx:300
void DdeService::~DdeService()
-include/svtools/acceleratorexecute.hxx:115
- void svt::AcceleratorExecute::~AcceleratorExecute()
include/vbahelper/vbacollectionimpl.hxx:289
int ScVbaCollectionBase::getCount()
include/vbahelper/vbacollectionimpl.hxx:294
@@ -404,37 +398,37 @@ sw/inc/flypos.hxx:37
void SwPosFlyFrame::~SwPosFlyFrame()
toolkit/inc/controls/geometrycontrolmodel.hxx:185
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
-vcl/inc/jsdialog/jsdialogbuilder.hxx:151
+vcl/inc/jsdialog/jsdialogbuilder.hxx:158
void JSDialogSender::sendFullUpdate(_Bool,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:154
+vcl/inc/jsdialog/jsdialogbuilder.hxx:161
void JSDialogSender::sendAction(class VclPtr<class vcl::Window>,class
std::unique_ptr<class std::unordered_map<class std::basic_string<char>, class
rtl::OUString> >,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:155
+vcl/inc/jsdialog/jsdialogbuilder.hxx:162
void JSDialogSender::sendPopup(class VclPtr<class vcl::Window>,class
rtl::OUString,class rtl::OUString,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:156
+vcl/inc/jsdialog/jsdialogbuilder.hxx:163
void JSDialogSender::sendClosePopup(unsigned int,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:341
- void JSWidget::show()
vcl/inc/jsdialog/jsdialogbuilder.hxx:353
+ void JSWidget::show()
+vcl/inc/jsdialog/jsdialogbuilder.hxx:365
void JSWidget::hide()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:366
+vcl/inc/jsdialog/jsdialogbuilder.hxx:378
void JSWidget::set_sensitive(_Bool,)
-vcl/inc/jsdialog/jsdialogbuilder.hxx:374
+vcl/inc/jsdialog/jsdialogbuilder.hxx:386
class com::sun::star::uno::Reference<class
com::sun::star::datatransfer::dnd::XDropTarget> JSWidget::get_drop_target()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:382
+vcl/inc/jsdialog/jsdialogbuilder.hxx:394
void JSWidget::freeze()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:388
+vcl/inc/jsdialog/jsdialogbuilder.hxx:400
void JSWidget::thaw()
-vcl/inc/jsdialog/jsdialogbuilder.hxx:493
+vcl/inc/jsdialog/jsdialogbuilder.hxx:505
void JSComboBox::set_entry_text_without_notify(const class rtl::OUString
&,)
vcl/inc/salframe.hxx:147
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
vcl/inc/salframe.hxx:196
void SalFrame::Flush(const class tools::Rectangle &,)
-vcl/inc/salinst.hxx:94
+vcl/inc/salinst.hxx:95
_Bool SalInstance::SVMainHook(int *,)
-vcl/inc/salinst.hxx:201
+vcl/inc/salinst.hxx:204
void SalInstance::releaseMainThread()
-vcl/inc/salinst.hxx:210
+vcl/inc/salinst.hxx:213
void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,)
vcl/inc/salobj.hxx:49
void SalObject::Enable(_Bool,)
