diff options
author | Noel <noelgrandin@gmail.com> | 2020-11-25 08:14:07 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-30 12:32:14 +0100 |
commit | 8332d6d8200e8ca1f22dd98d9373efd5a431d09c (patch) | |
tree | dd45d452202998297b8562743ea6345462304d04 /chart2 | |
parent | d05a4cfbdcece491f7385dbeaa7eca03f2fdc1d5 (diff) |
loplugin:stringviewparam include comparisons with string literals
Change-Id: I8ba1214500dddaf413c506a4b82f43d63cda804b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106559
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 98 | ||||
-rw-r--r-- | chart2/source/controller/main/ChartController_Properties.cxx | 8 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartColorWrapper.cxx | 6 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartColorWrapper.hxx | 2 | ||||
-rw-r--r-- | chart2/source/inc/InternalDataProvider.hxx | 2 | ||||
-rw-r--r-- | chart2/source/inc/RegressionCurveHelper.hxx | 4 | ||||
-rw-r--r-- | chart2/source/tools/InternalDataProvider.cxx | 14 | ||||
-rw-r--r-- | chart2/source/tools/RegressionCurveHelper.cxx | 30 | ||||
-rw-r--r-- | chart2/source/view/inc/VDataSeries.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/main/VDataSeries.cxx | 20 |
10 files changed, 93 insertions, 93 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 1953bf9e6f59..495cc453ba04 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -978,55 +978,55 @@ void SAL_CALL ChartController::layoutEvent( namespace { -bool lcl_isFormatObjectCommand( const OUString& aCommand ) -{ - return aCommand == "MainTitle" - || aCommand == "SubTitle" - || aCommand == "XTitle" - || aCommand == "YTitle" - || aCommand == "ZTitle" - || aCommand == "SecondaryXTitle" - || aCommand == "SecondaryYTitle" - || aCommand == "AllTitles" - || aCommand == "DiagramAxisX" - || aCommand == "DiagramAxisY" - || aCommand == "DiagramAxisZ" - || aCommand == "DiagramAxisA" - || aCommand == "DiagramAxisB" - || aCommand == "DiagramAxisAll" - || aCommand == "DiagramGridXMain" - || aCommand == "DiagramGridYMain" - || aCommand == "DiagramGridZMain" - || aCommand == "DiagramGridXHelp" - || aCommand == "DiagramGridYHelp" - || aCommand == "DiagramGridZHelp" - || aCommand == "DiagramGridAll" - - || aCommand == "DiagramWall" - || aCommand == "DiagramFloor" - || aCommand == "DiagramArea" - || aCommand == "Legend" - - || aCommand == "FormatWall" - || aCommand == "FormatFloor" - || aCommand == "FormatChartArea" - || aCommand == "FormatLegend" - - || aCommand == "FormatTitle" - || aCommand == "FormatAxis" - || aCommand == "FormatDataSeries" - || aCommand == "FormatDataPoint" - || aCommand == "FormatDataLabels" - || aCommand == "FormatDataLabel" - || aCommand == "FormatXErrorBars" - || aCommand == "FormatYErrorBars" - || aCommand == "FormatMeanValue" - || aCommand == "FormatTrendline" - || aCommand == "FormatTrendlineEquation" - || aCommand == "FormatStockLoss" - || aCommand == "FormatStockGain" - || aCommand == "FormatMajorGrid" - || aCommand == "FormatMinorGrid"; +bool lcl_isFormatObjectCommand( std::u16string_view aCommand ) +{ + return aCommand == u"MainTitle" + || aCommand == u"SubTitle" + || aCommand == u"XTitle" + || aCommand == u"YTitle" + || aCommand == u"ZTitle" + || aCommand == u"SecondaryXTitle" + || aCommand == u"SecondaryYTitle" + || aCommand == u"AllTitles" + || aCommand == u"DiagramAxisX" + || aCommand == u"DiagramAxisY" + || aCommand == u"DiagramAxisZ" + || aCommand == u"DiagramAxisA" + || aCommand == u"DiagramAxisB" + || aCommand == u"DiagramAxisAll" + || aCommand == u"DiagramGridXMain" + || aCommand == u"DiagramGridYMain" + || aCommand == u"DiagramGridZMain" + || aCommand == u"DiagramGridXHelp" + || aCommand == u"DiagramGridYHelp" + || aCommand == u"DiagramGridZHelp" + || aCommand == u"DiagramGridAll" + + || aCommand == u"DiagramWall" + || aCommand == u"DiagramFloor" + || aCommand == u"DiagramArea" + || aCommand == u"Legend" + + || aCommand == u"FormatWall" + || aCommand == u"FormatFloor" + || aCommand == u"FormatChartArea" + || aCommand == u"FormatLegend" + + || aCommand == u"FormatTitle" + || aCommand == u"FormatAxis" + || aCommand == u"FormatDataSeries" + || aCommand == u"FormatDataPoint" + || aCommand == u"FormatDataLabels" + || aCommand == u"FormatDataLabel" + || aCommand == u"FormatXErrorBars" + || aCommand == u"FormatYErrorBars" + || aCommand == u"FormatMeanValue" + || aCommand == u"FormatTrendline" + || aCommand == u"FormatTrendlineEquation" + || aCommand == u"FormatStockLoss" + || aCommand == u"FormatStockGain" + || aCommand == u"FormatMajorGrid" + || aCommand == u"FormatMinorGrid"; } } // anonymous namespace diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 587cbbfc00aa..687625b89c51 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -324,7 +324,7 @@ wrapper::ItemConverter* createItemConverter( return pItemConverter; } -OUString lcl_getTitleCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel ) +OUString lcl_getTitleCIDForCommand( std::string_view rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel ) { if( rDispatchCommand == "AllTitles") return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, "ALLELEMENTS" ); @@ -347,7 +347,7 @@ OUString lcl_getTitleCIDForCommand( const OString& rDispatchCommand, const uno:: return ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ); } -OUString lcl_getAxisCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getAxisCIDForCommand( std::string_view rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) { if( rDispatchCommand == "DiagramAxisAll") return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, "ALLELEMENTS" ); @@ -380,7 +380,7 @@ OUString lcl_getAxisCIDForCommand( const OString& rDispatchCommand, const uno::R return ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, xChartModel ); } -OUString lcl_getGridCIDForCommand( const OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getGridCIDForCommand( std::string_view rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); @@ -432,7 +432,7 @@ OUString lcl_getErrorCIDForCommand( const ObjectType eDispatchType, const Object return ObjectIdentifier::createClassifiedIdentifierWithParent( eDispatchType, OUString(), rSelectedCID ); } -OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno::Reference< XChartDocument > & xChartDocument, const OUString& rSelectedCID ) +OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const uno::Reference< XChartDocument > & xChartDocument, const OUString& rSelectedCID ) { ObjectType eObjectType = OBJECTTYPE_UNKNOWN; diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index cbe7e088e313..5a809cf1436c 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -181,7 +181,7 @@ void ChartLineStyleWrapper::updateData() mpControl->statusChanged(aEvent); } -bool ChartLineStyleWrapper::operator()(const OUString& rCommand, const css::uno::Any& rValue) +bool ChartLineStyleWrapper::operator()(std::u16string_view rCommand, const css::uno::Any& rValue) { css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel); @@ -191,12 +191,12 @@ bool ChartLineStyleWrapper::operator()(const OUString& rCommand, const css::uno: return false; } - if (rCommand == ".uno:XLineStyle") + if (rCommand == u".uno:XLineStyle") { xPropSet->setPropertyValue("LineStyle", rValue); return true; } - else if (rCommand == ".uno:LineDash") + else if (rCommand == u".uno:LineDash") { XLineDashItem aDashItem; aDashItem.PutValue(rValue, 0); diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index b108eca90afe..66c880ae3ca2 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -48,7 +48,7 @@ public: ChartLineStyleWrapper(css::uno::Reference<css::frame::XModel> const & xModel, SvxLineStyleToolBoxControl* pControl); - bool operator()(const OUString& rCommand, const css::uno::Any& rValue); + bool operator()(std::u16string_view rCommand, const css::uno::Any& rValue); void updateModel(const css::uno::Reference<css::frame::XModel>& xModel); diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 7e3291f2f582..1e5821f94e6c 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -183,7 +183,7 @@ private: createDataSequenceAndAddToMap( const OUString & rRangeRepresentation ); css::uno::Reference<css::chart2::data::XDataSequence> - createDataSequenceFromArray( const OUString& rArrayStr, const OUString& rRole ); + createDataSequenceFromArray( const OUString& rArrayStr, std::u16string_view rRole ); void deleteMapReferences( const OUString & rRangeRepresentation ); diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 44bc92744dc7..83fc72e65649 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -39,7 +39,7 @@ namespace chart::RegressionCurveHelper /// returns a model regression curve css::uno::Reference<css::chart2::XRegressionCurve> - createRegressionCurveByServiceName( const OUString& aServiceName ); + createRegressionCurveByServiceName( std::u16string_view aServiceName ); OOO_DLLPUBLIC_CHARTTOOLS bool hasMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer> & xRegCnt ); @@ -114,7 +114,7 @@ namespace chart::RegressionCurveHelper /// returns a calculator object for regression curves (used by the view) OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurveCalculator> - createRegressionCurveCalculatorByServiceName( const OUString& aServiceName ); + createRegressionCurveCalculatorByServiceName( std::u16string_view aServiceName ); /** recalculates the regression parameters according to the data given in the data source. diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index c1d0008098ab..94481ce9e5f8 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -486,7 +486,7 @@ void InternalDataProvider::decreaseMapReferences( Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenceAndAddToMap( const OUString & rRangeRepresentation ) { - Reference<chart2::data::XDataSequence> xSeq = createDataSequenceFromArray(rRangeRepresentation, OUString()); + Reference<chart2::data::XDataSequence> xSeq = createDataSequenceFromArray(rRangeRepresentation, u""); if (xSeq.is()) return xSeq; @@ -496,7 +496,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenc } uno::Reference<chart2::data::XDataSequence> -InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, const OUString& rRole ) +InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, std::u16string_view rRole ) { if (rArrayStr.indexOf('{') != 0 || rArrayStr[rArrayStr.getLength()-1] != '}') { @@ -562,8 +562,8 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co aRawElems.push_back(aElem); } - if (rRole == "values-y" || rRole == "values-first" || rRole == "values-last" || - rRole == "values-min" || rRole == "values-max" || rRole == "values-size") + if (rRole == u"values-y" || rRole == u"values-first" || rRole == u"values-last" || + rRole == u"values-min" || rRole == u"values-max" || rRole == u"values-size") { // Column values. Append a new data column and populate it. @@ -584,7 +584,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co xSeq.set(new UncachedDataSequence(this, aRangeRep)); addDataSequenceToMap(aRangeRep, xSeq); } - else if (rRole == "values-x") + else if (rRole == u"values-x") { std::vector<double> aValues; aValues.reserve(aRawElems.size()); @@ -611,7 +611,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co xSeq.set(new UncachedDataSequence(this, aRangeRep)); addDataSequenceToMap(aRangeRep, xSeq); } - else if (rRole == "categories") + else if (rRole == u"categories") { // Category labels. @@ -624,7 +624,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co xSeq.set(new UncachedDataSequence(this, lcl_aCategoriesRangeName)); addDataSequenceToMap(lcl_aCategoriesRangeName, xSeq); } - else if (rRole == "label") + else if (rRole == u"label") { // Data series label. There should be only one element. This always // goes to the last data column. diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 47f6a4b0ebfe..66f56725133b 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -91,32 +91,32 @@ Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine() } Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName( - const OUString& aServiceName ) + std::u16string_view aServiceName ) { Reference< XRegressionCurve > xResult; // todo: use factory methods with service name - if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) + if( aServiceName == u"com.sun.star.chart2.LinearRegressionCurve" ) { xResult.set( new LinearRegressionCurve ); } - else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.LogarithmicRegressionCurve" ) { xResult.set( new LogarithmicRegressionCurve ); } - else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.ExponentialRegressionCurve" ) { xResult.set( new ExponentialRegressionCurve ); } - else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.PotentialRegressionCurve" ) { xResult.set( new PotentialRegressionCurve ); } - else if( aServiceName == "com.sun.star.chart2.PolynomialRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.PolynomialRegressionCurve" ) { xResult.set( new PolynomialRegressionCurve ); } - else if( aServiceName == "com.sun.star.chart2.MovingAverageRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.MovingAverageRegressionCurve" ) { xResult.set( new MovingAverageRegressionCurve ); } @@ -125,36 +125,36 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ } Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( - const OUString& aServiceName ) + std::u16string_view aServiceName ) { Reference< XRegressionCurveCalculator > xResult; // todo: use factory methods with service name - if( aServiceName == "com.sun.star.chart2.MeanValueRegressionCurve" ) + if( aServiceName == u"com.sun.star.chart2.MeanValueRegressionCurve" ) { xResult.set( new MeanValueRegressionCurveCalculator() ); } - if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) + if( aServiceName == u"com.sun.star.chart2.LinearRegressionCurve" ) { xResult.set( new LinearRegressionCurveCalculator() ); } - else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.LogarithmicRegressionCurve" ) { xResult.set( new LogarithmicRegressionCurveCalculator() ); } - else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.ExponentialRegressionCurve" ) { xResult.set( new ExponentialRegressionCurveCalculator() ); } - else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.PotentialRegressionCurve" ) { xResult.set( new PotentialRegressionCurveCalculator() ); } - else if( aServiceName == "com.sun.star.chart2.PolynomialRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.PolynomialRegressionCurve" ) { xResult.set( new PolynomialRegressionCurveCalculator() ); } - else if( aServiceName == "com.sun.star.chart2.MovingAverageRegressionCurve" ) + else if( aServiceName == u"com.sun.star.chart2.MovingAverageRegressionCurve" ) { xResult.set( new MovingAverageRegressionCurveCalculator() ); } diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index f95f4f1ba98f..cc6943f2d51a 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -137,7 +137,7 @@ public: void setStartingAngle( sal_Int32 nStartingAngle ); sal_Int32 getStartingAngle() const; - void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ); + void setRoleOfSequenceForDataLabelNumberFormatDetection( std::u16string_view rRole ); //this is only temporarily here for area chart: css::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D; diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 22e23d27dc80..d9bb82e8c30c 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -570,21 +570,21 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor xPointProp->getPropertyValue(aPropName) >>= nNumberFormat; return nNumberFormat; } -void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ) +void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( std::u16string_view rRole ) { - if (rRole == "values-y") + if (rRole == u"values-y") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y; - else if (rRole == "values-size") + else if (rRole == u"values-size") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Bubble_Size; - else if (rRole == "values-min") + else if (rRole == u"values-min") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y_Min; - else if (rRole == "values-max") + else if (rRole == u"values-max") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y_Max; - else if (rRole == "values-first") + else if (rRole == u"values-first") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y_First; - else if (rRole == "values-last") + else if (rRole == u"values-last") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y_Last; - else if (rRole == "values-x") + else if (rRole == u"values-x") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_X; } sal_Int32 VDataSeries::detectNumberFormatKey( sal_Int32 index ) const @@ -771,7 +771,7 @@ double VDataSeries::getXMeanValue() const { if( std::isnan( m_fXMeanValue ) ) { - uno::Reference< XRegressionCurveCalculator > xCalculator( RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( "com.sun.star.chart2.MeanValueRegressionCurve" ) ); + uno::Reference< XRegressionCurveCalculator > xCalculator( RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( u"com.sun.star.chart2.MeanValueRegressionCurve" ) ); uno::Sequence< double > aXValuesDummy; xCalculator->recalculateRegression( aXValuesDummy, getAllX() ); m_fXMeanValue = xCalculator->getCurveValue( 1.0 ); @@ -784,7 +784,7 @@ double VDataSeries::getYMeanValue() const if( std::isnan( m_fYMeanValue ) ) { uno::Reference< XRegressionCurveCalculator > xCalculator( - RegressionCurveHelper::createRegressionCurveCalculatorByServiceName("com.sun.star.chart2.MeanValueRegressionCurve")); + RegressionCurveHelper::createRegressionCurveCalculatorByServiceName(u"com.sun.star.chart2.MeanValueRegressionCurve")); uno::Sequence< double > aXValuesDummy; xCalculator->recalculateRegression( aXValuesDummy, getAllY() ); m_fYMeanValue = xCalculator->getCurveValue( 1.0 ); |