diff options
39 files changed, 96 insertions, 116 deletions
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 3d32d23f81de..41fc20e8fa46 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -268,7 +268,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper //check whether the legend was hit but not selected (e.g. because it has no filling): if( bBackGroundHit || m_aSelectedOID.getObjectCID() == aDiagramCID ) { - OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(nullptr,nullptr) ) );//@todo read CID from model + OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(nullptr) ) );//@todo read CID from model SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID ); if( pLegend ) { diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 87fcd5693606..1d0bb7fce7d9 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -36,7 +36,7 @@ class DataSource : public css::chart2::data::XDataSink > { public: - explicit DataSource( const css::uno::Reference< css::uno::XComponentContext > & xContext ); + explicit DataSource(); explicit DataSource( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & rSequences ); diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index d68e17f18ba8..cad8ecd1a0be 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -68,7 +68,7 @@ class InternalDataProvider : public impl::InternalDataProvider_Base { public: - explicit InternalDataProvider(const css::uno::Reference< css::uno::XComponentContext > & _xContext); + explicit InternalDataProvider(); // #i120559# allow handing over a default for data orientation // (DataInColumns) that will be used when no data is available diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 27107c42f08b..c1209851f262 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -144,13 +144,10 @@ public: static OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex , sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex ); - static OUString createParticleForLegend( - const css::uno::Reference< css::chart2::XLegend >& xLegend - , ChartModel& rModel ); + static OUString createParticleForLegend( ChartModel& rModel ); static OUString createParticleForLegend( - const css::uno::Reference< css::chart2::XLegend >& xLegend - , const css::uno::Reference< css::frame::XModel >& xChartModel ); + const css::uno::Reference< css::frame::XModel >& xChartModel ); static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle ); static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ); diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index c0dc7422a03f..6107178d8e45 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -42,10 +42,7 @@ private: VclPtr<OutputDevice> m_pRefDevice; public: - DrawModelWrapper() = delete; - - SAL_DLLPRIVATE DrawModelWrapper( - const css::uno::Reference<css::uno::XComponentContext>& xContext ); + SAL_DLLPRIVATE DrawModelWrapper(); SAL_DLLPRIVATE virtual ~DrawModelWrapper() override; css::uno::Reference< css::lang::XMultiServiceFactory > getShapeFactory(); diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index d80334a9abb7..0f78c8b16776 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -336,7 +336,7 @@ void lcl_CloneSubGrids( namespace chart { -Axis::Axis( Reference< uno::XComponentContext > const & /* xContext */ ) : +Axis::Axis() : ::property::OPropertySet( m_aMutex ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()), m_aScaleData( AxisHelper::createDefaultScale() ), @@ -641,10 +641,10 @@ css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_comp_chart2_Axis_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart2_Axis_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::Axis(context)); + return cppu::acquire(new ::chart::Axis); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 8292a7c5019b..406871531471 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -54,7 +54,7 @@ class Axis : public ::property::OPropertySet { public: - explicit Axis( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit Axis(); virtual ~Axis() override; /// XServiceInfo declarations diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index aa45934c21d5..f5d9c854b94f 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -127,7 +127,7 @@ BaseCoordinateSystem::BaseCoordinateSystem( for( sal_Int32 nN=0; nN<m_nDimensionCount; nN++ ) { m_aAllAxis[nN].resize( 1 ); - Reference< chart2::XAxis > xAxis( new Axis(m_xContext) ); + Reference< chart2::XAxis > xAxis( new Axis ); m_aAllAxis[nN][0] = xAxis; ModifyListenerHelper::addListenerToAllElements( m_aAllAxis[nN], m_xModifyEventForwarder ); diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 846223462a01..5c8b481510a7 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -93,8 +93,7 @@ struct StaticFormattedStringInfo : public rtl::StaticAggregate< uno::Reference< namespace chart { -FormattedString::FormattedString( - uno::Reference< uno::XComponentContext > const & /* xContext */ ) : +FormattedString::FormattedString() : ::property::OPropertySet( m_aMutex ), m_aString(), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) @@ -235,10 +234,10 @@ css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceName } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_comp_chart_FormattedString_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_FormattedString_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::FormattedString(context)); + return cppu::acquire(new ::chart::FormattedString); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 2a1ea0cf9cc2..93a4074105e6 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -49,8 +49,7 @@ class FormattedString : public ::property::OPropertySet { public: - explicit FormattedString( css::uno::Reference< - css::uno::XComponentContext > const & xContext ); + explicit FormattedString(); virtual ~FormattedString() override; /// declare XServiceInfo methods diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 6d17c39c601c..3f27b0d1b0fd 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -125,12 +125,6 @@ struct StaticGridInfo : public rtl::StaticAggregate< uno::Reference< beans::XPro namespace chart { -GridProperties::GridProperties( Reference< uno::XComponentContext > const & /* xContext */ ) : - ::property::OPropertySet( m_aMutex ), - m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) -{ -} - GridProperties::GridProperties() : ::property::OPropertySet( m_aMutex ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) @@ -246,10 +240,10 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridProperties, GridProperties_Base, ::propert } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_comp_chart2_GridProperties_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart2_GridProperties_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::GridProperties(context)); + return cppu::acquire(new ::chart::GridProperties); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 36dd9138903d..6d91af9a0783 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -50,7 +50,6 @@ class GridProperties : public ::property::OPropertySet { public: - explicit GridProperties( css::uno::Reference< css::uno::XComponentContext > const & xContext ); explicit GridProperties(); virtual ~GridProperties() override; diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index e7b80dd4fd9d..a26334d77ebe 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -181,7 +181,7 @@ struct StaticLegendInfo : public rtl::StaticAggregate< uno::Reference< beans::XP namespace chart { -Legend::Legend( Reference< uno::XComponentContext > const & /* xContext */ ) : +Legend::Legend() : ::property::OPropertySet( m_aMutex ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) { @@ -303,10 +303,10 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Legend, Legend_Base, ::property::OPropertySet } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_comp_chart2_Legend_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart2_Legend_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::Legend(context)); + return cppu::acquire(new ::chart::Legend); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 044657195d00..39aef0cb0e3f 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -51,7 +51,7 @@ class Legend : public ::property::OPropertySet { public: - explicit Legend( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit Legend(); virtual ~Legend() override; /// XServiceInfo declarations diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 92fc6a36fa80..d1f052418173 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -240,7 +240,7 @@ struct StaticTitleInfo : public rtl::StaticAggregate< uno::Reference< beans::XPr namespace chart { -Title::Title( uno::Reference< uno::XComponentContext > const & /* xContext */ ) : +Title::Title() : ::property::OPropertySet( m_aMutex ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) {} @@ -391,10 +391,10 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Title, Title_Base, ::property::OPropertySet ) } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_comp_chart2_Title_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart2_Title_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::Title(context)); + return cppu::acquire(new ::chart::Title); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 95545cd8f8d7..c8ea09c4ca1c 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -49,7 +49,7 @@ class Title : public ::property::OPropertySet { public: - explicit Title( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit Title(); virtual ~Title() override; /// XServiceInfo declarations diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index dc1122e6eca2..6c24ba6e05d9 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -31,8 +31,7 @@ using namespace ::com::sun::star; namespace chart { -DataSource::DataSource( - const Reference< uno::XComponentContext > & /*xContext*/ ) +DataSource::DataSource() {} DataSource::DataSource( @@ -73,10 +72,10 @@ css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_comp_chart_DataSource_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_DataSource_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::DataSource(context)); + return cppu::acquire(new ::chart::DataSource); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index f936cd664a92..439762471e26 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -303,7 +303,7 @@ private: } // anonymous namespace -InternalDataProvider::InternalDataProvider( const Reference< uno::XComponentContext > & /*_xContext*/) +InternalDataProvider::InternalDataProvider() : m_bDataInColumns( true ) {} @@ -1520,10 +1520,10 @@ css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServic } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_comp_chart_InternalDataProvider_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_InternalDataProvider_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::InternalDataProvider(context)); + return cppu::acquire(new ::chart::InternalDataProvider); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 5a5688ec7fdd..f81722c5009d 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -357,7 +357,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( Reference< XLegend > xLegend( xObject, uno::UNO_QUERY ); if( xLegend.is() ) { - return createClassifiedIdentifierForParticle( createParticleForLegend( xLegend, rModel ) ); + return createClassifiedIdentifierForParticle( createParticleForLegend( rModel ) ); } //diagram @@ -439,7 +439,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( Reference< XLegend > xLegend( xObject, uno::UNO_QUERY ); if( xLegend.is() ) { - return createClassifiedIdentifierForParticle( createParticleForLegend( xLegend, xChartModel ) ); + return createClassifiedIdentifierForParticle( createParticleForLegend( xChartModel ) ); } //diagram @@ -642,9 +642,7 @@ OUString ObjectIdentifier::createParticleForSeries( return aRet.makeStringAndClear(); } -OUString ObjectIdentifier::createParticleForLegend( - const Reference< XLegend >& /*xLegend*/ - , ChartModel& rModel ) +OUString ObjectIdentifier::createParticleForLegend( ChartModel& rModel ) { OUStringBuffer aRet; @@ -660,8 +658,7 @@ OUString ObjectIdentifier::createParticleForLegend( } OUString ObjectIdentifier::createParticleForLegend( - const Reference< XLegend >& /*xLegend*/ - , const Reference< frame::XModel >& xChartModel ) + const Reference< frame::XModel >& xChartModel ) { OUStringBuffer aRet; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index d232d78afbac..9321ec109678 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -82,7 +82,7 @@ void VCartesianCoordinateSystem::createGridShapes() aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos ); aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory - , this->createCIDForGrid( xAxis,nDimensionIndex,nAxisIndex ) ); + , this->createCIDForGrid( nDimensionIndex,nAxisIndex ) ); if(nDimensionCount==2) aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen ); aGrid.setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); @@ -177,7 +177,7 @@ void VCartesianCoordinateSystem::initVAxisInList() sal_Int32 nAxisIndex = aIt->first.second; pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) ); pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory - , this->createCIDForAxis( getAxisByDimension( nDimensionIndex, nAxisIndex ), nDimensionIndex, nAxisIndex ) ); + , this->createCIDForAxis( nDimensionIndex, nAxisIndex ) ); if(nDimensionCount==2) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 318561e5267b..bf409b8341b1 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -312,12 +312,12 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens return aRet; } -OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) +OUString VCoordinateSystem::createCIDForAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aAxisParticle ); } -OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) +OUString VCoordinateSystem::createCIDForGrid( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aGridParticle ); diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 9c8ada2ae0ee..732157432d21 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -118,7 +118,7 @@ void VPolarCoordinateSystem::initVAxisInList() sal_Int32 nAxisIndex = aIt->first.second; pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) ); pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory - , this->createCIDForAxis( getAxisByDimension( nDimensionIndex, nAxisIndex ), nDimensionIndex, nAxisIndex ) ); + , this->createCIDForAxis( nDimensionIndex, nAxisIndex ) ); VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis ); if( pVPolarAxis ) pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); @@ -176,7 +176,7 @@ void VPolarCoordinateSystem::createGridShapes() VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis )); aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory - , this->createCIDForGrid( xAxis, nDimensionIndex, nAxisIndex ) ); + , this->createCIDForGrid( nDimensionIndex, nAxisIndex ) ); if(nDimensionCount==2) aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen ); aGrid.setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY ); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 9ce1c9a57f58..106eb1ef2cb7 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -141,12 +141,8 @@ protected: //methods VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - OUString createCIDForAxis( const css::uno::Reference< - css::chart2::XAxis >& xAxis - , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - OUString createCIDForGrid( const css::uno::Reference< - css::chart2::XAxis >& xAxis - , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); + OUString createCIDForAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); + OUString createCIDForGrid( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); sal_Int32 getNumberFormatKeyForAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 965157e13fa9..111fe2ba9281 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1212,7 +1212,7 @@ void ChartView::init() if( !m_pDrawModelWrapper.get() ) { SolarMutexGuard aSolarGuard; - m_pDrawModelWrapper = std::make_shared< DrawModelWrapper >( m_xCC ); + m_pDrawModelWrapper = std::make_shared< DrawModelWrapper >(); m_xShapeFactory = m_pDrawModelWrapper->getShapeFactory(); m_xDrawPage = m_pDrawModelWrapper->getMainDrawPage(); StartListening( m_pDrawModelWrapper->getSdrModel() ); diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 580a762ecb2a..613c4b5ac246 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; namespace chart { -DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) +DrawModelWrapper::DrawModelWrapper() : SdrModel( SvtPathOptions().GetPalettePath(), nullptr, nullptr, false ) , m_pChartItemPool(nullptr) , m_xMainDrawPage(nullptr) diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 1244fcf66796..fa6b491027b0 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -879,7 +879,7 @@ void VLegend::createShapes( { //create shape and add to page AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory); - OUString aLegendParticle( ObjectIdentifier::createParticleForLegend( m_xLegend, mrModel ) ); + OUString aLegendParticle( ObjectIdentifier::createParticleForLegend( mrModel ) ); m_xShape.set( pShapeFactory->createGroup2D( m_xTarget, ObjectIdentifier::createClassifiedIdentifierForParticle( aLegendParticle )), uno::UNO_QUERY); diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/checkunusedparams.cxx index 4dc7ac0bba7d..d1ff8998a083 100644 --- a/compilerplugins/clang/checkunusedparams.cxx +++ b/compilerplugins/clang/checkunusedparams.cxx @@ -58,6 +58,9 @@ void CheckUnusedParams::run() // leave this alone for now if (loplugin::hasPathnamePrefix(fn, SRCDIR "/libreofficekit/")) return; + // this has a certan pattern to it's code which appears to include lots of unused params + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/xmloff/")) + return; m_phase = PluginPhase::FindAddressOf; TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); @@ -90,6 +93,12 @@ static int noFieldsInRecord(RecordType const * recordType) { static bool startswith(const std::string& rStr, const char* pSubStr) { return rStr.compare(0, strlen(pSubStr), pSubStr) == 0; } +static bool endswith(const std::string& rStr, const char* pSubStr) { + auto len = strlen(pSubStr); + if (len > rStr.size()) + return false; + return rStr.compare(rStr.size() - len, rStr.size(), pSubStr) == 0; +} bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { if (m_phase != PluginPhase::Warning) @@ -296,26 +305,31 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { // bool marker parameter if (fqn == "SvxIconReplacementDialog::SvxIconReplacementDialog") return true; - // callback - if (fqn == "basctl::SIDEModel_createInstance") + // used as pointer to fn + if (endswith(fqn, "_createInstance")) return true; // callback if (startswith(fqn, "SbRtl_")) return true; // takes pointer to fn if (fqn == "migration::BasicMigration_create" || fqn == "migration::WordbookMigration_create" - || fqn == "FontIdentificator_createInstance" || fqn == "vcl::DragSource_createInstance" - || fqn == "vcl::DropTarget_createInstance" || fqn == "vcl::FontIdentificator_createInstance" - || fqn == "drawinglayer::unorenderer::XPrimitive2DRenderer_createInstance") + || fqn == "comp_CBlankNode::_create" || fqn == "comp_CURI::_create" + || fqn == "comp_CLiteral::_create" || fqn == "CDocumentBuilder::_getInstance" + || fqn == "DOM::CDocumentBuilder::_getInstance" + || fqn == "xml_security::serial_number_adapter::create" + || fqn == "desktop::splash::create" || fqn == "ScannerManager_CreateInstance" + || fqn == "formula::FormulaOpCodeMapperObj::create") return true; // TODO if (fqn == "FontSubsetInfo::CreateFontSubsetFromType1") return true; // used in template magic - if (fqn == "MtfRenderer::MtfRenderer") + if (fqn == "MtfRenderer::MtfRenderer" || fqn == "shell::sessioninstall::SyncDbusSessionHelper::SyncDbusSessionHelper" + || fqn == "dp_gui::LicenseDialog::LicenseDialog") return true; // FIXME - if (fqn == "GtkSalDisplay::filterGdkEvent") + if (fqn == "GtkSalDisplay::filterGdkEvent" || fqn == "SvXMLEmbeddedObjectHelper::ImplReadObject" + || "chart::CachedDataSequence::CachedDataSequence") return true; // ignore the LINK macros from include/tools/link.hxx @@ -324,8 +338,6 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { for( auto it = decl->param_begin(); it != decl->param_end(); ++it) { auto param = *it; - if (fqn.find("fillShapeProperties") != std::string::npos) - param->dump(); if (param->hasAttr<UnusedAttr>()) continue; if (!param->getName().empty()) @@ -355,14 +367,18 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { continue; } report( DiagnosticsEngine::Warning, - "unused param %0 in %1", decl->getLocation()) - << decl->getSourceRange() + "unused param %0 in %1", param->getLocStart()) + << param->getSourceRange() << param->getName() << fqn; if (canon != decl) + { + unsigned idx = param->getFunctionScopeIndex(); + const ParmVarDecl* pOther = canon->getParamDecl(idx); report( DiagnosticsEngine::Note, "declaration is here", - canon->getLocation()) - << canon->getSourceRange(); + pOther->getLocStart()) + << pOther->getSourceRange(); + } } return true; } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index e770bad31ef9..73117ac8ed82 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -280,8 +280,7 @@ void ExtensionManager::addExtensionsToMap( */ std::list<Reference<css::deployment::XPackage> > ExtensionManager::getExtensionsWithSameId( - OUString const & identifier, OUString const & fileName, - Reference< ucb::XCommandEnvironment> const & /*xCmdEnv*/) + OUString const & identifier, OUString const & fileName) { std::list<Reference<css::deployment::XPackage> > extensionList; @@ -309,13 +308,12 @@ uno::Sequence<Reference<css::deployment::XPackage> > ExtensionManager::getExtensionsWithSameIdentifier( OUString const & identifier, OUString const & fileName, - Reference< ucb::XCommandEnvironment> const & xCmdEnv ) + Reference< ucb::XCommandEnvironment> const & /*xCmdEnv*/ ) { try { std::list<Reference<css::deployment::XPackage> > listExtensions = - getExtensionsWithSameId( - identifier, fileName, xCmdEnv); + getExtensionsWithSameId(identifier, fileName); bool bHasExtension = false; //throw an IllegalArgumentException if there is no extension at all. diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index a31172e55b83..e797fb1855e9 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -178,9 +178,7 @@ private: std::list<css::uno::Reference<css::deployment::XPackage> > getExtensionsWithSameId(OUString const & identifier, - OUString const & fileName, - css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv = - css::uno::Reference< css::ucb::XCommandEnvironment>()); + OUString const & fileName); css::uno::Reference<css::deployment::XPackage> backupExtension( OUString const & identifier, OUString const & fileName, diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index a8c1b862fd6d..01c228381295 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -36,9 +36,7 @@ using namespace ucb_cmdenv; // UcbCommandEnvironment Implementation. -UcbCommandEnvironment::UcbCommandEnvironment( - const uno::Reference< lang::XMultiServiceFactory >& /*xSMgr*/ ) -//: m_xSMgr( xSMgr ) +UcbCommandEnvironment::UcbCommandEnvironment() { } @@ -129,10 +127,10 @@ UcbCommandEnvironment::getProgressHandler() /// @throws uno::Exception static uno::Reference< uno::XInterface > SAL_CALL UcbCommandEnvironment_CreateInstance( - const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) + const uno::Reference< lang::XMultiServiceFactory> & /*rSMgr*/ ) { lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >( - new UcbCommandEnvironment( rSMgr ) ); + new UcbCommandEnvironment ); return uno::Reference< uno::XInterface >::query( pX ); } diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx index 68dd3e4708a8..20a97d78a20d 100644 --- a/ucb/source/core/cmdenv.hxx +++ b/ucb/source/core/cmdenv.hxx @@ -38,7 +38,7 @@ class UcbCommandEnvironment : css::uno::Reference< css::ucb::XProgressHandler > m_xPH; public: - explicit UcbCommandEnvironment( const css::uno::Reference< css::lang::XMultiServiceFactory >& rXSMgr ); + explicit UcbCommandEnvironment(); virtual ~UcbCommandEnvironment() override; // XInitialization diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index b6cb1d1224c8..91617819a10b 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -43,8 +43,7 @@ using namespace com::sun::star::uno; #define ATTR_DEFAULT ( PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID | PropertyAttribute::MAYBEDEFAULT ) -UcbPropertiesManager::UcbPropertiesManager( - const Reference< XMultiServiceFactory >& ) +UcbPropertiesManager::UcbPropertiesManager() : m_pProps({ { "Account", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, { "AutoUpdateInterval", -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT }, @@ -199,10 +198,10 @@ XSERVICEINFO_COMMOM_IMPL( UcbPropertiesManager, OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ) ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL -UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) +UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & /*rSMgr*/ ) { css::lang::XServiceInfo* pX = - static_cast<css::lang::XServiceInfo*>(new UcbPropertiesManager( rSMgr )); + static_cast<css::lang::XServiceInfo*>(new UcbPropertiesManager); return css::uno::Reference< css::uno::XInterface >::query( pX ); } css::uno::Sequence< OUString > diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index 4f789f999476..03c26f70b410 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -46,7 +46,7 @@ private: css::beans::Property& rProp ); public: - explicit UcbPropertiesManager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr ); + explicit UcbPropertiesManager(); virtual ~UcbPropertiesManager() override; // XServiceInfo diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 266ed9fcc4a5..a581f262a921 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -219,7 +219,7 @@ namespace ucb { namespace ucp { namespace ext // unreachable } - aRet <<= setPropertyValues( aProperties, i_rEvironment ); + aRet <<= setPropertyValues( aProperties ); } else if ( aCommand.Name == "getPropertySetInfo" ) { @@ -502,7 +502,7 @@ namespace ucb { namespace ucp { namespace ext } - Sequence< Any > Content::setPropertyValues( const Sequence< PropertyValue >& i_rValues, const Reference< XCommandEnvironment >& /* xEnv */) + Sequence< Any > Content::setPropertyValues( const Sequence< PropertyValue >& i_rValues) { ::osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index 89c8498d36d8..9055a6cd31fd 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -114,8 +114,7 @@ namespace ucb { namespace ucp { namespace ext css::uno::Sequence< css::uno::Any > setPropertyValues( - const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv + const css::uno::Sequence< css::beans::PropertyValue >& rValues ); static bool denotesRootContent( const OUString& i_rContentIdentifier ); diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 199d30a505c3..edc0f3d517b1 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -385,7 +385,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, ucbhelper::cancelCommandExecution(aRet,Environment); } - aRet <<= getPropertyValues(Properties,Environment); + aRet <<= getPropertyValues(Properties); } else if(aCommand.Name == "setPropertyValues") { @@ -738,8 +738,7 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand, Reference< XRow > FTPContent::getPropertyValues( - const Sequence< Property >& seqProp, - const Reference<XCommandEnvironment>& /*environment*/ + const Sequence< Property >& seqProp ) { rtl::Reference<ucbhelper::PropertyValueSet> xRow = diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index 74666dee9a0e..a44b73ffc392 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -130,9 +130,7 @@ private: css::uno::Reference<css::sdbc::XRow> getPropertyValues( const css::uno::Sequence< - css::beans::Property>& seqProp, - const css::uno::Reference< - css::ucb::XCommandEnvironment >& Environment + css::beans::Property>& seqProp ); css::uno::Sequence<css::uno::Any> diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 6cd665ccbd21..f3f04ae5f4ec 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -818,8 +818,7 @@ void Content::copyData( const uno::Reference< io::XInputStream >& xIn, xOut->closeOutput(); } -bool Content::feedSink( const uno::Reference< uno::XInterface >& xSink, - const uno::Reference< ucb::XCommandEnvironment >& /*xEnv*/ ) +bool Content::feedSink( const uno::Reference< uno::XInterface >& xSink ) { if ( !xSink.is() ) return false; @@ -894,7 +893,7 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, xEnv ); } - if ( !feedSink( rOpenCommand.Sink, xEnv ) ) + if ( !feedSink( rOpenCommand.Sink ) ) { // Note: rOpenCommand.Sink may contain an XStream // implementation. Support for this type of diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index 366eb721f0c7..9b2849e726e4 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -112,8 +112,7 @@ private: const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); - bool feedSink( const css::uno::Reference< css::uno::XInterface>& aSink, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); + bool feedSink( const css::uno::Reference< css::uno::XInterface>& aSink ); bool exchangeIdentity(const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId); |