diff options
36 files changed, 190 insertions, 243 deletions
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index b10d6110ae3b..3427a131fd5d 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 8f3b67a2d6b6..acb76ef106cb 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -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 diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index bfdf6ec47249..ab71366b4fec 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 8d04613ebc97..4d090c783ebb 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -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 diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 505e4bf60414..6d154031846b 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index 5fe58f3a15da..099cbcc82ce8 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -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 diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 619af6cb08f7..4c1e4783d68f 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index c153ad8a5892..b3f8d37ec306 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -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 diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 1e8e10ecd2d3..26f3b700af71 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -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 ) { { diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 57b12f67a5fd..7deffdd16c45 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -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; diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 668cdb9d2e0b..d969cbe86108 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 860c13ceb68a..d7b879479bf6 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -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 diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index dfb78ecf6a44..580e55351f1f 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 48109fb31bec..baa2b9efb91b 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -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 diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index e40e43477d05..3a96833138af 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 3161285df271..09bacd33c803 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -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 diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index 668472e54f04..99eb2860a097 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -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)); diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index b82dd9f8d6af..e91ec3bb7204 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 18269668db70..8d823e80030c 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -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 diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 78e14faad28d..869a2c3bf146 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 53e588751a99..3d3efed8cfe5 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -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 diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 96a6da5c64a0..a05103940355 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index ad2da929aa6f..897ec96950f1 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -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 diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 1663e419a2b7..749a3e049c9d 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -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: */ diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index db4899f5534b..cf61b9421537 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -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 ); diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 8a099b3ef0d5..219ae7515d56 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -1,3 +1,9 @@ +avmedia/source/vlc/wrapper/Types.hxx:38 + libvlc_event_t type int +avmedia/source/vlc/wrapper/Types.hxx:52 + libvlc_track_description_t i_id int +avmedia/source/vlc/wrapper/Types.hxx:54 + libvlc_track_description_t p_next struct libvlc_track_description_t * basegfx/source/polygon/b2dtrapezoid.cxx:201 basegfx::trapezoidhelper::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32] basic/source/inc/expr.hxx:93 @@ -48,8 +54,6 @@ bridges/source/jni_uno/jni_java2uno.cxx:151 jni_uno::largest a uno_Any chart2/source/model/main/DataPoint.hxx:107 chart::DataPoint m_bNoParentPropAllowed _Bool -comphelper/source/misc/accimplaccess.cxx:40 - comphelper::OAccImpl_Impl m_xAccParent Reference<class com::sun::star::accessibility::XAccessible> connectivity/source/drivers/evoab2/EApi.h:125 (anonymous) po char * connectivity/source/drivers/evoab2/EApi.h:127 @@ -66,37 +70,27 @@ connectivity/source/drivers/firebird/Driver.hxx:52 connectivity::firebird::FirebirdDriver m_firebirdTMPDirectory ::utl::TempFile connectivity/source/drivers/firebird/Driver.hxx:53 connectivity::firebird::FirebirdDriver m_firebirdLockDirectory ::utl::TempFile -connectivity/source/drivers/mork/MErrorResource.hxx:32 - connectivity::mork::ErrorDescriptor m_sParameter class rtl::OUString connectivity/source/inc/dbase/DIndexIter.hxx:36 connectivity::dbase::OIndexIterator m_pOperator file::OBoolOperator * connectivity/source/inc/dbase/DIndexIter.hxx:37 connectivity::dbase::OIndexIterator m_pOperand const file::OOperand * connectivity/source/inc/FDatabaseMetaDataResultSet.hxx:114 connectivity::ODatabaseMetaDataResultSet m_aEmptyValue class connectivity::ORowSetValue -connectivity/source/inc/OColumn.hxx:31 - connectivity::OColumn m_CatalogName class rtl::OUString -connectivity/source/inc/OColumn.hxx:32 - connectivity::OColumn m_SchemaName class rtl::OUString -connectivity/source/inc/OColumn.hxx:36 - connectivity::OColumn m_ColumnTypeName class rtl::OUString -connectivity/source/inc/OColumn.hxx:37 - connectivity::OColumn m_ColumnServiceName class rtl::OUString -connectivity/source/inc/OColumn.hxx:45 +connectivity/source/inc/OColumn.hxx:41 connectivity::OColumn m_AutoIncrement _Bool -connectivity/source/inc/OColumn.hxx:46 +connectivity/source/inc/OColumn.hxx:42 connectivity::OColumn m_CaseSensitive _Bool -connectivity/source/inc/OColumn.hxx:48 +connectivity/source/inc/OColumn.hxx:44 connectivity::OColumn m_Currency _Bool -connectivity/source/inc/OColumn.hxx:49 +connectivity/source/inc/OColumn.hxx:45 connectivity::OColumn m_Signed _Bool -connectivity/source/inc/OColumn.hxx:51 +connectivity/source/inc/OColumn.hxx:47 connectivity::OColumn m_Writable _Bool -connectivity/source/inc/OColumn.hxx:52 +connectivity/source/inc/OColumn.hxx:48 connectivity::OColumn m_DefinitelyWritable _Bool connectivity/source/inc/TConnection.hxx:55 connectivity::OMetaConnection m_aResources class connectivity::SharedResources -connectivity/source/inc/writer/WTable.hxx:70 +connectivity/source/inc/writer/WTable.hxx:69 connectivity::writer::OWriterTable m_nStartCol sal_Int32 cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:34 Mapping m_from uno::Environment @@ -158,11 +152,9 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/inc/cuicharmap.hxx:86 SvxCharacterMap m_pFavCharView VclPtr<class SvxCharView> [16] -cui/source/inc/iconcdlg.hxx:66 - IconChoicePage aUserString class rtl::OUString cui/source/options/optcolor.cxx:250 ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions -cui/source/options/optpath.cxx:79 +cui/source/options/optpath.cxx:77 OptPath_Impl m_aDefOpt class SvtDefaultOptions cui/source/options/personalization.hxx:34 SvxPersonalizationTabPage m_vDefaultPersonaImages VclPtr<class PushButton> [3] @@ -186,7 +178,7 @@ dbaccess/source/ui/inc/WCopyTable.hxx:269 dbaui::OCopyTableWizard m_aLocale css::lang::Locale drawinglayer/source/processor2d/vclprocessor2d.hxx:83 drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer -editeng/source/editeng/impedit.hxx:448 +editeng/source/editeng/impedit.hxx:449 ImpEditEngine maColorConfig svtools::ColorConfig embeddedobj/source/inc/commonembobj.hxx:104 OCommonEmbeddedObject m_aClassName class rtl::OUString @@ -214,7 +206,7 @@ extensions/source/propctrlr/eformshelper.hxx:62 pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet extensions/source/propctrlr/eformshelper.hxx:64 pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet -filter/source/graphicfilter/eps/eps.cxx:113 +filter/source/graphicfilter/eps/eps.cxx:114 PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice> filter/source/graphicfilter/icgm/chart.hxx:44 DataNode nBoxX1 sal_Int16 @@ -258,18 +250,16 @@ include/editeng/brushitem.hxx:53 SvxBrushItem maSecOptions class SvtSecurityOptions include/editeng/charsetcoloritem.hxx:35 SvxCharSetColorItem eFrom rtl_TextEncoding -include/filter/msfilter/svdfppt.hxx:712 +include/filter/msfilter/svdfppt.hxx:710 PPTExtParaSheet aExtParaLevel struct PPTExtParaLevel [5] -include/filter/msfilter/svdfppt.hxx:886 +include/filter/msfilter/svdfppt.hxx:884 ImplPPTParaPropSet nDontKnow1 sal_uInt32 -include/filter/msfilter/svdfppt.hxx:887 +include/filter/msfilter/svdfppt.hxx:885 ImplPPTParaPropSet nDontKnow2 sal_uInt32 -include/filter/msfilter/svdfppt.hxx:888 +include/filter/msfilter/svdfppt.hxx:886 ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16 include/oox/core/contexthandler2.hxx:220 oox::core::ContextHandler2Helper mnRootStackSize size_t -include/oox/ppt/slidepersist.hxx:134 - oox::ppt::SlidePersist mpClrSchemePtr oox::drawingml::ClrSchemePtr include/registry/refltype.hxx:65 RTUik m_Data1 sal_uInt32 include/registry/refltype.hxx:66 @@ -300,12 +290,8 @@ include/sfx2/sidebar/ResourceManager.hxx:107 sfx2::sidebar::ResourceManager maMiscOptions class SvtMiscOptions include/svl/ondemand.hxx:59 OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale -include/svl/style.hxx:105 - SfxStyleSheetBase maDisplayName class rtl::OUString include/svtools/editsyntaxhighlighter.hxx:33 MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig -include/svx/deflt3d.hxx:38 - E3dDefaultAttributes aDefaultAmbientColor class Color include/svx/sdr/overlay/overlaymanager.hxx:73 sdr::overlay::OverlayManager maDrawinglayerOpt class SvtOptionsDrawinglayer include/svx/svdmark.hxx:140 @@ -323,7 +309,7 @@ include/test/sheet/xnamedranges.hxx:38 include/test/sheet/xspreadsheets2.hxx:46 apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument> include/unoidl/unoidl.hxx:443 - unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5) + unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo4/include/unoidl/unoidl.hxx:443:5) include/unoidl/unoidl.hxx:444 unoidl::ConstantValue::(anonymous) booleanValue _Bool include/unoidl/unoidl.hxx:445 @@ -344,8 +330,6 @@ include/unoidl/unoidl.hxx:452 unoidl::ConstantValue::(anonymous) floatValue float include/unoidl/unoidl.hxx:453 unoidl::ConstantValue::(anonymous) doubleValue double -include/unotools/textsearch.hxx:98 - utl::SearchParam sReplaceStr class rtl::OUString include/vcl/bitmap.hxx:176 BmpFilterParam::(anonymous) mnSepiaPercent sal_uInt16 include/vcl/bitmap.hxx:177 @@ -378,11 +362,11 @@ oox/source/drawingml/chart/objectformatter.cxx:708 oox::drawingml::chart::ObjectFormatterData maFromLocale struct com::sun::star::lang::Locale oox/source/drawingml/diagram/diagramlayoutatoms.hxx:208 oox::drawingml::ChooseAtom maEmptyChildren const std::vector<LayoutAtomPtr> -registry/source/reflwrit.cxx:140 - writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32 registry/source/reflwrit.cxx:141 + writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32 +registry/source/reflwrit.cxx:142 writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b2 sal_uInt32 -registry/source/reflwrit.cxx:181 +registry/source/reflwrit.cxx:182 CPInfo::(anonymous) aUik struct RTUik * reportdesign/source/ui/inc/ColorListener.hxx:35 rptui::OColorListener m_aColorConfig svtools::ColorConfig @@ -409,7 +393,7 @@ sal/rtl/uuid.cxx:65 sc/inc/compiler.hxx:126 ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item sc/inc/compiler.hxx:127 - ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:124:9) + ScRawToken::(anonymous) table struct (anonymous struct at /media/noel/disk2/libo4/sc/inc/compiler.hxx:124:9) sc/inc/compiler.hxx:132 ScRawToken::(anonymous) pMat class ScMatrix * sc/inc/formulagroup.hxx:42 @@ -432,25 +416,23 @@ sc/source/filter/inc/stylesbuffer.hxx:675 oox::xls::Dxf mxAlignment std::shared_ptr<Alignment> sc/source/filter/inc/stylesbuffer.hxx:677 oox::xls::Dxf mxProtection std::shared_ptr<Protection> -sc/source/filter/inc/workbooksettings.hxx:71 +sc/source/filter/inc/workbooksettings.hxx:75 oox::xls::CalcSettingsModel mbUseNlr _Bool sc/source/filter/inc/xepage.hxx:122 XclExpChartPageSettings maData struct XclPageData -sc/source/filter/inc/xiescher.hxx:855 - XclImpPictureObj maVisArea tools::Rectangle sc/source/filter/inc/xltracer.hxx:82 XclTracer mbEnabled _Bool sc/source/ui/inc/csvruler.hxx:35 ScCsvRuler maBackgrDev ScopedVclPtrInstance<class VirtualDevice> sc/source/ui/inc/csvruler.hxx:36 ScCsvRuler maRulerDev ScopedVclPtrInstance<class VirtualDevice> -sc/source/ui/vba/vbaformatconditions.hxx:44 +sc/source/ui/vba/vbaformatconditions.hxx:35 ScVbaFormatConditions mxSheetConditionalEntries css::uno::Reference<css::sheet::XSheetConditionalEntries> -sc/source/ui/vba/vbaformatconditions.hxx:45 +sc/source/ui/vba/vbaformatconditions.hxx:36 ScVbaFormatConditions mxStyles css::uno::Reference<ov::excel::XStyles> -sc/source/ui/vba/vbaformatconditions.hxx:46 +sc/source/ui/vba/vbaformatconditions.hxx:37 ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange> -sc/source/ui/vba/vbaformatconditions.hxx:47 +sc/source/ui/vba/vbaformatconditions.hxx:38 ScVbaFormatConditions mxParentRangePropertySet css::uno::Reference<css::beans::XPropertySet> sd/inc/sdmod.hxx:118 SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache @@ -476,17 +458,13 @@ sdext/source/pdfimport/inc/pdfihelper.hxx:101 pdfi::GraphicsContext BlendMode sal_Int8 sdext/source/pdfimport/tree/style.hxx:42 pdfi::StyleContainer::Style Contents class rtl::OUString -sdext/source/presenter/PresenterPaneBase.hxx:116 - sdext::presenter::PresenterPaneBase maCalloutAnchor css::awt::Point -sfx2/source/appl/helpinterceptor.hxx:68 - HelpInterceptor_Impl m_aViewData css::uno::Any -sfx2/source/appl/lnkbase2.cxx:95 +sfx2/source/appl/lnkbase2.cxx:96 sfx2::ImplDdeItem pLink class sfx2::SvBaseLink * slideshow/source/engine/slideshowimpl.cxx:154 (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime -sot/source/sdstor/ucbstorage.cxx:416 +sot/source/sdstor/ucbstorage.cxx:414 UCBStorageStream_Impl m_aKey class rtl::OString -starmath/source/view.cxx:856 +starmath/source/view.cxx:855 SmViewShell_Impl aOpts class SvtMiscOptions store/source/storbios.cxx:59 OStoreSuperBlock m_aMarked OStoreSuperBlock::L @@ -502,7 +480,7 @@ svtools/source/control/headbar.cxx:38 ImplHeadItem maHelpId class rtl::OString svtools/source/control/headbar.cxx:39 ImplHeadItem maImage class Image -svtools/source/control/tabbar.cxx:205 +svtools/source/control/tabbar.cxx:207 ImplTabBarItem maHelpId class rtl::OString svtools/source/dialogs/insdlg.cxx:46 OleObjectDescriptor cbSize sal_uInt32 @@ -524,31 +502,29 @@ svtools/source/table/gridtablerenderer.cxx:70 svt::table::CachedSortIndicator m_sortAscending class BitmapEx svtools/source/table/gridtablerenderer.cxx:71 svt::table::CachedSortIndicator m_sortDescending class BitmapEx -svx/source/inc/datanavi.hxx:224 - svxform::XFormsPage m_aMethodString class svxform::MethodString svx/source/inc/datanavi.hxx:225 + svxform::XFormsPage m_aMethodString class svxform::MethodString +svx/source/inc/datanavi.hxx:226 svxform::XFormsPage m_aReplaceString class svxform::ReplaceString -svx/source/inc/datanavi.hxx:548 - svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString svx/source/inc/datanavi.hxx:549 + svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString +svx/source/inc/datanavi.hxx:550 svxform::AddSubmissionDialog m_aReplaceString class svxform::ReplaceString -svx/source/inc/fmexpl.hxx:236 - FmFormData m_xContainer css::uno::Reference<css::container::XContainer> svx/source/inc/gridcell.hxx:525 DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> svx/source/inc/gridcell.hxx:526 DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue> +svx/source/sidebar/possize/PosSizePropertyPanel.hxx:116 + svx::sidebar::PosSizePropertyPanel maAnchorPos class Point sw/inc/acmplwrd.hxx:43 SwAutoCompleteWord m_LookupTree editeng::Trie sw/inc/calc.hxx:162 SwCalc m_aSysLocale class SvtSysLocale -sw/inc/hints.hxx:105 - SwUpdateAttr m_aWhichFormatAttr std::vector<sal_uInt16> -sw/inc/hints.hxx:195 +sw/inc/hints.hxx:188 SwAttrSetChg m_bDelSet _Bool sw/inc/shellio.hxx:142 SwReader pStg tools::SvRef<SotStorage> -sw/inc/swevent.hxx:73 +sw/inc/swevent.hxx:74 SwCallMouseEvent::(anonymous union)::(anonymous) pFormat const class SwFrameFormat * sw/source/core/access/accfrmobjmap.hxx:100 SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare> @@ -562,23 +538,25 @@ sw/source/core/text/atrhndl.hxx:48 SwAttrHandler::SwAttrStack pInitialArray class SwTextAttr *[3] sw/source/filter/inc/rtf.hxx:32 RTFSurround::(anonymous) nVal sal_uInt8 -sw/source/ui/dbui/dbinsdlg.cxx:117 +sw/source/ui/dbui/dbinsdlg.cxx:116 DB_Column::(anonymous) pText class rtl::OUString * -sw/source/ui/dbui/dbinsdlg.cxx:119 +sw/source/ui/dbui/dbinsdlg.cxx:118 DB_Column::(anonymous) nFormat sal_uInt32 -sw/source/uibase/dbui/mmconfigitem.cxx:103 +sw/source/uibase/dbui/mmconfigitem.cxx:106 SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString> -sw/source/uibase/dbui/mmconfigitem.cxx:105 +sw/source/uibase/dbui/mmconfigitem.cxx:108 SwMailMergeConfigItem_Impl m_aMaleGreetingLines std::vector<OUString> -sw/source/uibase/dbui/mmconfigitem.cxx:107 +sw/source/uibase/dbui/mmconfigitem.cxx:110 SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString> +sw/source/uibase/inc/break.hxx:46 + SwBreakDlg aTemplate class rtl::OUString sw/source/uibase/inc/fldmgr.hxx:77 SwInsertField_Data m_aDBDataSource css::uno::Any sw/source/uibase/inc/labimg.hxx:49 SwLabItem m_aBin class rtl::OUString sw/source/uibase/inc/optload.hxx:94 CaptionComboBox aDefault class rtl::OUString -toolkit/source/awt/vclxtoolkit.cxx:179 +toolkit/source/awt/vclxtoolkit.cxx:432 (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard> ucb/source/ucp/gio/gio_mount.hxx:46 OOoMountOperationClass parent_class GMountOperationClass @@ -624,10 +602,10 @@ unotools/source/config/pathoptions.cxx:90 SvtPathOptions_Impl m_aEmptyString class rtl::OUString unotools/source/config/saveopt.cxx:78 SvtSaveOptions_Impl bROUserAutoSave _Bool -uui/source/loginerr.hxx:43 - LoginErrorInfo m_aPath class rtl::OUString vcl/inc/printerinfomanager.hxx:73 psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString +vcl/inc/sallayout.hxx:344 + GenericSalLayout maBasePoint class Point vcl/inc/salwtype.hxx:153 SalWheelMouseEvent mbDeltaIsPixel _Bool vcl/inc/salwtype.hxx:189 @@ -654,6 +632,8 @@ vcl/inc/unx/i18n_status.hxx:56 vcl::I18NStatus m_aCurrentIM class rtl::OUString vcl/inc/unx/saldisp.hxx:266 SalDisplay m_aInvalidScreenData struct SalDisplay::ScreenData +vcl/source/edit/vclmedit.cxx:45 + ImpVclMEdit maTextWindowOffset class Point vcl/source/filter/jpeg/Exif.hxx:62 Exif::TiffHeader byteOrder sal_uInt16 vcl/source/filter/jpeg/transupp.h:132 @@ -666,11 +646,11 @@ vcl/source/filter/jpeg/transupp.h:148 (anonymous) crop_xoffset_set JCROP_CODE vcl/source/filter/jpeg/transupp.h:150 (anonymous) crop_yoffset_set JCROP_CODE -vcl/source/fontsubset/sft.cxx:1055 +vcl/source/fontsubset/sft.cxx:1054 vcl::_subHeader2 firstCode sal_uInt16 -vcl/source/fontsubset/sft.cxx:1056 +vcl/source/fontsubset/sft.cxx:1055 vcl::_subHeader2 entryCount sal_uInt16 -vcl/source/fontsubset/sft.cxx:1057 +vcl/source/fontsubset/sft.cxx:1056 vcl::_subHeader2 idDelta sal_uInt16 vcl/source/gdi/dibtools.cxx:49 (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30 @@ -706,6 +686,8 @@ vcl/source/gdi/dibtools.cxx:115 (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32 vcl/source/gdi/dibtools.cxx:116 (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32 +vcl/source/gdi/pdfwriter_impl.hxx:302 + vcl::PDFWriterImpl::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream> vcl/source/window/menuitemlist.hxx:55 MenuItemData aAccessibleName class rtl::OUString vcl/unx/generic/print/bitmap_gfx.cxx:67 @@ -718,7 +700,7 @@ vcl/unx/gtk/gloactiongroup.cxx:28 GLOAction parent_instance GObject vcl/unx/gtk/glomenu.cxx:20 GLOMenu parent_instance GMenuModel -writerfilter/source/dmapper/DomainMapper_Impl.hxx:395 +writerfilter/source/dmapper/DomainMapper_Impl.hxx:410 writerfilter::dmapper::DomainMapper_Impl m_aSaveOpt class SvtSaveOptions writerfilter/source/ooxml/OOXMLFactory.hxx:61 writerfilter::ooxml::AttributeInfo m_nToken writerfilter::Token_t @@ -726,8 +708,6 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:62 writerfilter::ooxml::AttributeInfo m_nResource enum writerfilter::ooxml::ResourceType writerfilter/source/ooxml/OOXMLFactory.hxx:63 writerfilter::ooxml::AttributeInfo m_nRef Id -xmlhelp/source/cxxhelp/provider/urlparameter.hxx:184 - chelp::URLParameter m_aDefaultLanguage class rtl::OUString xmloff/inc/MultiPropertySetHelper.hxx:78 MultiPropertySetHelper aEmptyAny css::uno::Any xmloff/source/chart/SchXMLChartContext.cxx:447 @@ -744,5 +724,5 @@ xmloff/source/chart/SchXMLChartContext.hxx:58 SeriesDefaultsAndStyles maPercentageErrorDefault css::uno::Any xmloff/source/chart/SchXMLChartContext.hxx:59 SeriesDefaultsAndStyles maErrorMarginDefault css::uno::Any -xmloff/source/core/xmlexp.cxx:251 +xmloff/source/core/xmlexp.cxx:254 SvXMLExport_Impl maSaveOptions class SvtSaveOptions diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index b168d51926e6..9831a77be11b 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -1,3 +1,15 @@ +avmedia/source/vlc/wrapper/Types.hxx:39 + libvlc_event_t p_obj void * +avmedia/source/vlc/wrapper/Types.hxx:44 + libvlc_event_t::(anonymous union)::(anonymous) dummy1 const char * +avmedia/source/vlc/wrapper/Types.hxx:45 + libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * +avmedia/source/vlc/wrapper/Types.hxx:46 + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) +avmedia/source/vlc/wrapper/Types.hxx:47 + libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) +avmedia/source/vlc/wrapper/Types.hxx:53 + libvlc_track_description_t psz_name char * basctl/source/inc/dlged.hxx:122 basctl::DlgEditor pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> > basic/qa/cppunit/basictest.hxx:27 @@ -10,6 +22,8 @@ canvas/source/vcl/impltools.hxx:117 vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard chart2/source/controller/inc/RangeSelectionListener.hxx:62 chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO +chart2/source/model/template/ChartType.hxx:127 + chart::ChartType m_xContext const css::uno::Reference<css::uno::XComponentContext> chart2/source/view/inc/GL3DRenderer.hxx:54 chart::opengl3D::MaterialParameters pad float chart2/source/view/inc/GL3DRenderer.hxx:55 @@ -26,14 +40,16 @@ connectivity/source/drivers/evoab2/EApi.h:122 (anonymous) address_format char * connectivity/source/drivers/evoab2/EApi.h:126 (anonymous) ext char * -connectivity/source/drivers/evoab2/NStatement.hxx:58 +connectivity/source/drivers/evoab2/NStatement.hxx:57 connectivity::evoab::FieldSort bAscending _Bool connectivity/source/drivers/mork/MDatabaseMetaData.hxx:29 connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper> cppu/source/threadpool/threadpool.cxx:355 _uno_ThreadPool dummy sal_Int32 -cppu/source/typelib/typelib.cxx:61 +cppu/source/typelib/typelib.cxx:62 AlignSize_Impl nInt16 sal_Int16 +cui/source/inc/insrc.hxx:33 + SvxInsRowColDlg m_xBeforeBtn std::unique_ptr<weld::RadioButton> dbaccess/source/sdbtools/inc/connectiondependent.hxx:116 sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard emfio/source/emfuno/xemfparser.cxx:60 @@ -42,7 +58,7 @@ extensions/source/scanner/scanner.hxx:44 ScannerManager maProtector osl::Mutex include/drawinglayer/primitive2d/textlayoutdevice.hxx:61 drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard -include/editeng/unotext.hxx:608 +include/editeng/unotext.hxx:613 SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText> include/LibreOfficeKit/LibreOfficeKitGtk.h:33 _LOKDocView aDrawingArea GtkDrawingArea @@ -60,6 +76,8 @@ include/svtools/genericunodialog.hxx:170 svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard include/svtools/unoevent.hxx:162 SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface> +include/svx/ClassificationDialog.hxx:63 + svx::ClassificationDialog m_nInsertMarkings sal_Int16 include/vcl/pdfwriter.hxx:549 vcl::PDFWriter::PDFSignContext m_pDerEncoded sal_Int8 * include/vcl/pdfwriter.hxx:551 @@ -78,7 +96,7 @@ include/vcl/pdfwriter.hxx:561 vcl::PDFWriter::PDFSignContext m_aSignPassword class rtl::OUString include/vcl/pdfwriter.hxx:563 vcl::PDFWriter::PDFSignContext m_rCMSHexBuffer class rtl::OStringBuffer & -include/vcl/uitest/uiobject.hxx:241 +include/vcl/uitest/uiobject.hxx:262 TabPageUIObject mxTabPage VclPtr<class TabPage> include/xmloff/formlayerexport.hxx:173 xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport> @@ -138,17 +156,17 @@ sc/inc/interpretercontext.hxx:23 ScInterpreterContext mrDoc const class ScDocument & sc/qa/unit/ucalc_column.cxx:103 aInputs aName const char * -sc/source/core/data/document.cxx:1260 +sc/source/core/data/document.cxx:1263 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch -sc/source/core/data/document.cxx:1261 +sc/source/core/data/document.cxx:1264 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast -sc/source/core/data/formulacell.cxx:1742 +sc/source/core/data/formulacell.cxx:1741 (anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter> -sc/source/filter/inc/orcusinterface.hxx:557 +sc/source/filter/inc/orcusinterface.hxx:559 ScOrcusFactory maRefResolver class ScOrcusRefResolver sc/source/filter/inc/sheetdatacontext.hxx:61 oox::xls::SheetDataContext aReleaser class SolarMutexReleaser -sc/source/ui/inc/docsh.hxx:439 +sc/source/ui/inc/docsh.hxx:441 ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector> sd/source/ui/remotecontrol/ZeroconfService.hxx:36 sd::ZeroconfService port uint @@ -156,20 +174,24 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:61 sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme> sd/source/ui/table/TableDesignPane.hxx:113 sd::TableDesignPane aImpl class sd::TableDesignWidget -sd/source/ui/view/DocumentRenderer.cxx:1318 +sd/source/ui/view/DocumentRenderer.cxx:1320 sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef -sd/source/ui/view/viewshel.cxx:1257 +sd/source/ui/view/viewshel.cxx:1217 sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock -sd/source/ui/view/viewshel.cxx:1258 +sd/source/ui/view/viewshel.cxx:1218 sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock -sd/source/ui/view/viewshel.cxx:1259 +sd/source/ui/view/viewshel.cxx:1219 sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock -sd/source/ui/view/viewshel.cxx:1260 +sd/source/ui/view/viewshel.cxx:1220 sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context sd/source/ui/view/ViewShellBase.cxx:194 sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager> sfx2/source/doc/doctempl.cxx:115 DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock +sfx2/source/view/viewfrm.cxx:162 + (anonymous namespace)::SfxEditDocumentDialog m_xEditDocument std::unique_ptr<weld::Button> +sfx2/source/view/viewfrm.cxx:163 + (anonymous namespace)::SfxEditDocumentDialog m_xCancel std::unique_ptr<weld::Button> starmath/inc/smmod.hxx:69 SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData> starmath/inc/view.hxx:218 @@ -187,19 +209,23 @@ svl/source/crypto/cryptosign.cxx:281 svl/source/crypto/cryptosign.cxx:282 (anonymous namespace)::(anonymous) failInfo SECItem svtools/source/svhtml/htmlkywd.cxx:558 - HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5) + HTML_OptionEntry union HTML_OptionEntry::(anonymous at /media/noel/disk2/libo4/svtools/source/svhtml/htmlkywd.cxx:558:5) svtools/source/svhtml/htmlkywd.cxx:560 HTML_OptionEntry::(anonymous) sToken const sal_Char * svtools/source/svhtml/htmlkywd.cxx:561 HTML_OptionEntry::(anonymous) pUToken const class rtl::OUString * -svx/source/dialog/crashreportui.cxx:42 - (anonymous namespace)::CrashReportUI mxContext css::uno::Reference<css::uno::XComponentContext> sw/source/core/crsr/crbm.cxx:64 (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState -sw/source/core/frmedt/fetab.cxx:90 +sw/source/core/frmedt/fetab.cxx:77 TableWait m_pWait const std::unique_ptr<SwWait> sw/source/core/layout/dbg_lay.cxx:164 SwImplEnterLeave nAction enum DbgAction +sw/source/uibase/inc/splittbl.hxx:32 + SwSplitTableDlg m_xHorzBox std::unique_ptr<weld::RadioButton> +sw/source/uibase/inc/splittbl.hxx:33 + SwSplitTableDlg m_xContentCopyRB std::unique_ptr<weld::RadioButton> +sw/source/uibase/inc/tautofmt.hxx:43 + SwAutoFormatDlg m_xFormatting std::unique_ptr<weld::Container> sw/source/uibase/inc/uivwimp.hxx:95 SwView_Impl xTmpSelDocSh class SfxObjectShellLock sw/source/uibase/inc/unodispatch.hxx:46 @@ -210,6 +236,8 @@ unoidl/source/unoidlprovider.cxx:672 unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider> unoidl/source/unoidlprovider.cxx:673 unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity> +uui/source/unknownauthdlg.hxx:38 + UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton> vcl/inc/opengl/zone.hxx:46 OpenGLVCLContextZone aZone class OpenGLZone vcl/inc/unx/cpdmgr.hxx:60 @@ -220,8 +248,6 @@ vcl/inc/unx/cpdmgr.hxx:62 psp::CPDPrinterOption num_supported_values int vcl/inc/unx/cpdmgr.hxx:63 psp::CPDPrinterOption supported_values std::vector<OUString> -vcl/qt5/Qt5Object.hxx:34 - Qt5Object m_aSystemData struct SystemEnvData vcl/source/gdi/jobset.cxx:34 ImplOldJobSetupData cDeviceName char [32] vcl/source/gdi/jobset.cxx:35 diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 0817e9b57879..d9ff930f8501 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -56,9 +56,9 @@ canvas/source/cairo/cairo_spritehelper.hxx:103 cairocanvas::SpriteHelper mbTextureDirty _Bool canvas/source/opengl/ogl_spritedevicehelper.hxx:126 oglcanvas::SpriteDeviceHelper mpDevice css::rendering::XGraphicDevice * -chart2/inc/ChartModel.hxx:482 +chart2/inc/ChartModel.hxx:484 chart::ChartModel mnStart sal_Int32 -chart2/inc/ChartModel.hxx:483 +chart2/inc/ChartModel.hxx:485 chart::ChartModel mnEnd sal_Int32 chart2/source/controller/main/ElementSelector.hxx:37 chart::ListBoxEntryData nHierarchyDepth sal_Int32 @@ -82,8 +82,10 @@ codemaker/source/cppumaker/dependencies.hxx:114 codemaker::cppumaker::Dependencies m_floatDependency _Bool codemaker/source/cppumaker/dependencies.hxx:115 codemaker::cppumaker::Dependencies m_doubleDependency _Bool -configmgr/source/components.cxx:163 +configmgr/source/components.cxx:162 configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> * +connectivity/source/drivers/firebird/Connection.hxx:77 + connectivity::firebird::Connection m_xDriver ::rtl::Reference<FirebirdDriver> connectivity/source/drivers/mork/MorkParser.hxx:133 MorkParser error_ enum MorkErrors connectivity/source/inc/dbase/DTable.hxx:62 @@ -162,7 +164,7 @@ dbaccess/source/core/dataaccess/documentdefinition.cxx:290 dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface> desktop/qa/desktop_lib/test_desktop_lib.cxx:178 DesktopLOKTest m_bModified _Bool -desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:119 +desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:118 dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread> desktop/unx/source/splashx.c:371 input_mode long @@ -180,10 +182,6 @@ drawinglayer/source/tools/emfppen.hxx:58 emfplushelper::EMFPPen dashOffset float drawinglayer/source/tools/emfppen.hxx:60 emfplushelper::EMFPPen alignment sal_Int32 -drawinglayer/source/tools/emfppen.hxx:63 - emfplushelper::EMFPPen customStartCap struct emfplushelper::EMFPCustomLineCap * -drawinglayer/source/tools/emfppen.hxx:65 - emfplushelper::EMFPPen customEndCap struct emfplushelper::EMFPCustomLineCap * embeddedobj/source/inc/oleembobj.hxx:127 OleEmbeddedObject m_nTargetState sal_Int32 embeddedobj/source/inc/oleembobj.hxx:139 @@ -218,20 +216,14 @@ extensions/source/scanner/scanner.hxx:45 ScannerManager mpData void * framework/inc/services/layoutmanager.hxx:258 framework::LayoutManager m_bGlobalSettings _Bool -framework/inc/services/layoutmanager.hxx:272 - framework::LayoutManager m_pGlobalSettings class framework::GlobalSettings * -framework/source/layoutmanager/toolbarlayoutmanager.hxx:281 - framework::ToolbarLayoutManager m_pGlobalSettings class framework::GlobalSettings * framework/source/layoutmanager/toolbarlayoutmanager.hxx:285 framework::ToolbarLayoutManager m_bGlobalSettings _Bool -framework/source/services/frame.cxx:420 +framework/source/services/frame.cxx:422 (anonymous namespace)::Frame m_pWindowCommandDispatch class framework::WindowCommandDispatch * include/basic/basmgr.hxx:52 BasicError nReason enum BasicErrorReason -include/basic/sbxvar.hxx:67 +include/basic/sbxvar.hxx:70 SbxValues::(anonymous) pData void * -include/connectivity/OSubComponent.hxx:54 - connectivity::OSubComponent m_xParent css::uno::Reference<css::uno::XInterface> include/editeng/adjustitem.hxx:39 SvxAdjustItem bLeft _Bool include/LibreOfficeKit/LibreOfficeKit.h:108 @@ -280,15 +272,15 @@ lingucomponent/source/languageguessing/simpleguesser.cxx:79 textcat_t maxsize uint4 lingucomponent/source/languageguessing/simpleguesser.cxx:81 textcat_t output char [1024] -registry/source/reflread.cxx:509 +registry/source/reflread.cxx:488 ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b1 sal_uInt32 -registry/source/reflread.cxx:510 +registry/source/reflread.cxx:489 ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b2 sal_uInt32 -registry/source/reflread.cxx:578 +registry/source/reflread.cxx:557 FieldList m_pCP class ConstantPool * -registry/source/reflread.cxx:764 +registry/source/reflread.cxx:743 ReferenceList m_pCP class ConstantPool * -registry/source/reflread.cxx:867 +registry/source/reflread.cxx:846 MethodList m_pCP class ConstantPool * sal/rtl/alloc_arena.hxx:35 rtl_arena_stat_type m_mem_total sal_Size @@ -300,7 +292,7 @@ sal/rtl/alloc_cache.hxx:36 rtl_cache_stat_type m_mem_alloc sal_Size sal/rtl/alloc_cache.hxx:151 rtl_cache_st m_cpu_stats struct rtl_cache_stat_type -sal/rtl/math.cxx:1004 +sal/rtl/math.cxx:1005 md union sal_math_Double sal/textenc/tcvtutf7.cxx:96 ImplUTF7ToUCContextData mbShifted _Bool @@ -324,7 +316,7 @@ sc/inc/compiler.hxx:259 ScCompiler::AddInMap pEnglish const char * sc/inc/compiler.hxx:261 ScCompiler::AddInMap pUpper const char * -sc/inc/document.hxx:2483 +sc/inc/document.hxx:2512 ScMutationDisable mpDocument class ScDocument * sc/inc/pivot.hxx:74 ScDPLabelData mnFlags sal_Int32 @@ -332,7 +324,7 @@ sc/inc/pivot.hxx:77 ScDPLabelData mbIsValue _Bool sc/source/core/data/cellvalues.cxx:25 sc::(anonymous namespace)::BlockPos mnEnd size_t -sc/source/core/data/column4.cxx:1293 +sc/source/core/data/column4.cxx:1313 (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW sc/source/filter/excel/xltoolbar.hxx:23 TBCCmd cmdID sal_uInt16 @@ -368,7 +360,7 @@ sc/source/filter/inc/imp_op.hxx:88 ImportExcel::LastFormula mpCell class ScFormulaCell * sc/source/filter/inc/orcusinterface.hxx:387 ScOrcusStyles::xf mnStyleXf size_t -sc/source/filter/inc/orcusinterface.hxx:405 +sc/source/filter/inc/orcusinterface.hxx:407 ScOrcusStyles::cell_style mnBuiltInId size_t sc/source/filter/inc/root.hxx:95 LOTUS_ROOT eActType enum Lotus123Typ @@ -396,19 +388,19 @@ sc/source/ui/inc/tabvwsh.hxx:129 ScTabViewShell pPivotSource class ScArea * sd/source/filter/eppt/eppt.hxx:176 PPTWriter mnTxId sal_uInt32 -sd/source/filter/ppt/ppt97animations.hxx:41 +sd/source/filter/ppt/ppt97animations.hxx:42 Ppt97AnimationInfoAtom nSlideCount sal_uInt16 -sd/source/filter/ppt/ppt97animations.hxx:47 +sd/source/filter/ppt/ppt97animations.hxx:48 Ppt97AnimationInfoAtom nOLEVerb sal_uInt8 -sd/source/filter/ppt/ppt97animations.hxx:50 - Ppt97AnimationInfoAtom nUnknown1 sal_uInt8 sd/source/filter/ppt/ppt97animations.hxx:51 + Ppt97AnimationInfoAtom nUnknown1 sal_uInt8 +sd/source/filter/ppt/ppt97animations.hxx:52 Ppt97AnimationInfoAtom nUnknown2 sal_uInt8 sd/source/ui/inc/animobjs.hxx:129 sd::AnimationWindow pControllerItem class sd::AnimationControllerItem * -sd/source/ui/inc/navigatr.hxx:122 - SdNavigatorWin mpNavigatorCtrlItem class SdNavigatorControllerItem * sd/source/ui/inc/navigatr.hxx:123 + SdNavigatorWin mpNavigatorCtrlItem class SdNavigatorControllerItem * +sd/source/ui/inc/navigatr.hxx:124 SdNavigatorWin mpPageNameCtrlItem class SdPageNameControllerItem * sd/source/ui/remotecontrol/Receiver.hxx:36 sd::Receiver pTransmitter class sd::Transmitter * @@ -478,7 +470,7 @@ sw/inc/shellio.hxx:147 SwReader aFileName class rtl::OUString sw/source/core/doc/tblafmt.cxx:184 SwAfVersions m_nVerticalAlignmentVersion sal_uInt16 -sw/source/core/inc/swfont.hxx:980 +sw/source/core/inc/swfont.hxx:978 SvStatistics nGetStretchTextSize sal_uInt16 sw/source/core/text/xmldump.cxx:34 XmlPortionDumper ofs sal_Int32 @@ -495,7 +487,7 @@ sw/source/filter/inc/rtf.hxx:29 sw/source/filter/inc/rtf.hxx:30 RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8 sw/source/filter/inc/rtf.hxx:31 - RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9) + RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9) ucb/source/ucp/gio/gio_mount.hxx:46 OOoMountOperationClass parent_class GMountOperationClass ucb/source/ucp/gio/gio_mount.hxx:49 @@ -546,14 +538,10 @@ vcl/inc/salwtype.hxx:242 SalInputContext mpFont class FontSelectPattern * vcl/inc/salwtype.hxx:250 SalSwipeEvent mnVelocityY double -vcl/inc/sft.hxx:485 +vcl/inc/sft.hxx:468 vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32) vcl/opengl/salbmp.cxx:426 (anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 * -vcl/qt5/Qt5Graphics.hxx:50 - Qt5Graphics m_pFontCollection class PhysicalFontCollection * -vcl/qt5/Qt5Graphics.hxx:53 - Qt5Graphics m_aTextColor SalColor vcl/source/filter/graphicfilter.cxx:1010 ImpFilterLibCache mpLast struct ImpFilterLibCacheEntry * vcl/source/filter/jpeg/Exif.hxx:56 @@ -576,5 +564,5 @@ vcl/unx/gtk/hudawareness.cxx:20 (anonymous) connection GDBusConnection * vcl/unx/gtk/hudawareness.cxx:23 (anonymous) notify GDestroyNotify -writerfilter/source/dmapper/PropertyMap.hxx:185 +writerfilter/source/dmapper/PropertyMap.hxx:186 writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32 diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 3c4ba3522020..528a0bd29559 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -81,9 +81,8 @@ static const OUStringLiteral our_sFDBLocation( "firebird.fdb" ); */ static const OUStringLiteral our_sFBKLocation( "firebird.fbk" ); -Connection::Connection(FirebirdDriver* _pDriver) +Connection::Connection() : Connection_BASE(m_aMutex) - , m_xDriver(_pDriver) , m_sConnectionURL() , m_sFirebirdURL() , m_bIsEmbedded(false) @@ -923,7 +922,6 @@ void Connection::disposing() // TODO: write to storage again? cppu::WeakComponentImplHelperBase::disposing(); - m_xDriver.clear(); if (m_pDatabaseFileDir) { diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 8f84b3f00113..6992a5dedd1f 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -73,8 +73,6 @@ namespace connectivity TTypeInfoVector m_aTypeInfo; // vector containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. - /** The parent driver that created this connection. */ - ::rtl::Reference<FirebirdDriver> m_xDriver; /** The URL passed to us when opening, i.e. of the form sdbc:* */ ::rtl::OUString m_sConnectionURL; @@ -166,7 +164,7 @@ namespace connectivity void disposeStatements(); public: - explicit Connection(FirebirdDriver* _pDriver); + explicit Connection(); virtual ~Connection() override; /// @throws css::sdbc::SQLException diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 398435163b6e..09057309186c 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -183,7 +183,7 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect( if ( ! acceptsURL(url) ) return nullptr; - Connection* pCon = new Connection(this); + Connection* pCon = new Connection(); Reference< XConnection > xCon = pCon; pCon->construct(url, info); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 280f7ede27c9..5ba2c5100b90 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -56,7 +56,6 @@ PosSizePropertyPanel::PosSizePropertyPanel( mpView(nullptr), mlOldWidth(1), mlOldHeight(1), - maAnchorPos(), mlRotX(0), mlRotY(0), maUIScale(), @@ -370,7 +369,6 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosXHdl, Edit&, void ) long lX = GetCoreValue( *mpMtrPosX, mePoolUnit ); Fraction aUIScale = mpView->GetModel()->GetUIScale(); - lX += maAnchorPos.X(); lX = long( lX * aUIScale ); SfxInt32Item aPosXItem( SID_ATTR_TRANSFORM_POS_X,static_cast<sal_uInt32>(lX)); @@ -388,7 +386,6 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl, Edit&, void ) long lY = GetCoreValue( *mpMtrPosY, mePoolUnit ); Fraction aUIScale = mpView->GetModel()->GetUIScale(); - lY += maAnchorPos.Y(); lY = long( lY * aUIScale ); SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,static_cast<sal_uInt32>(lY)); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 9ae618bc893a..97059186a510 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -113,7 +113,6 @@ private: const SdrView* mpView; sal_uInt32 mlOldWidth; sal_uInt32 mlOldHeight; - Point maAnchorPos; //anchor position long mlRotX; long mlRotY; Fraction maUIScale; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index ff008c44dd55..b1037bc684ef 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -341,8 +341,6 @@ protected: std::vector<GlyphItem> m_GlyphItems; private: - mutable Point maBasePoint; - GenericSalLayout( const GenericSalLayout& ) = delete; GenericSalLayout& operator=( const GenericSalLayout& ) = delete; }; diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 24b3ae713f30..092970d08f28 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -42,7 +42,6 @@ private: VclPtr<ScrollBar> mpVScrollBar; VclPtr<ScrollBarBox> mpScrollBox; - Point maTextWindowOffset; long mnTextWidth; mutable Selection maSelection; @@ -379,7 +378,7 @@ void ImpVclMEdit::Resize() else mpHScrollBar->setPosSizePixel( 0, aEditSize.Height()-nSBWidth, aSz.Width(), nSBWidth ); - Point aTextWindowPos( maTextWindowOffset ); + Point aTextWindowPos; if ( mpVScrollBar ) { if( AllSettings::GetLayoutRTL() ) @@ -395,8 +394,6 @@ void ImpVclMEdit::Resize() mpScrollBox->setPosSizePixel( aSz.Width(), aSz.Height(), nSBWidth, nSBWidth ); Size aTextWindowSize( aSz ); - aTextWindowSize.AdjustWidth( -(maTextWindowOffset.X()) ); - aTextWindowSize.AdjustHeight( -(maTextWindowOffset.Y()) ); if ( aTextWindowSize.Width() < 0 ) aTextWindowSize.setWidth( 0 ); if ( aTextWindowSize.Height() < 0 ) diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 368247cfb76d..616fc63e27fc 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -770,7 +770,7 @@ void GenericSalLayout::Justify( DeviceCoordinate nNewWidth ) if( nNewWidth < nMaxGlyphWidth) nNewWidth = nMaxGlyphWidth; nNewWidth -= pGlyphIterRight->mnOrigWidth; - pGlyphIterRight->maLinearPos.setX( maBasePoint.X() + nNewWidth ); + pGlyphIterRight->maLinearPos.setX( nNewWidth ); // justify glyph widths and positions int nDiffWidth = nNewWidth - nOldWidth; @@ -802,9 +802,9 @@ void GenericSalLayout::Justify( DeviceCoordinate nNewWidth ) { for( pGlyphIter = m_GlyphItems.begin(); ++pGlyphIter != pGlyphIterRight;) { - int nX = pGlyphIter->maLinearPos.X() - maBasePoint.X(); + int nX = pGlyphIter->maLinearPos.X(); nX = static_cast<int>(nX * fSqueeze); - pGlyphIter->maLinearPos.setX( nX + maBasePoint.X() ); + pGlyphIter->maLinearPos.setX( nX ); } } // adjust glyph widths to new positions @@ -928,7 +928,7 @@ int GenericSalLayout::GetNextGlyphs(int nLen, const GlyphItem** pGlyphs, return 0; // calculate absolute position in pixel units - Point aRelativePos = pGlyphIter->maLinearPos - maBasePoint; + Point aRelativePos = pGlyphIter->maLinearPos; // find more glyphs which can be merged into one drawing instruction int nCount = 0; |