@@ -26,9 +26,7 @@ using namespace ::com::sun::star; namespace chart { -AreaChartType::AreaChartType( - const uno::Reference< uno::XComponentContext > & xContext ) : - ChartType( xContext ) +AreaChartType::AreaChartType() {} AreaChartType::AreaChartType( const AreaChartType & rOther ) : @@ -70,10 +68,10 @@ css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames( } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_AreaChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_AreaChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::AreaChartType(context)); + return cppu::acquire(new ::chart::AreaChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -27,7 +27,7 @@ namespace chart class AreaChartType final : public ChartType { public: - explicit AreaChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit AreaChartType(); virtual ~AreaChartType() override; virtual OUString SAL_CALL @@ -26,9 +26,7 @@ using namespace ::com::sun::star; namespace chart { -BarChartType::BarChartType( - const uno::Reference< uno::XComponentContext > & xContext ) : - ChartType( xContext ) +BarChartType::BarChartType() {} BarChartType::BarChartType( const BarChartType & rOther ) : @@ -80,10 +78,10 @@ css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_BarChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_BarChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::BarChartType(context)); + return cppu::acquire(new ::chart::BarChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -27,7 +27,7 @@ namespace chart class BarChartType final : public ChartType { public: - explicit BarChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit BarChartType(); virtual ~BarChartType() override; virtual OUString SAL_CALL @@ -93,9 +93,7 @@ struct StaticBubbleChartTypeInfo : public rtl::StaticAggregate< uno::Reference< namespace chart { -BubbleChartType::BubbleChartType( - const uno::Reference< uno::XComponentContext > & xContext ) - : ChartType( xContext ) +BubbleChartType::BubbleChartType() { } @@ -215,10 +213,10 @@ css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceName } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_BubbleChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_BubbleChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::BubbleChartType(context)); + return cppu::acquire(new ::chart::BubbleChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -28,8 +28,7 @@ namespace chart class BubbleChartType final : public ChartType { public: - explicit BubbleChartType( - css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit BubbleChartType(); virtual ~BubbleChartType() override; virtual OUString SAL_CALL @@ -142,9 +142,7 @@ struct StaticCandleStickChartTypeInfo : public rtl::StaticAggregate< uno::Refere namespace chart { -CandleStickChartType::CandleStickChartType( - const uno::Reference< uno::XComponentContext > & xContext ) : - ChartType( xContext ) +CandleStickChartType::CandleStickChartType() { Reference< beans::XPropertySet > xWhiteDayProps( new ::chart::StockBar( true )); Reference< beans::XPropertySet > xBlackDayProps( new ::chart::StockBar( false )); @@ -331,10 +329,10 @@ css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServic } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_CandleStickChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_CandleStickChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::CandleStickChartType(context)); + return cppu::acquire(new ::chart::CandleStickChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -27,8 +27,7 @@ namespace chart class CandleStickChartType final : public ChartType { public: - explicit CandleStickChartType( - css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit CandleStickChartType(); virtual ~CandleStickChartType() override; virtual OUString SAL_CALL @@ -37,11 +37,9 @@ using ::com::sun::star::uno::Reference; namespace chart { -ChartType::ChartType( - const Reference< uno::XComponentContext > & xContext ) : +ChartType::ChartType() : ::property::OPropertySet( m_aMutex ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()), - m_xContext( xContext ), m_bNotifyChanges( true ) {} @@ -50,7 +48,6 @@ ChartType::ChartType( const ChartType & rOther ) : impl::ChartType_Base(), ::property::OPropertySet( rOther, m_aMutex ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()), - m_xContext( rOther.m_xContext ), m_bNotifyChanges( true ) { { @@ -53,7 +53,7 @@ class ChartType : public ::property::OPropertySet { public: - explicit ChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit ChartType(); virtual ~ChartType() override; /// merge XInterface implementations @@ -123,9 +123,6 @@ private: const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ); private: - css::uno::Reference< css::uno::XComponentContext > - const m_xContext; - typedef std::vector< css::uno::Reference< css::chart2::XDataSeries > > tDataSeriesContainerType; @@ -122,9 +122,7 @@ struct StaticColumnChartTypeInfo : public rtl::StaticAggregate< uno::Reference< namespace chart { -ColumnChartType::ColumnChartType( - const uno::Reference< uno::XComponentContext > & xContext ) : - ChartType( xContext ) +ColumnChartType::ColumnChartType() {} ColumnChartType::ColumnChartType( const ColumnChartType & rOther ) : @@ -197,10 +195,10 @@ css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceName } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_ColumnChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_ColumnChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::ColumnChartType(context)); + return cppu::acquire(new ::chart::ColumnChartType()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -27,7 +27,7 @@ namespace chart class ColumnChartType final : public ChartType { public: - explicit ColumnChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit ColumnChartType(); virtual ~ColumnChartType() override; virtual OUString SAL_CALL @@ -34,9 +34,7 @@ using ::com::sun::star::uno::Sequence; namespace chart { -FilledNetChartType::FilledNetChartType( - const uno::Reference< uno::XComponentContext > & xContext ) : - NetChartType_Base( xContext ) +FilledNetChartType::FilledNetChartType() {} FilledNetChartType::FilledNetChartType( const FilledNetChartType & rOther ) : @@ -80,10 +78,10 @@ css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceN } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_FilledNetChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_FilledNetChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::FilledNetChartType(context)); + return cppu::acquire(new ::chart::FilledNetChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -27,7 +27,7 @@ namespace chart class FilledNetChartType final : public NetChartType_Base { public: - explicit FilledNetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit FilledNetChartType(); virtual ~FilledNetChartType() override; virtual OUString SAL_CALL @@ -89,8 +89,7 @@ struct ChartTypeInfo : public rtl::StaticAggregate<uno::Reference<beans::XProper } -GL3DBarChartType::GL3DBarChartType( const uno::Reference<uno::XComponentContext>& xContext ) : - ChartType(xContext) +GL3DBarChartType::GL3DBarChartType() { } @@ -157,10 +156,10 @@ css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartType::getPropertyS } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_GL3DBarChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_GL3DBarChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::GL3DBarChartType(context)); + return cppu::acquire(new ::chart::GL3DBarChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -21,7 +21,7 @@ namespace chart { class GL3DBarChartType final : public ChartType { public: - explicit GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext ); + explicit GL3DBarChartType(); virtual ~GL3DBarChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL @@ -151,8 +151,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref try { - rtl::Reference<GL3DBarChartType> chart( - new GL3DBarChartType(GetComponentContext())); + rtl::Reference<GL3DBarChartType> chart(new GL3DBarChartType()); bool bVal = false; getFastPropertyValue(PROP_GL3DCHARTTYPE_ROUNDED_EDGE) >>= bVal; chart->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::Any(bVal)); @@ -131,9 +131,7 @@ struct StaticLineChartTypeInfo : public rtl::StaticAggregate< uno::Reference< be namespace chart { -LineChartType::LineChartType( - const uno::Reference< uno::XComponentContext > & xContext ) : - ChartType( xContext ) +LineChartType::LineChartType() { } @@ -199,10 +197,10 @@ css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames( } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_LineChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_LineChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::LineChartType(context)); + return cppu::acquire(new ::chart::LineChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -28,7 +28,7 @@ namespace chart class LineChartType final : public ChartType { public: - explicit LineChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit LineChartType(); virtual ~LineChartType() override; virtual OUString SAL_CALL @@ -38,9 +38,7 @@ using ::com::sun::star::uno::Reference; namespace chart { -NetChartType_Base::NetChartType_Base( - const uno::Reference< uno::XComponentContext > & xContext ) : - ChartType( xContext ) +NetChartType_Base::NetChartType_Base() {} NetChartType_Base::NetChartType_Base( const NetChartType_Base & rOther ) : @@ -134,9 +132,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropert return *StaticNetChartTypeInfo::get(); } -NetChartType::NetChartType( - const uno::Reference< uno::XComponentContext > & xContext ) : - NetChartType_Base( xContext ) +NetChartType::NetChartType() {} NetChartType::NetChartType( const NetChartType & rOther ) : @@ -180,10 +176,10 @@ css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_NetChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_NetChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::NetChartType(context)); + return cppu::acquire(new ::chart::NetChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -27,7 +27,7 @@ namespace chart class NetChartType_Base : public ChartType { public: - explicit NetChartType_Base( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit NetChartType_Base(); virtual ~NetChartType_Base() override; protected: @@ -50,7 +50,7 @@ protected: class NetChartType final : public NetChartType_Base { public: - explicit NetChartType( css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit NetChartType(); virtual ~NetChartType() override; virtual OUString SAL_CALL @@ -121,9 +121,7 @@ struct StaticPieChartTypeInfo : public rtl::StaticAggregate< uno::Reference< bea namespace chart { -PieChartType::PieChartType( - const uno::Reference< uno::XComponentContext > & xContext) : - ChartType( xContext ) +PieChartType::PieChartType() { } @@ -234,10 +232,10 @@ css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_PieChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_PieChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::PieChartType(context)); + return cppu::acquire(new ::chart::PieChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -27,8 +27,7 @@ namespace chart class PieChartType final: public ChartType { public: - explicit PieChartType( - css::uno::Reference< css::uno::XComponentContext > const & xContext ); + explicit PieChartType(); virtual ~PieChartType() override; virtual OUString SAL_CALL @@ -137,11 +137,9 @@ namespace chart { ScatterChartType::ScatterChartType( - const uno::Reference< uno::XComponentContext > & xContext, chart2::CurveStyle eCurveStyle /* chart2::CurveStyle_LINES */ , sal_Int32 nResolution /* = 20 */, - sal_Int32 nOrder /* = 3 */ ) : - ChartType( xContext ) + sal_Int32 nOrder /* = 3 */ ) { if( eCurveStyle != chart2::CurveStyle_LINES ) setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_CURVE_STYLE, @@ -256,10 +254,10 @@ css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNam } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_ScatterChartType_get_implementation(css::uno::XComponentContext *context, +com_sun_star_comp_chart_ScatterChartType_get_implementation(css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new ::chart::ScatterChartType(context)); + return cppu::acquire(new ::chart::ScatterChartType); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @@ -29,7 +29,6 @@ class ScatterChartType final : public ChartType { public: ScatterChartType( - css::uno::Reference< css::uno::XComponentContext > const & xContext, css::chart2::CurveStyle eCurveStyle = css::chart2::CurveStyle_LINES, sal_Int32 nResolution = 20, sal_Int32 nOrder = 3 ); |