diff options
Diffstat (limited to 'chart2')
6 files changed, 36 insertions, 16 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index f69c7c20f5ec..5ee50f4dbd73 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> + #include "WrappedAxisAndGridExistenceProperties.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XAxis.hpp> @@ -342,14 +346,14 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain, switch( m_nDimensionIndex ) { case 0: - m_aOuterName = m_bMain ? OUStringLiteral(u"HasXAxisDescription") : OUStringLiteral(u"HasSecondaryXAxisDescription"); + m_aOuterName = m_bMain ? std::u16string_view(u"HasXAxisDescription") : std::u16string_view(u"HasSecondaryXAxisDescription"); break; case 2: OSL_ENSURE(m_bMain,"there is no description available for a secondary z axis"); m_aOuterName = "HasZAxisDescription"; break; default: - m_aOuterName = m_bMain ? OUStringLiteral(u"HasYAxisDescription") : OUStringLiteral(u"HasSecondaryYAxisDescription"); + m_aOuterName = m_bMain ? std::u16string_view(u"HasYAxisDescription") : std::u16string_view(u"HasSecondaryYAxisDescription"); break; } } diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 7939fcf06c12..748df3e1b40e 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -401,7 +401,7 @@ OUString ColumnChartDialogController::getName() OUString ColumnChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_COLUMN); + return BMP_TYPE_COLUMN; } const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const @@ -478,7 +478,7 @@ OUString BarChartDialogController::getName() OUString BarChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_BAR); + return BMP_TYPE_BAR; } const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const @@ -554,7 +554,7 @@ OUString PieChartDialogController::getName() OUString PieChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_PIE); + return BMP_TYPE_PIE; } const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const @@ -620,7 +620,7 @@ OUString LineChartDialogController::getName() OUString LineChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_LINE); + return BMP_TYPE_LINE; } const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const @@ -767,7 +767,7 @@ OUString XYChartDialogController::getName() OUString XYChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_XY); + return BMP_TYPE_XY; } const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const @@ -870,7 +870,7 @@ OUString AreaChartDialogController::getName() OUString AreaChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_AREA); + return BMP_TYPE_AREA; } bool AreaChartDialogController::shouldShow_3DLookControl() const @@ -957,7 +957,7 @@ OUString NetChartDialogController::getName() OUString NetChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_NET); + return BMP_TYPE_NET; } bool NetChartDialogController::shouldShow_StackingControl() const @@ -1052,7 +1052,7 @@ OUString StockChartDialogController::getName() OUString StockChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_STOCK); + return BMP_TYPE_STOCK; } const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const @@ -1097,7 +1097,7 @@ OUString CombiColumnLineChartDialogController::getName() OUString CombiColumnLineChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_COLUMN_LINE); + return BMP_TYPE_COLUMN_LINE; } const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const @@ -1227,7 +1227,7 @@ OUString BubbleChartDialogController::getName() OUString BubbleChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_BUBBLE); + return BMP_TYPE_BUBBLE; } const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 62568fc71296..281beb86dd6f 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> + #include "res_DataLabel.hxx" #include <TextDirectionListBox.hxx> @@ -39,7 +43,7 @@ namespace chart namespace { -const OUStringLiteral our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". "}; +const std::u16string_view our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". "}; bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut ) { diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index aedeab062113..bd5167766097 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> + #include <ChartController.hxx> #include <PositionAndSizeHelper.hxx> #include <ObjectIdentifier.hxx> @@ -1015,7 +1019,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) OUString aMenuName; if ( isShapeContext() ) // #i12587# support for shapes in chart - aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUStringLiteral( u"drawtext" ) : OUStringLiteral( u"draw" ); + aMenuName = m_pDrawViewWrapper->IsTextEdit() ? std::u16string_view( u"drawtext" ) : std::u16string_view( u"draw" ); else { // todo: the context menu should be specified by an xml file in uiconfig diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index 133d02354dbc..aace24ef7830 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -7,6 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <sal/config.h> + +#include <string_view> + #include "ChartColorWrapper.hxx" #include <ObjectIdentifier.hxx> @@ -97,7 +101,7 @@ void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel void ChartColorWrapper::updateData() { static const OUStringLiteral aLineColor = u"LineColor"; - static const OUStringLiteral aCommands[2] = {u".uno:XLineColor", u".uno:FillColor"}; + static const std::u16string_view aCommands[2] = {u".uno:XLineColor", u".uno:FillColor"}; css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel); if (!xPropSet.is()) diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 13ddf1582cd0..1aa962ab5e3e 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> + #include <ExponentialRegressionCurveCalculator.hxx> #include <RegressionCalculationHelper.hxx> #include <SpecialCharacters.hxx> @@ -199,7 +203,7 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation( OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, m_fLogIntercept, pValueLength ); if ( aValueString != "0" ) // aValueString may be rounded to 0 if nValueLength is small { - aTmpBuf.append( aValueString ).append( (m_fLogSlope < 0.0) ? OUStringLiteral(u" ") : OUStringLiteral(u" + ") ); + aTmpBuf.append( aValueString ).append( (m_fLogSlope < 0.0) ? std::u16string_view(u" ") : std::u16string_view(u" + ") ); } } } |