From 1e49e33c26950b606714c0dafb26cbcb2aeb3877 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 12 Sep 2016 13:10:16 +0200 Subject: loplugin:constantparam in chart2..connectivity Change-Id: Ic9e1bd36a11c7148fa7595a2b6c6de9bd7a8653d Reviewed-on: https://gerrit.libreoffice.org/28834 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- chart2/source/controller/dialogs/TextDirectionListBox.cxx | 4 +--- chart2/source/controller/inc/MultipleChartConverters.hxx | 6 ++---- chart2/source/controller/inc/TextDirectionListBox.hxx | 3 +-- .../controller/itemsetwrapper/MultipleChartConverters.cxx | 10 ++++------ 4 files changed, 8 insertions(+), 15 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index a2fd92385738..767d6fba8bb4 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -27,7 +27,7 @@ namespace chart { -TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* pWindow1, vcl::Window* pWindow2 ) : +TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent ) : svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN) { InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP ); @@ -37,8 +37,6 @@ TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* p if( !SvtLanguageOptions().IsCTLFontEnabled() ) { Hide(); - if( pWindow1 ) pWindow1->Hide(); - if( pWindow2 ) pWindow2->Hide(); } } diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 3babe25309d0..066c9b272462 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -64,8 +64,7 @@ public: const css::uno::Reference& xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const css::uno::Reference& xNamedPropertyContainerFactory, - const css::awt::Size* pRefSize = nullptr ); + const css::uno::Reference& xNamedPropertyContainerFactory ); virtual ~AllDataLabelItemConverter() override; @@ -79,8 +78,7 @@ public: AllTitleItemConverter( const css::uno::Reference& xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const css::uno::Reference& xNamedPropertyContainerFactory, - const css::awt::Size* pRefSize = nullptr ); + const css::uno::Reference& xNamedPropertyContainerFactory ); virtual ~AllTitleItemConverter() override; diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx index 3e3562ed9ffa..c3054072f1d3 100644 --- a/chart2/source/controller/inc/TextDirectionListBox.hxx +++ b/chart2/source/controller/inc/TextDirectionListBox.hxx @@ -30,8 +30,7 @@ namespace chart class TextDirectionListBox : public svx::FrameDirectionListBox { public: - explicit TextDirectionListBox( vcl::Window* pParent, - vcl::Window* pWindow1 = nullptr, vcl::Window* pWindow2 = nullptr ); + explicit TextDirectionListBox( vcl::Window* pParent ); }; } //namespace chart diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index bfcd17a10cf3..02481f3b977e 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -101,8 +101,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, - const awt::Size* pRefSize ) + const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ) : MultipleItemConverter( rItemPool ) { ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList( @@ -122,7 +121,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( new ::chart::wrapper::DataPointItemConverter( xChartModel, xContext, xObjectProperties, *aIt, rItemPool, rDrawModel, xNamedPropertyContainerFactory, GraphicPropertyItemConverter::FILLED_DATA_POINT, - pRefSize, true, false, 0, true, nNumberFormat, nPercentNumberFormat)); + nullptr, true, false, 0, true, nNumberFormat, nPercentNumberFormat)); } } @@ -140,8 +139,7 @@ AllTitleItemConverter::AllTitleItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, - const awt::Size* pRefSize ) + const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ) : MultipleItemConverter( rItemPool ) { for(sal_Int32 nTitle = TitleHelper::TITLE_BEGIN; nTitle < TitleHelper::NORMAL_TITLE_END; nTitle++ ) @@ -152,7 +150,7 @@ AllTitleItemConverter::AllTitleItemConverter( uno::Reference< beans::XPropertySet > xObjectProperties( xTitle, uno::UNO_QUERY); m_aConverters.push_back( new ::chart::wrapper::TitleItemConverter( - xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, pRefSize)); + xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, nullptr)); } } -- cgit