From dedf0a28d52396edaf2f42cc219fba68bfe28c9f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 20 Oct 2015 11:44:54 +0200 Subject: loplugin:defaultparams Change-Id: I03541b984db147f8bd3ed35f83e297cf7eecd7f0 --- chart2/source/controller/dialogs/tp_DataSource.cxx | 4 ++-- chart2/source/inc/CommonFunctors.hxx | 2 +- chart2/source/tools/CharacterProperties.cxx | 6 +++--- chart2/source/view/charttypes/CandleStickChart.cxx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 18ff9e621f88..c8f4bf3857d6 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -259,7 +259,7 @@ DataSourceTabPage::DataSourceTabPage( m_pBTN_DOWN->SetText( OUString( cBlackDownPointingTriangle )); // init controls - m_pLB_ROLE->SetTabs( lcl_pRoleListBoxTabs, MAP_APPFONT ); + m_pLB_ROLE->SetTabs( lcl_pRoleListBoxTabs ); m_pLB_ROLE->Show(); updateControlsFromDialogModel(); @@ -327,7 +327,7 @@ bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReas //ranges may have been edited in the meanwhile (dirty is true in that case here) if( isValid() ) { - updateModelFromControl( 0 /*update all*/ ); + updateModelFromControl(); return true; //return false if this page should not be left } else diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 89041739a464..01e44d6e6f19 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -107,7 +107,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< double operator() ( const OUString & rStr ) { rtl_math_ConversionStatus eConversionStatus; - double fResult = ::rtl::math::stringToDouble( rStr, '.', ',', & eConversionStatus, NULL ); + double fResult = ::rtl::math::stringToDouble( rStr, '.', ',', & eConversionStatus ); if( eConversionStatus != rtl_math_ConversionStatus_Ok ) ::rtl::math::setNan( & fResult ); diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 6370f290a08f..b10b5c7e81e1 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -407,11 +407,11 @@ void CharacterProperties::AddDefaultsToMap( using namespace ::com::sun::star::i18n::ScriptType; LanguageType nLang; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale, false), LATIN); - vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne, 0 ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne ); nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale_CJK, false), ASIAN); - vcl::Font aFontCJK = OutputDevice::GetDefaultFont( DefaultFontType::CJK_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne, 0 ); + vcl::Font aFontCJK = OutputDevice::GetDefaultFont( DefaultFontType::CJK_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne ); nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale_CTL, false), COMPLEX); - vcl::Font aFontCTL = OutputDevice::GetDefaultFont( DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne, 0 ); + vcl::Font aFontCTL = OutputDevice::GetDefaultFont( DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_STYLE_NAME, OUString(aFont.GetStyleName()) ); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 8c974fbfc901..f2ace7821070 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -238,7 +238,7 @@ void CandleStickChart::createShapes() uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes, - PolyToPointSequence(aPoly), NULL); + PolyToPointSequence(aPoly)); setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } @@ -290,7 +290,7 @@ void CandleStickChart::createShapes() { uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes, - PolyToPointSequence(aPoly), NULL ); + PolyToPointSequence(aPoly) ); uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); if(xProp.is()) { -- cgit