From 2d447ddc7a46cb6eb475238df1e0b9d10f1e9c06 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Jul 2019 17:58:03 +0200 Subject: Improved loplugin:stringconstant (now that GCC 7 supports it): chart2 Change-Id: I9fb8e2853b5ddb1f9fe589f4e47828025ea52915 Reviewed-on: https://gerrit.libreoffice.org/76692 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- chart2/qa/extras/chart2dump/chart2dump.cxx | 4 ++-- .../controller/accessibility/AccessibleBase.cxx | 2 +- .../accessibility/AccessibleChartElement.cxx | 2 +- .../accessibility/AccessibleChartShape.cxx | 2 +- .../controller/chartapiwrapper/AreaWrapper.cxx | 4 ++-- .../controller/chartapiwrapper/AxisWrapper.cxx | 4 ++-- .../chartapiwrapper/ChartDataWrapper.cxx | 2 +- .../chartapiwrapper/ChartDocumentWrapper.cxx | 2 +- .../chartapiwrapper/DataSeriesPointWrapper.cxx | 2 +- .../controller/chartapiwrapper/DiagramWrapper.cxx | 24 +++++++++++----------- .../controller/chartapiwrapper/GridWrapper.cxx | 2 +- .../controller/chartapiwrapper/LegendWrapper.cxx | 4 ++-- .../chartapiwrapper/MinMaxLineWrapper.cxx | 2 +- .../controller/chartapiwrapper/TitleWrapper.cxx | 4 ++-- .../chartapiwrapper/UpDownBarWrapper.cxx | 2 +- .../chartapiwrapper/WallFloorWrapper.cxx | 2 +- .../controller/dialogs/dlg_ChartType_UNO.cxx | 2 +- .../controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 +- chart2/source/controller/main/ChartController.cxx | 20 +++++++++--------- chart2/source/controller/main/ChartFrameloader.cxx | 2 +- chart2/source/controller/main/ElementSelector.cxx | 2 +- .../source/controller/main/ToolbarController.cxx | 2 +- .../controller/sidebar/Chart2PanelFactory.cxx | 2 +- chart2/source/controller/uitest/uiobject.cxx | 4 ++-- chart2/source/model/filter/XMLFilter.cxx | 4 ++-- chart2/source/model/inc/XMLFilter.hxx | 2 +- chart2/source/model/main/Axis.cxx | 2 +- .../model/main/CartesianCoordinateSystem.cxx | 10 ++++----- chart2/source/model/main/ChartModel.cxx | 2 +- chart2/source/model/main/DataPoint.cxx | 2 +- chart2/source/model/main/DataSeries.cxx | 2 +- chart2/source/model/main/Diagram.cxx | 2 +- chart2/source/model/main/FormattedString.cxx | 2 +- chart2/source/model/main/GridProperties.cxx | 2 +- chart2/source/model/main/Legend.cxx | 2 +- chart2/source/model/main/PageBackground.cxx | 2 +- chart2/source/model/main/PolarCoordinateSystem.cxx | 10 ++++----- chart2/source/model/main/Title.cxx | 2 +- chart2/source/model/template/AreaChartType.cxx | 4 ++-- chart2/source/model/template/BarChartType.cxx | 4 ++-- chart2/source/model/template/BubbleChartType.cxx | 6 +++--- .../source/model/template/CandleStickChartType.cxx | 6 +++--- chart2/source/model/template/ChartType.cxx | 2 +- chart2/source/model/template/ChartTypeManager.cxx | 2 +- chart2/source/model/template/ColumnChartType.cxx | 4 ++-- chart2/source/model/template/DataInterpreter.cxx | 2 +- .../source/model/template/FilledNetChartType.cxx | 4 ++-- chart2/source/model/template/LineChartType.cxx | 4 ++-- chart2/source/model/template/NetChartType.cxx | 4 ++-- chart2/source/model/template/PieChartType.cxx | 4 ++-- chart2/source/model/template/ScatterChartType.cxx | 4 ++-- chart2/source/tools/CachedDataSequence.cxx | 2 +- chart2/source/tools/ConfigColorScheme.cxx | 2 +- chart2/source/tools/DataSource.cxx | 2 +- chart2/source/tools/ErrorBar.cxx | 2 +- chart2/source/tools/InternalDataProvider.cxx | 8 ++++---- chart2/source/tools/LabeledDataSequence.cxx | 2 +- .../tools/MeanValueRegressionCurveCalculator.cxx | 2 +- chart2/source/tools/ObjectIdentifier.cxx | 2 +- chart2/source/tools/RegressionCurveCalculator.cxx | 2 +- chart2/source/tools/RegressionCurveModel.cxx | 14 ++++++------- chart2/source/tools/RegressionEquation.cxx | 2 +- chart2/source/tools/Scaling.cxx | 16 +++++++-------- chart2/source/tools/UncachedDataSequence.cxx | 2 +- chart2/source/view/axes/DateScaling.cxx | 8 ++++---- chart2/source/view/main/ChartView.cxx | 2 +- 66 files changed, 132 insertions(+), 132 deletions(-) diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index a2474a2a3453..5a467dbd448f 100644 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -32,7 +32,7 @@ #define DECLARE_DUMP_TEST(TestName, BaseClass, DumpMode) \ class TestName : public BaseClass { \ protected:\ - virtual OUString getTestName() override { return OUString(#TestName); } \ + virtual OUString getTestName() override { return #TestName; } \ public:\ TestName() : BaseClass(DumpMode) {}; \ CPPUNIT_TEST_SUITE(TestName); \ @@ -107,7 +107,7 @@ protected: virtual OUString getTestName() { return OUString(); } OUString const & getTestFileName() { return m_sTestFileName; } - OUString getTestFileDirName() { return OUString("/chart2/qa/extras/chart2dump/data/"); } + OUString getTestFileDirName() { return "/chart2/qa/extras/chart2dump/data/"; } OUString getReferenceDirName() { return "/chart2/qa/extras/chart2dump/reference/" + getTestName().toAsciiLowerCase() + "/"; diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index a42792a67d88..e404d48a28d0 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -810,7 +810,7 @@ Color AccessibleBase::getColor( eColorType eColType ) // ________ AccessibleBase::XServiceInfo ________ OUString SAL_CALL AccessibleBase::getImplementationName() { - return OUString( "AccessibleBase" ); + return "AccessibleBase"; } sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 31619177aedb..89a5c1cd14bd 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -141,7 +141,7 @@ sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const // ________ XServiceInfo ________ OUString SAL_CALL AccessibleChartElement::getImplementationName() { - return OUString( "AccessibleChartElement" ); + return "AccessibleChartElement"; } // ________ AccessibleChartElement::XAccessibleContext (override) ________ diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 6b751a369d24..cba557c683d7 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -75,7 +75,7 @@ AccessibleChartShape::~AccessibleChartShape() // ________ XServiceInfo ________ OUString AccessibleChartShape::getImplementationName() { - return OUString( "AccessibleChartShape" ); + return "AccessibleChartShape"; } // ________ XAccessibleContext ________ diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index e1caf55e8237..9948a284eb18 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -106,7 +106,7 @@ void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AreaWrapper::getShapeType() { - return OUString( "com.sun.star.chart.ChartArea" ); + return "com.sun.star.chart.ChartArea"; } // ____ XComponent ____ @@ -157,7 +157,7 @@ std::vector< std::unique_ptr > AreaWrapper::createWrappedProper OUString SAL_CALL AreaWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.Area"); + return "com.sun.star.comp.chart.Area"; } sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index c84037422de3..fd28c36a4ff7 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -476,7 +476,7 @@ void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AxisWrapper::getShapeType() { - return OUString("com.sun.star.chart.ChartAxis"); + return "com.sun.star.chart.ChartAxis"; } // ____ XNumberFormatsSupplier ____ @@ -643,7 +643,7 @@ std::vector< std::unique_ptr > AxisWrapper::createWrappedProper OUString SAL_CALL AxisWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.Axis"); + return "com.sun.star.comp.chart.Axis"; } sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 80b9ed8a77dd..5696d6b5c3f4 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -672,7 +672,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) OUString SAL_CALL ChartDataWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.ChartData"); + return "com.sun.star.comp.chart.ChartData"; } sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index c0d3f469cad0..046f8bd87ea4 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1410,7 +1410,7 @@ std::vector< std::unique_ptr > ChartDocumentWrapper::createWrap OUString SAL_CALL ChartDocumentWrapper::getImplementationName() { - return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME); + return CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 813a51196def..09ccd200521f 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -831,7 +831,7 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.DataSeries"); + return "com.sun.star.comp.chart.DataSeries"; } sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 52e4c202a512..3ba2fe5323db 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -477,11 +477,11 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "Area" "StackedArea" "PercentStackedArea" "ThreeDArea" // "StackedThreeDArea" "PercentStackedThreeDArea" if( aName.indexOf( "Area" ) != -1 ) - return OUString("com.sun.star.chart.AreaDiagram"); + return "com.sun.star.chart.AreaDiagram"; // "Pie" "PieAllExploded" "ThreeDPie" "ThreeDPieAllExploded" if( aName.indexOf( "Pie" ) != -1 ) - return OUString("com.sun.star.chart.PieDiagram"); + return "com.sun.star.chart.PieDiagram"; // "Column" "StackedColumn" "PercentStackedColumn" "ThreeDColumnDeep" // "ThreeDColumnFlat" "StackedThreeDColumnFlat" @@ -490,33 +490,33 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "StackedThreeDBarFlat" "PercentStackedThreeDBarFlat" "ColumnWithLine" // "StackedColumnWithLine" if( aName.indexOf( "Column" ) != -1 || aName.indexOf( "Bar" ) != -1 ) - return OUString( "com.sun.star.chart.BarDiagram" ); + return "com.sun.star.chart.BarDiagram"; // "Donut" "DonutAllExploded" "ThreeDDonut" "ThreeDDonutAllExploded" if( aName.indexOf( "Donut" ) != -1 ) - return OUString( "com.sun.star.chart.DonutDiagram" ); + return "com.sun.star.chart.DonutDiagram"; // "ScatterLineSymbol" "ScatterLine" "ScatterSymbol" "ThreeDScatter" if( aName.indexOf( "Scatter" ) != -1 ) - return OUString( "com.sun.star.chart.XYDiagram" ); + return "com.sun.star.chart.XYDiagram"; // "FilledNet" "StackedFilledNet" "PercentStackedFilledNet" if( aName.indexOf( "FilledNet" ) != -1 ) - return OUString( "com.sun.star.chart.FilledNetDiagram" ); + return "com.sun.star.chart.FilledNetDiagram"; // "Net" "NetSymbol" "NetLine" "StackedNet" "StackedNetSymbol" // "StackedNetLine" "PercentStackedNet" "PercentStackedNetSymbol" // "PercentStackedNetLine" if( aName.indexOf( "Net" ) != -1 ) - return OUString( "com.sun.star.chart.NetDiagram" ); + return "com.sun.star.chart.NetDiagram"; // "StockLowHighClose" "StockOpenLowHighClose" "StockVolumeLowHighClose" // "StockVolumeOpenLowHighClose" if( aName.indexOf( "Stock" ) != -1 ) - return OUString( "com.sun.star.chart.StockDiagram" ); + return "com.sun.star.chart.StockDiagram"; if( aName.indexOf( "Bubble" ) != -1 ) - return OUString( "com.sun.star.chart.BubbleDiagram" ); + return "com.sun.star.chart.BubbleDiagram"; // Note: this must be checked after Bar, Net and Scatter @@ -525,7 +525,7 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "PercentStackedLineSymbol" "ThreeDLine" "StackedThreeDLine" // "PercentStackedThreeDLine" "ThreeDLineDeep" if( aName.indexOf( "Line" ) != -1 || aName.indexOf( "Symbol" ) != -1 ) - return OUString( "com.sun.star.chart.LineDiagram" ); + return "com.sun.star.chart.LineDiagram"; OSL_FAIL( "unknown template" ); } @@ -729,7 +729,7 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL DiagramWrapper::getShapeType() { - return OUString( "com.sun.star.chart.Diagram" ); + return "com.sun.star.chart.Diagram"; } // ____ XDiagramPositioning ____ @@ -1869,7 +1869,7 @@ std::vector< std::unique_ptr > DiagramWrapper::createWrappedPro OUString SAL_CALL DiagramWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.Diagram"); + return "com.sun.star.comp.chart.Diagram"; } sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index c699e51db73a..aee6ad0aa672 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -166,7 +166,7 @@ std::vector< std::unique_ptr > GridWrapper::createWrappedProper OUString SAL_CALL GridWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.Grid"); + return "com.sun.star.comp.chart.Grid"; } sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 038015c12257..994dfcd034e4 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -314,7 +314,7 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL LegendWrapper::getShapeType() { - return OUString( "com.sun.star.chart.ChartLegend" ); + return "com.sun.star.chart.ChartLegend"; } // ____ XComponent ____ @@ -398,7 +398,7 @@ std::vector< std::unique_ptr > LegendWrapper::createWrappedProp OUString SAL_CALL LegendWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.Legend"); + return "com.sun.star.comp.chart.Legend"; } sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index f7edd83c45ab..f38ff93c9bef 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -377,7 +377,7 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const OUString SAL_CALL MinMaxLineWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.ChartLine"); + return "com.sun.star.comp.chart.ChartLine"; } sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index d46cc6c9ce01..8a30633ac935 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -232,7 +232,7 @@ void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL TitleWrapper::getShapeType() { - return OUString( "com.sun.star.chart.ChartTitle" ); + return "com.sun.star.chart.ChartTitle"; } // ____ XComponent ____ @@ -482,7 +482,7 @@ std::vector< std::unique_ptr > TitleWrapper::createWrappedPrope OUString SAL_CALL TitleWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.Title"); + return "com.sun.star.comp.chart.Title"; } sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index ecc5ebbe4a92..0343c29530a8 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -344,7 +344,7 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const OUString SAL_CALL UpDownBarWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.ChartArea"); + return "com.sun.star.comp.chart.ChartArea"; } sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 5d70880fe1c2..b95872fb4146 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -148,7 +148,7 @@ std::vector< std::unique_ptr > WallFloorWrapper::createWrappedP OUString SAL_CALL WallFloorWrapper::getImplementationName() { - return OUString("com.sun.star.comp.chart.WallOrFloor"); + return "com.sun.star.comp.chart.WallOrFloor"; } sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 9f6cfc4dc738..1b2aa97aa766 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -47,7 +47,7 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() // lang::XServiceInfo OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() { - return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME); + return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME; } css::uno::Sequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 000719180956..9234a58bca78 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -52,7 +52,7 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() // lang::XServiceInfo OUString SAL_CALL CreationWizardUnoDlg::getImplementationName() { - return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME); + return CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 7a03d2c67992..fb3c659077c4 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -280,43 +280,43 @@ OUString ChartController::GetContextName() uno::Any aAny = getSelection(); if (!aAny.hasValue()) - return OUString("Chart"); + return "Chart"; OUString aCID; aAny >>= aCID; if (aCID.isEmpty()) - return OUString("Chart"); + return "Chart"; ObjectType eObjectID = ObjectIdentifier::getObjectType(aCID); switch (eObjectID) { case OBJECTTYPE_DATA_SERIES: - return OUString("Series"); + return "Series"; break; case OBJECTTYPE_DATA_ERRORS_X: case OBJECTTYPE_DATA_ERRORS_Y: case OBJECTTYPE_DATA_ERRORS_Z: - return OUString("ErrorBar"); + return "ErrorBar"; case OBJECTTYPE_AXIS: - return OUString("Axis"); + return "Axis"; case OBJECTTYPE_GRID: - return OUString("Grid"); + return "Grid"; case OBJECTTYPE_DIAGRAM: { css::uno::Reference xChartType = getChartType(css::uno::Reference(getModel(), uno::UNO_QUERY)); if (xChartType.is() && xChartType->getChartType() == "com.sun.star.chart2.PieChartType") - return OUString("ChartElements"); + return "ChartElements"; break; } case OBJECTTYPE_DATA_CURVE: case OBJECTTYPE_DATA_AVERAGE_LINE: - return OUString("Trendline"); + return "Trendline"; default: break; } - return OUString("Chart"); + return "Chart"; } // private methods @@ -338,7 +338,7 @@ bool ChartController::impl_isDisposedOrSuspended() const OUString SAL_CALL ChartController::getImplementationName() { - return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME); + return CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index ca9adb6e3607..c03a3f6b619e 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -57,7 +57,7 @@ bool ChartFrameLoader::impl_checkCancel() OUString SAL_CALL ChartFrameLoader::getImplementationName() { - return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME); + return CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 03ae95147c27..8ff8f2039abe 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -237,7 +237,7 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible() OUString SAL_CALL ElementSelectorToolbarController::getImplementationName() { - return OUString(lcl_aServiceName); + return lcl_aServiceName; } sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx index fa2a07032ed2..174e3964692c 100644 --- a/chart2/source/controller/main/ToolbarController.cxx +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -100,7 +100,7 @@ void ChartToolbarController::update() OUString ChartToolbarController::getImplementationName() { - return OUString("org.libreoffice.chart2.Chart2ToolboxController"); + return "org.libreoffice.chart2.Chart2ToolboxController"; } sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName) diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index 5bd9fb34de68..005aff6ebd5c 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -119,7 +119,7 @@ Reference SAL_CALL ChartPanelFactory::createUIElement ( OUString ChartPanelFactory::getImplementationName() { - return OUString("org.libreoffice.comp.chart2.sidebar.ChartPanelFactory"); + return "org.libreoffice.comp.chart2.sidebar.ChartPanelFactory"; } sal_Bool ChartPanelFactory::supportsService(OUString const & ServiceName) diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx index 0bc697a4daf7..0672b1bc26a7 100644 --- a/chart2/source/controller/uitest/uiobject.cxx +++ b/chart2/source/controller/uitest/uiobject.cxx @@ -92,7 +92,7 @@ std::set ChartUIObject::get_children() const OUString ChartUIObject::get_type() const { - return OUString("ChartUIObject for type: "); + return "ChartUIObject for type: "; } ChartWindowUIObject::ChartWindowUIObject(const VclPtr& xChartWindow): @@ -195,7 +195,7 @@ std::unique_ptr ChartWindowUIObject::create(vcl::Window* pWindow) OUString ChartWindowUIObject::get_name() const { - return OUString("ChartWindowUIObject"); + return "ChartWindowUIObject"; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index ebca2a63bc86..694bba9ec5c6 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -738,7 +738,7 @@ OUString XMLFilter::getMediaType(bool _bOasis) OUString SAL_CALL XMLFilter::getImplementationName() { - return OUString("com.sun.star.comp.chart2.XMLFilter"); + return "com.sun.star.comp.chart2.XMLFilter"; } sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName ) @@ -764,7 +764,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > } OUString XMLReportFilterHelper::getMediaType(bool ) { - return OUString(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII); + return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII; } } // namespace chart diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 4f10f1ffbbd4..22b5a40a8077 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -146,7 +146,7 @@ protected: virtual OUString SAL_CALL getImplementationName() override { - return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); + return "com.sun.star.comp.chart2.report.XMLFilter"; } // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 39f44bf4ee5c..b7e19a49e548 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -596,7 +596,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Axis::getImplementationName() { - return OUString("com.sun.star.comp.chart2.Axis"); + return "com.sun.star.comp.chart2.Axis"; } sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 4a76823ff1aa..2549720ed0d8 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -55,12 +55,12 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType() { - return OUString(CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME); + return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; } OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName() { - return OUString(CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME); + return CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME; } // ____ XCloneable ____ @@ -72,7 +72,7 @@ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClo // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem::getImplementationName() { - return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem"); + return "com.sun.star.comp.chart.CartesianCoordinateSystem"; } sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rServiceName ) @@ -97,7 +97,7 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName() { - return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d"); + return "com.sun.star.comp.chart2.CartesianCoordinateSystem2d"; } sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName ) @@ -125,7 +125,7 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName() { - return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d"); + return "com.sun.star.comp.chart2.CartesianCoordinateSystem3d"; } sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 23af9372f44d..75109a20f79e 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -298,7 +298,7 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV OUString SAL_CALL ChartModel::getImplementationName() { - return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME); + return CHART_MODEL_SERVICE_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 8d7e42c0bff5..6e9f6d483ccc 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -270,7 +270,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataPoint::getImplementationName() { - return OUString("com.sun.star.comp.chart.DataPoint") ; + return "com.sun.star.comp.chart.DataPoint" ; } sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 6fdc432a5aab..26226172bf43 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -537,7 +537,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataSeries::getImplementationName() { - return OUString("com.sun.star.comp.chart.DataSeries"); + return "com.sun.star.comp.chart.DataSeries"; } sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index c41bfe42c981..0b9efc80f794 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -676,7 +676,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Diagram::getImplementationName() { - return OUString("com.sun.star.comp.chart2.Diagram"); + return "com.sun.star.comp.chart2.Diagram"; } sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index f7d34282137b..7ace8d2f4e3c 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -256,7 +256,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL FormattedString::getImplementationName() { - return OUString("com.sun.star.comp.chart.FormattedString"); + return "com.sun.star.comp.chart.FormattedString"; } sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index a05169c24933..a7fb5be85f6d 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -216,7 +216,7 @@ void GridProperties::firePropertyChangeEvent() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL GridProperties::getImplementationName() { - return OUString("com.sun.star.comp.chart2.GridProperties"); + return "com.sun.star.comp.chart2.GridProperties"; } sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 6648826caf50..654ccc45cbcd 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -268,7 +268,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Legend::getImplementationName() { - return OUString("com.sun.star.comp.chart2.Legend"); + return "com.sun.star.comp.chart2.Legend"; } sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 6a0c30d7e566..2dec38051d46 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -199,7 +199,7 @@ void PageBackground::firePropertyChangeEvent() OUString SAL_CALL PageBackground::getImplementationName() { - return OUString("com.sun.star.comp.chart2.PageBackground"); + return "com.sun.star.comp.chart2.PageBackground"; } sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 032ebfa001d3..151f31036e13 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -54,12 +54,12 @@ PolarCoordinateSystem::~PolarCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() { - return OUString(CHART2_COOSYSTEM_POLAR_SERVICE_NAME); + return CHART2_COOSYSTEM_POLAR_SERVICE_NAME; } OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() { - return OUString(CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME); + return CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME; } // ____ XCloneable ____ @@ -71,7 +71,7 @@ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem::getImplementationName() { - return OUString("com.sun.star.comp.chart.PolarCoordinateSystem"); + return "com.sun.star.comp.chart.PolarCoordinateSystem"; } sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServiceName ) @@ -96,7 +96,7 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName() { - return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ; + return "com.sun.star.comp.chart2.PolarCoordinateSystem2d" ; } sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rServiceName ) @@ -123,7 +123,7 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName() { - return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d"); + return "com.sun.star.comp.chart2.PolarCoordinateSystem3d"; } sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 652b99bc94f6..256199a99b5d 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -355,7 +355,7 @@ void Title::fireModifyEvent() OUString SAL_CALL Title::getImplementationName() { - return OUString("com.sun.star.comp.chart2.Title"); + return "com.sun.star.comp.chart2.Title"; } sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index fb3131f052dc..947c885cee84 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -47,12 +47,12 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone() // ____ XChartType ____ OUString SAL_CALL AreaChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA); + return CHART2_SERVICE_NAME_CHARTTYPE_AREA; } OUString SAL_CALL AreaChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.AreaChartType"); + return "com.sun.star.comp.chart.AreaChartType"; } sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 14c36251efbd..4c5511c100f3 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -48,7 +48,7 @@ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone() // ____ XChartType ____ OUString SAL_CALL BarChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BAR); + return CHART2_SERVICE_NAME_CHARTTYPE_BAR; } uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() @@ -62,7 +62,7 @@ uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() OUString SAL_CALL BarChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.BarChartType"); + return "com.sun.star.comp.chart.BarChartType"; } sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 185eb7d46704..4abdbb826467 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -142,7 +142,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL OUString SAL_CALL BubbleChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE); + return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() @@ -165,7 +165,7 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles() OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() { - return OUString("values-size"); + return "values-size"; } // ____ OPropertySet ____ @@ -192,7 +192,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS OUString SAL_CALL BubbleChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.BubbleChartType"); + return "com.sun.star.comp.chart.BubbleChartType"; } sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 50de726e796c..606d51a6c035 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -209,7 +209,7 @@ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone() // ____ XChartType ____ OUString SAL_CALL CandleStickChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK); + return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; } uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() @@ -259,7 +259,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() { - return OUString("values-last"); + return "values-last"; } // ____ OPropertySet ____ @@ -314,7 +314,7 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( OUString SAL_CALL CandleStickChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.CandleStickChartType") ; + return "com.sun.star.comp.chart.CandleStickChartType" ; } sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index c863a55ef929..4edda932cfec 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -116,7 +116,7 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedPropertyRoles() OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() { - return OUString("values-y"); + return "values-y"; } void ChartType::impl_addDataSeriesWithoutNotification( diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 3634e075d8d8..c0bcc0a03d33 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -579,7 +579,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() // ____ XServiceInfo ____ OUString SAL_CALL ChartTypeManager::getImplementationName() { - return OUString("com.sun.star.comp.chart.ChartTypeManager"); + return "com.sun.star.comp.chart.ChartTypeManager"; } sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index cc4e5950052e..4cf39ed145de 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -144,7 +144,7 @@ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone() // ____ XChartType ____ OUString SAL_CALL ColumnChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN); + return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; } uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles() @@ -179,7 +179,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS OUString SAL_CALL ColumnChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.ColumnChartType"); + return "com.sun.star.comp.chart.ColumnChartType"; } sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index e90b2f083ace..8fa5ea448bf1 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -372,7 +372,7 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & OUString SAL_CALL DataInterpreter::getImplementationName() { - return OUString("com.sun.star.comp.chart2.DataInterpreter"); + return "com.sun.star.comp.chart2.DataInterpreter"; } sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 7739ab090b11..19e49a2365d0 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -51,12 +51,12 @@ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone() // ____ XChartType ____ OUString SAL_CALL FilledNetChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET); + return CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; } OUString SAL_CALL FilledNetChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.FilledNetChartType"); + return "com.sun.star.comp.chart.FilledNetChartType"; } sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index bf8d8dbe396f..538bf1cb5cf1 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -154,7 +154,7 @@ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone() // ____ XChartType ____ OUString SAL_CALL LineChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_LINE); + return CHART2_SERVICE_NAME_CHARTTYPE_LINE; } // ____ OPropertySet ____ @@ -180,7 +180,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet OUString SAL_CALL LineChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.LineChartType"); + return "com.sun.star.comp.chart.LineChartType"; } sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 8099bfa05eb7..95de304b6ae1 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -150,12 +150,12 @@ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone() // ____ XChartType ____ OUString SAL_CALL NetChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_NET); + return CHART2_SERVICE_NAME_CHARTTYPE_NET; } OUString SAL_CALL NetChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.NetChartType"); + return "com.sun.star.comp.chart.NetChartType"; } sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index a05103940355..c18c8d11d376 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -142,7 +142,7 @@ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone() // ____ XChartType ____ OUString SAL_CALL PieChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_PIE); + return CHART2_SERVICE_NAME_CHARTTYPE_PIE; } Reference< chart2::XCoordinateSystem > SAL_CALL @@ -213,7 +213,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI OUString SAL_CALL PieChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.PieChartType"); + return "com.sun.star.comp.chart.PieChartType"; } sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index fb73766efb75..10798f9bd455 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -187,7 +187,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL OUString SAL_CALL ScatterChartType::getChartType() { - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER); + return CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; } uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() @@ -223,7 +223,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty OUString SAL_CALL ScatterChartType::getImplementationName() { - return OUString("com.sun.star.comp.chart.ScatterChartType"); + return "com.sun.star.comp.chart.ScatterChartType"; } sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 78641ccb9011..95777aa0e560 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -245,7 +245,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet OUString SAL_CALL CachedDataSequence::getImplementationName() { - return OUString(lcl_aServiceName); + return lcl_aServiceName; } sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index c833a311c056..1618733aa15c 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -165,7 +165,7 @@ void ConfigColorScheme::notify( const OUString & rPropertyName ) OUString SAL_CALL ConfigColorScheme::getImplementationName() { - return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ; + return "com.sun.star.comp.chart2.ConfigDefaultColorScheme" ; } sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 9161a5ae2e4f..284427cd358f 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -56,7 +56,7 @@ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLab OUString SAL_CALL DataSource::getImplementationName() { - return OUString("com.sun.star.comp.chart.DataSource"); + return "com.sun.star.comp.chart.DataSource"; } sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index f03887dc25d1..d605c7b07c8e 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -455,7 +455,7 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL E OUString SAL_CALL ErrorBar::getImplementationName() { - return OUString(lcl_aServiceName); + return lcl_aServiceName; } sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index c520760fa557..acce76d5ea19 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -1230,7 +1230,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM if( !aRange.aLowerRight.bIsEmpty && ( aRange.aUpperLeft.nColumn != aRange.aLowerRight.nColumn ) && ( aRange.aUpperLeft.nRow != aRange.aLowerRight.nRow ) ) - return OUString(lcl_aCompleteRange); + return lcl_aCompleteRange; // attention: this data provider has the limitation that it stores // internally if data comes from columns or rows. It is intended for @@ -1241,7 +1241,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM if( m_bDataInColumns ) { if( aRange.aUpperLeft.nColumn == 0 ) - return OUString(lcl_aCategoriesRangeName); + return lcl_aCategoriesRangeName; if( aRange.aUpperLeft.nRow == 0 ) return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nColumn - 1 ); @@ -1250,7 +1250,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM // data in rows if( aRange.aUpperLeft.nRow == 0 ) - return OUString(lcl_aCategoriesRangeName); + return lcl_aCategoriesRangeName; if( aRange.aUpperLeft.nColumn == 0 ) return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nRow - 1 ); @@ -1498,7 +1498,7 @@ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() OUString SAL_CALL InternalDataProvider::getImplementationName() { // note: in xmloff this name is used to indicate usage of own data - return OUString("com.sun.star.comp.chart.InternalDataProvider"); + return "com.sun.star.comp.chart.InternalDataProvider"; } sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 7c9944b283f3..bd945715db12 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -146,7 +146,7 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: OUString SAL_CALL LabeledDataSequence::getImplementationName() { - return OUString("com.sun.star.comp.chart2.LabeledDataSequence"); + return "com.sun.star.comp.chart2.LabeledDataSequence"; } sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 43088acc364a..5d98e8c563c1 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -118,7 +118,7 @@ OUString MeanValueRegressionCurveCalculator::ImplGetRepresentation( { *pFormulaLength -= aBuf.getLength(); if ( *pFormulaLength <= 0 ) - return OUString("###"); + return "###"; } return ( aBuf + getFormattedString( xNumFormatter, nNumberFormatKey, m_fMeanValue, pFormulaLength ) ); } diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index cfd7bb4cedec..0346b9be91f8 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -504,7 +504,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles( OUString ObjectIdentifier::createParticleForDiagram() { //TODO: if more than one diagram is implemented, add the correct diagram index here - return OUString("D=0"); + return "D=0"; } OUString ObjectIdentifier::createParticleForCoordinateSystem( diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index f3570114551e..cd6fd9d182be 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -86,7 +86,7 @@ OUString RegressionCurveCalculator::getFormattedString( double fNumber, const sal_Int32* pStringLength /* = nullptr */ ) { if ( pStringLength && *pStringLength <= 0 ) - return OUString("###"); + return "###"; OUString aResult; if( xNumFormatter.is() ) diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 618c924dd41b..6afde52ea193 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -226,19 +226,19 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() switch( m_eRegressionCurveType ) { case CURVE_TYPE_MEAN_VALUE: - return OUString("com.sun.star.chart2.MeanValueRegressionCurve"); + return "com.sun.star.chart2.MeanValueRegressionCurve"; case CURVE_TYPE_LINEAR: - return OUString("com.sun.star.chart2.LinearRegressionCurve"); + return "com.sun.star.chart2.LinearRegressionCurve"; case CURVE_TYPE_LOGARITHM: - return OUString("com.sun.star.chart2.LogarithmicRegressionCurve"); + return "com.sun.star.chart2.LogarithmicRegressionCurve"; case CURVE_TYPE_EXPONENTIAL: - return OUString("com.sun.star.chart2.ExponentialRegressionCurve"); + return "com.sun.star.chart2.ExponentialRegressionCurve"; case CURVE_TYPE_POWER: - return OUString("com.sun.star.chart2.PotentialRegressionCurve"); + return "com.sun.star.chart2.PotentialRegressionCurve"; case CURVE_TYPE_POLYNOMIAL: - return OUString("com.sun.star.chart2.PolynomialRegressionCurve"); + return "com.sun.star.chart2.PolynomialRegressionCurve"; case CURVE_TYPE_MOVING_AVERAGE: - return OUString("com.sun.star.chart2.MovingAverageRegressionCurve"); + return "com.sun.star.chart2.MovingAverageRegressionCurve"; } return OUString(); diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 5212c8d842d8..72da779cca35 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -303,7 +303,7 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< OUString SAL_CALL RegressionEquation::getImplementationName() { - return OUString("com.sun.star.comp.chart2.RegressionEquation"); + return "com.sun.star.comp.chart2.RegressionEquation"; } sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 492f845e932f..ef2e363c9737 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -72,12 +72,12 @@ uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling() OUString SAL_CALL LogarithmicScaling::getServiceName() { - return OUString(lcl_aServiceName_Logarithmic); + return lcl_aServiceName_Logarithmic; } OUString SAL_CALL LogarithmicScaling::getImplementationName() { - return OUString(lcl_aServiceName_Logarithmic); + return lcl_aServiceName_Logarithmic; } sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceName ) @@ -121,12 +121,12 @@ uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling() OUString SAL_CALL ExponentialScaling::getServiceName() { - return OUString(lcl_aServiceName_Exponential); + return lcl_aServiceName_Exponential; } OUString SAL_CALL ExponentialScaling::getImplementationName() { - return OUString(lcl_aServiceName_Exponential); + return lcl_aServiceName_Exponential; } sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceName ) @@ -174,12 +174,12 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL LinearScaling::getServiceName() { - return OUString(lcl_aServiceName_Linear); + return lcl_aServiceName_Linear; } OUString SAL_CALL LinearScaling::getImplementationName() { - return OUString(lcl_aServiceName_Linear) ; + return lcl_aServiceName_Linear ; } sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName ) @@ -226,12 +226,12 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL PowerScaling::getServiceName() { - return OUString(lcl_aServiceName_Power); + return lcl_aServiceName_Power; } OUString SAL_CALL PowerScaling::getImplementationName() { - return OUString(lcl_aServiceName_Power); + return lcl_aServiceName_Power; } sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index ca3a9280c452..59fc826d3629 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -147,7 +147,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS OUString SAL_CALL UncachedDataSequence::getImplementationName() { - return OUString(lcl_aServiceName); + return lcl_aServiceName; } sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 1ce1e1d06746..a1aa4151c1fe 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -97,12 +97,12 @@ uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling() OUString SAL_CALL DateScaling::getServiceName() { - return OUString(lcl_aServiceName_DateScaling); + return lcl_aServiceName_DateScaling; } OUString SAL_CALL DateScaling::getImplementationName() { - return OUString(lcl_aServiceName_DateScaling); + return lcl_aServiceName_DateScaling; } sal_Bool SAL_CALL DateScaling::supportsService( const OUString& rServiceName ) @@ -180,12 +180,12 @@ uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling() OUString SAL_CALL InverseDateScaling::getServiceName() { - return OUString(lcl_aServiceName_InverseDateScaling); + return lcl_aServiceName_InverseDateScaling; } OUString SAL_CALL InverseDateScaling::getImplementationName() { - return OUString(lcl_aServiceName_InverseDateScaling); + return lcl_aServiceName_InverseDateScaling; } sal_Bool SAL_CALL InverseDateScaling::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 9d076e1f9b40..9aac3c2c209a 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1246,7 +1246,7 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav OUString SAL_CALL ChartView::getImplementationName() { - return OUString(CHART_VIEW_SERVICE_IMPLEMENTATION_NAME); + return CHART_VIEW_SERVICE_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName ) -- cgit v1.2.3