diff options
Diffstat (limited to 'chart2/source/tools')
35 files changed, 241 insertions, 241 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index b48fd313a91c..bd87f95b195e 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -191,7 +191,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( if( xSource.is() ) { std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aXValues( - DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), "values-x" ) ); + DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), u"values-x"_ustr ) ); if( aXValues.empty() ) { uno::Reference< chart2::data::XLabeledDataSequence > xCategories( xDiagram->getCategories() ); @@ -348,12 +348,12 @@ rtl::Reference< Axis > AxisHelper::createAxis( //ensure that the second axis is not placed on the main axis css::chart::ChartAxisPosition eMainAxisPos( css::chart::ChartAxisPosition_ZERO ); - xMainAxis->getPropertyValue("CrossoverPosition") >>= eMainAxisPos; + xMainAxis->getPropertyValue(u"CrossoverPosition"_ustr) >>= eMainAxisPos; if( eMainAxisPos == css::chart::ChartAxisPosition_END ) eNewAxisPos = css::chart::ChartAxisPosition_START; } - xAxis->setPropertyValue("CrossoverPosition", uno::Any(eNewAxisPos) ); + xAxis->setPropertyValue(u"CrossoverPosition"_ustr, uno::Any(eNewAxisPos) ); } try @@ -440,9 +440,9 @@ void AxisHelper::makeAxisVisible( const rtl::Reference< Axis >& xAxis ) { if( xAxis.is() ) { - xAxis->setPropertyValue( "Show", uno::Any( true ) ); + xAxis->setPropertyValue( u"Show"_ustr, uno::Any( true ) ); LinePropertiesHelper::SetLineVisible( xAxis ); - xAxis->setPropertyValue( "DisplayLabels", uno::Any( true ) ); + xAxis->setPropertyValue( u"DisplayLabels"_ustr, uno::Any( true ) ); } } @@ -450,7 +450,7 @@ void AxisHelper::makeGridVisible( const rtl::Reference< GridProperties >& xGridP { if( xGridProperties.is() ) { - xGridProperties->setPropertyValue( "Show", uno::Any( true ) ); + xGridProperties->setPropertyValue( u"Show"_ustr, uno::Any( true ) ); LinePropertiesHelper::SetLineVisible( xGridProperties ); } } @@ -465,7 +465,7 @@ void AxisHelper::makeAxisInvisible( const rtl::Reference< Axis >& xAxis ) { if( xAxis.is() ) { - xAxis->setPropertyValue( "Show", uno::Any( false ) ); + xAxis->setPropertyValue( u"Show"_ustr, uno::Any( false ) ); } } @@ -515,7 +515,7 @@ void AxisHelper::makeGridInvisible( const rtl::Reference< ::chart::GridPropertie { if( xGridProperties.is() ) { - xGridProperties->setPropertyValue( "Show", uno::Any( false ) ); + xGridProperties->setPropertyValue( u"Show"_ustr, uno::Any( false ) ); } } @@ -599,7 +599,7 @@ rtl::Reference< Axis > AxisHelper::getCrossingMainAxis( const rtl::Reference< Ax { nDimensionIndex=1; bool bSwapXY = false; - if( (xCooSys->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXY) && bSwapXY ) + if( (xCooSys->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bSwapXY) && bSwapXY ) nDimensionIndex=0; } else if( nDimensionIndex==1 ) @@ -641,7 +641,7 @@ bool AxisHelper::isAxisVisible( const rtl::Reference< Axis >& xAxis ) if( xAxis.is() ) { - xAxis->getPropertyValue( "Show" ) >>= bRet; + xAxis->getPropertyValue( u"Show"_ustr ) >>= bRet; bRet = bRet && ( LinePropertiesHelper::IsLineVisible( xAxis ) || areAxisLabelsVisible( xAxis ) ); } @@ -654,7 +654,7 @@ bool AxisHelper::areAxisLabelsVisible( const rtl::Reference< Axis >& xAxis ) bool bRet = false; if( xAxis.is() ) { - xAxis->getPropertyValue( "DisplayLabels" ) >>= bRet; + xAxis->getPropertyValue( u"DisplayLabels"_ustr ) >>= bRet; } return bRet; } @@ -665,7 +665,7 @@ bool AxisHelper::isGridVisible( const rtl::Reference< ::chart::GridProperties >& if( xGridproperties.is() ) { - xGridproperties->getPropertyValue( "Show" ) >>= bRet; + xGridproperties->getPropertyValue( u"Show"_ustr ) >>= bRet; bRet = bRet && LinePropertiesHelper::IsLineVisible( xGridproperties ); } @@ -784,7 +784,7 @@ std::vector< rtl::Reference< Axis > > AxisHelper::getAllAxesOfCoordinateSystem( bool bAddAxis = true; if( bOnlyVisible ) { - if( !(xAxis->getPropertyValue( "Show") >>= bAddAxis) ) + if( !(xAxis->getPropertyValue( u"Show"_ustr) >>= bAddAxis) ) bAddAxis = false; } if( bAddAxis ) @@ -876,7 +876,7 @@ bool AxisHelper::isSecondaryYAxisNeeded( const rtl::Reference< BaseCoordinateSys for( sal_Int32 nS = aSeriesList.size(); nS-- ; ) { sal_Int32 nAttachedAxisIndex = 0; - if( ( aSeriesList[nS]->getPropertyValue( "AttachedAxisIndex" ) >>= nAttachedAxisIndex ) && + if( ( aSeriesList[nS]->getPropertyValue( u"AttachedAxisIndex"_ustr ) >>= nAttachedAxisIndex ) && nAttachedAxisIndex>0 ) return true; } @@ -1022,7 +1022,7 @@ void AxisHelper::setRTLAxisLayout( const rtl::Reference< BaseCoordinateSystem >& return; bool bVertical = false; - xCooSys->getPropertyValue( "SwapXAndYAxis" ) >>= bVertical; + xCooSys->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bVertical; sal_Int32 nHorizontalAxisDimension = bVertical ? 1 : 0; sal_Int32 nVerticalAxisDimension = bVertical ? 0 : 1; diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 152b48cf9bd8..54b2d42eece4 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -99,13 +99,13 @@ CachedDataSequence::~CachedDataSequence() void CachedDataSequence::registerProperties() { - registerProperty( "NumberFormatKey", + registerProperty( u"NumberFormatKey"_ustr, PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, cppu::UnoType<decltype(m_nNumberFormatKey)>::get() ); - registerProperty( "Role", + registerProperty( u"Role"_ustr, PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, @@ -187,9 +187,9 @@ css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceN { return { lcl_aServiceName, - "com.sun.star.chart2.data.DataSequence", - "com.sun.star.chart2.data.NumericalDataSequence", - "com.sun.star.chart2.data.TextualDataSequence" + u"com.sun.star.chart2.data.DataSequence"_ustr, + u"com.sun.star.chart2.data.NumericalDataSequence"_ustr, + u"com.sun.star.chart2.data.TextualDataSequence"_ustr }; } @@ -257,17 +257,17 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) { ::comphelper::SequenceAsHashMap aMap(_aArguments); - m_aNumericalSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aNumericalSequence); + m_aNumericalSequence = aMap.getUnpackedValueOrDefault( u"DataSequence"_ustr ,m_aNumericalSequence); if ( m_aNumericalSequence.hasElements() ) m_eCurrentDataType = NUMERICAL; else { - m_aTextualSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aTextualSequence); + m_aTextualSequence = aMap.getUnpackedValueOrDefault( u"DataSequence"_ustr ,m_aTextualSequence); if ( m_aTextualSequence.hasElements() ) m_eCurrentDataType = TEXTUAL; else { - m_aMixedSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aMixedSequence); + m_aMixedSequence = aMap.getUnpackedValueOrDefault( u"DataSequence"_ustr ,m_aMixedSequence); if ( m_aMixedSequence.hasElements() ) m_eCurrentDataType = MIXED; } diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index bf44c6a4c08f..e407b7efeecb 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -424,17 +424,17 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet( awt::FontDescriptor aResult; // Note: keep this sorted! uno::Sequence< OUString > aPropNameSeq{ - "CharFontCharSet", // CharSet - "CharFontFamily", // Family - "CharFontName", // Name - "CharFontPitch", // Pitch - "CharFontStyleName", // StyleName - "CharHeight", // Height - "CharPosture", // Slant - "CharStrikeout", // Strikeout - "CharUnderline", // Underline - "CharWeight", // Weight - "CharWordMode"}; // WordLineMode + u"CharFontCharSet"_ustr, // CharSet + u"CharFontFamily"_ustr, // Family + u"CharFontName"_ustr, // Name + u"CharFontPitch"_ustr, // Pitch + u"CharFontStyleName"_ustr, // StyleName + u"CharHeight"_ustr, // Height + u"CharPosture"_ustr, // Slant + u"CharStrikeout"_ustr, // Strikeout + u"CharUnderline"_ustr, // Underline + u"CharWeight"_ustr, // Weight + u"CharWordMode"_ustr}; // WordLineMode uno::Sequence< uno::Any > aValues( xMultiPropSet->getPropertyValues( aPropNameSeq )); sal_Int32 i=0; diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 6c2420e7bd7c..70a5accd2eff 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -63,7 +63,7 @@ rtl::Reference< InternalDataProvider > ChartModelHelper::createInternalDataProvi { css::chart::ChartDataRowSource aDataRowSource(css::chart::ChartDataRowSource_COLUMNS); - xProp->getPropertyValue( "DataRowSource" ) >>= aDataRowSource; + xProp->getPropertyValue( u"DataRowSource"_ustr ) >>= aDataRowSource; bDefaultDataInColumns = (aDataRowSource == css::chart::ChartDataRowSource_COLUMNS); } @@ -144,7 +144,7 @@ bool ChartModelHelper::isIncludeHiddenCells( const rtl::Reference<::chart::Chart try { - xDiagram->getPropertyValue("IncludeHiddenCells") >>= bIncluded; + xDiagram->getPropertyValue(u"IncludeHiddenCells"_ustr) >>= bIncluded; } catch( const beans::UnknownPropertyException& ) { @@ -164,7 +164,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod if (xDiagramProperties.is()) { bool bOldValue = bIncludeHiddenCells; - xDiagramProperties->getPropertyValue( "IncludeHiddenCells" ) >>= bOldValue; + xDiagramProperties->getPropertyValue( u"IncludeHiddenCells"_ustr ) >>= bOldValue; if( bOldValue == bIncludeHiddenCells ) bChanged = true; @@ -176,7 +176,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod { uno::Reference< beans::XPropertySet > xDataProviderProperties( rModel.getDataProvider(), uno::UNO_QUERY ); if( xDataProviderProperties.is() ) - xDataProviderProperties->setPropertyValue("IncludeHiddenCells", aNewValue ); + xDataProviderProperties->setPropertyValue(u"IncludeHiddenCells"_ustr, aNewValue ); } catch( const beans::UnknownPropertyException& ) { @@ -194,10 +194,10 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod { xProp.set( uno::Reference< beans::XPropertySet >( labeledData->getValues(), uno::UNO_QUERY ) ); if(xProp.is()) - xProp->setPropertyValue("IncludeHiddenCells", aNewValue ); + xProp->setPropertyValue(u"IncludeHiddenCells"_ustr, aNewValue ); xProp.set( uno::Reference< beans::XPropertySet >( labeledData->getLabel(), uno::UNO_QUERY ) ); if(xProp.is()) - xProp->setPropertyValue("IncludeHiddenCells", aNewValue ); + xProp->setPropertyValue(u"IncludeHiddenCells"_ustr, aNewValue ); } } } @@ -206,7 +206,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod //the property is optional! } - xDiagramProperties->setPropertyValue( "IncludeHiddenCells", aNewValue); + xDiagramProperties->setPropertyValue( u"IncludeHiddenCells"_ustr, aNewValue); } } catch (const uno::Exception&) diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index b8df30edfbd5..f49a45ad4162 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -680,7 +680,7 @@ bool ChartTypeHelper::isSeriesInFrontOfAxisLine( const rtl::Reference< ChartType OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const rtl::Reference< ChartType >& xChartType ) { - OUString aRet( "values-y" ); + OUString aRet( u"values-y"_ustr ); if( !xChartType.is() ) return aRet; OUString aChartTypeName = xChartType->getChartType(); @@ -691,7 +691,7 @@ OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::Reference< ChartType >& xChartType ) { - OUString aRet( "values-y" ); + OUString aRet( u"values-y"_ustr ); if( !xChartType.is() ) return aRet; OUString aChartTypeName = xChartType->getChartType(); diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index bced72bb473a..7fcdbfaeda64 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -50,7 +50,7 @@ bool ColorPerPointHelper::hasPointOwnColor( if( !xPointState.is() ) return false; - return (xPointState->getPropertyState( "Color") != beans::PropertyState_DEFAULT_VALUE ); + return (xPointState->getPropertyState( u"Color"_ustr) != beans::PropertyState_DEFAULT_VALUE ); } return false; diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 6ea26d99c5fb..997c677d0145 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -61,7 +61,7 @@ private: }; ChartConfigItem::ChartConfigItem( ConfigColorScheme & rListener ) : - ::utl::ConfigItem( "Office.Chart/DefaultColor" ), + ::utl::ConfigItem( u"Office.Chart/DefaultColor"_ustr ), m_rListener( rListener ) { EnableNotification( { aSeriesPropName } ); @@ -151,7 +151,7 @@ void ConfigColorScheme::notify() OUString SAL_CALL ConfigColorScheme::getImplementationName() { - return "com.sun.star.comp.chart2.ConfigDefaultColorScheme" ; + return u"com.sun.star.comp.chart2.ConfigDefaultColorScheme"_ustr ; } sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName ) @@ -161,7 +161,7 @@ sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceNa css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames() { - return { "com.sun.star.chart2.ColorScheme" }; + return { u"com.sun.star.chart2.ColorScheme"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 45f235cd2810..202b67395c83 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -72,11 +72,11 @@ public: if( m_bMatchPrefix ) return ( xProp.is() && - (xProp->getPropertyValue( "Role" ) >>= aRole ) && + (xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) && aRole.match( m_aRole )); return ( xProp.is() && - (xProp->getPropertyValue( "Role" ) >>= aRole ) && + (xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) && m_aRole == aRole ); } @@ -170,7 +170,7 @@ OUString getRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xL { Reference< beans::XPropertySet > xProp( xLabeledDataSequence->getValues(), uno::UNO_QUERY ); if( xProp.is() ) - xProp->getPropertyValue( "Role" ) >>= aRet; + xProp->getPropertyValue( u"Role"_ustr ) >>= aRet; } return aRet; } @@ -265,10 +265,10 @@ void setStackModeAtSeries( { if( dataSeries.is() ) { - dataSeries->setPropertyValue( "StackingDirection", aPropValue ); + dataSeries->setPropertyValue( u"StackingDirection"_ustr, aPropValue ); sal_Int32 nAxisIndex = 0; - dataSeries->getPropertyValue( "AttachedAxisIndex" ) >>= nAxisIndex; + dataSeries->getPropertyValue( u"AttachedAxisIndex"_ustr ) >>= nAxisIndex; aAxisIndexSet.insert(nAxisIndex); } } @@ -398,7 +398,7 @@ void switchSymbolsOnOrOff( const rtl::Reference< DataSeries > & xSeries, return; chart2::Symbol aSymbProp; - if( xSeries->getPropertyValue( "Symbol") >>= aSymbProp ) + if( xSeries->getPropertyValue( u"Symbol"_ustr) >>= aSymbProp ) { if( !bSymbolsOn ) aSymbProp.Style = chart2::SymbolStyle_NONE; @@ -407,7 +407,7 @@ void switchSymbolsOnOrOff( const rtl::Reference< DataSeries > & xSeries, aSymbProp.Style = chart2::SymbolStyle_STANDARD; aSymbProp.StandardSymbol = nSeriesIndex; } - xSeries->setPropertyValue( "Symbol", uno::Any( aSymbProp )); + xSeries->setPropertyValue( u"Symbol"_ustr, uno::Any( aSymbProp )); } //todo: check attributed data points } @@ -421,14 +421,14 @@ void switchLinesOnOrOff( const rtl::Reference< DataSeries > & xSeries, bool bLin { // keep line-styles that are not NONE drawing::LineStyle eLineStyle; - if( (xSeries->getPropertyValue( "LineStyle") >>= eLineStyle ) && + if( (xSeries->getPropertyValue( u"LineStyle"_ustr) >>= eLineStyle ) && eLineStyle == drawing::LineStyle_NONE ) { - xSeries->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ); + xSeries->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ); } } else - xSeries->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) ); + xSeries->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } void makeLinesThickOrThin( const rtl::Reference< ::chart::DataSeries > & xSeries, bool bThick ) @@ -438,11 +438,11 @@ void makeLinesThickOrThin( const rtl::Reference< ::chart::DataSeries > & xSeries sal_Int32 nNewValue = bThick ? 80 : 0; sal_Int32 nOldValue = 0; - if( (xSeries->getPropertyValue( "LineWidth") >>= nOldValue ) && + if( (xSeries->getPropertyValue( u"LineWidth"_ustr) >>= nOldValue ) && nOldValue != nNewValue ) { if( !(bThick && nOldValue>0)) - xSeries->setPropertyValue( "LineWidth", uno::Any( nNewValue ) ); + xSeries->setPropertyValue( u"LineWidth"_ustr, uno::Any( nNewValue ) ); } } @@ -465,8 +465,8 @@ void setPropertyAlsoToAllAttributedDataPoints( const rtl::Reference< ::chart::Da xPointProp->setPropertyValue( rPropertyName, rPropertyValue ); if( rPropertyName == "LabelPlacement" ) { - xPointProp->setPropertyValue("CustomLabelPosition", uno::Any()); - xPointProp->setPropertyValue("CustomLabelSize", uno::Any()); + xPointProp->setPropertyValue(u"CustomLabelPosition"_ustr, uno::Any()); + xPointProp->setPropertyValue(u"CustomLabelSize"_ustr, uno::Any()); } } } @@ -511,7 +511,7 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere if( xProp.is()) { Sequence<sal_Int32> aHiddenIndicesSeq; - xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq; + xProp->getPropertyValue( u"HiddenValues"_ustr ) >>= aHiddenIndicesSeq; if( aHiddenIndicesSeq.hasElements() ) { auto aHiddenIndices( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( aHiddenIndicesSeq ) ); diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index c74687c1485a..8bf1cd2bc792 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -63,7 +63,7 @@ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLab OUString SAL_CALL DataSource::getImplementationName() { - return "com.sun.star.comp.chart.DataSource"; + return u"com.sun.star.comp.chart.DataSource"_ustr; } sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) @@ -73,7 +73,7 @@ sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() { - return { "com.sun.star.chart2.data.DataSource" }; + return { u"com.sun.star.chart2.data.DataSource"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index dc6c1b9c87f1..3084ec14ab8a 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -85,7 +85,7 @@ void lcl_addErrorBarRanges( xErrorBarProp.is()) { sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= eStyle ) && + if( ( xErrorBarProp->getPropertyValue( u"ErrorBarStyle"_ustr) >>= eStyle ) && eStyle == css::chart::ErrorBarStyle::FROM_DATA ) { uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY ); @@ -97,7 +97,7 @@ void lcl_addErrorBarRanges( if( ( xDataSeries->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp ) && xErrorBarProp.is()) { sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue("ErrorBarStyle") >>= eStyle ) && + if( ( xErrorBarProp->getPropertyValue(u"ErrorBarStyle"_ustr) >>= eStyle ) && eStyle == css::chart::ErrorBarStyle::FROM_DATA ) { uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY ); @@ -151,9 +151,9 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( return { - { "DataRowSource", -1, uno::Any( eRowSource), beans::PropertyState_DIRECT_VALUE }, - { "FirstCellAsLabel", -1, uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE }, - { "HasCategories", -1, uno::Any( bHasCategories ), beans::PropertyState_DIRECT_VALUE } + { u"DataRowSource"_ustr, -1, uno::Any( eRowSource), beans::PropertyState_DIRECT_VALUE }, + { u"FirstCellAsLabel"_ustr, -1, uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE }, + { u"HasCategories"_ustr, -1, uno::Any( bHasCategories ), beans::PropertyState_DIRECT_VALUE } }; } @@ -165,14 +165,14 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( uno::Sequence< beans::PropertyValue > aArguments( createArguments( bUseColumns, bFirstCellAsLabel, bHasCategories )); aArguments.realloc( aArguments.getLength() + 1 ); aArguments.getArray()[aArguments.getLength() - 1] = - beans::PropertyValue( "CellRangeRepresentation" + beans::PropertyValue( u"CellRangeRepresentation"_ustr , -1, uno::Any( rRangeRepresentation ) , beans::PropertyState_DIRECT_VALUE ); if( rSequenceMapping.hasElements() ) { aArguments.realloc( aArguments.getLength() + 1 ); aArguments.getArray()[aArguments.getLength() - 1] = - beans::PropertyValue( "SequenceMapping" + beans::PropertyValue( u"SequenceMapping"_ustr , -1, uno::Any( rSequenceMapping ) , beans::PropertyState_DIRECT_VALUE ); } @@ -233,7 +233,7 @@ rtl::Reference< DataSource > DataSourceHelper::pressUsedDataIntoRectangularForma //the first x-values is always the next sequence //todo ... other x-values get lost for old format Reference< chart2::data::XLabeledDataSequence > xXValues( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x" ) ); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, u"values-x"_ustr ) ); if( xXValues.is() ) aResultVector.push_back( xXValues ); diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 38aa97265396..fb2643743e1e 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -89,7 +89,7 @@ StackMode DiagramHelper::getStackModeFromChartType( rbFound = true; chart2::StackingDirection eCurrentDirection = eCommonDirection; // property is not MAYBEVOID - bool bSuccess = ( aSeries[i]->getPropertyValue( "StackingDirection" ) >>= eCurrentDirection ); + bool bSuccess = ( aSeries[i]->getPropertyValue( u"StackingDirection"_ustr ) >>= eCurrentDirection ); OSL_ASSERT( bSuccess ); if( ! bDirectionInitialized ) { @@ -257,7 +257,7 @@ void lcl_switchToDateCategories( const rtl::Reference< ChartModel >& xChartDoc, } sal_Int32 nType = util::NumberFormat::UNDEFINED; if( xKeyProps.is() ) - xKeyProps->getPropertyValue( "Type" ) >>= nType; + xKeyProps->getPropertyValue( u"Type"_ustr ) >>= nType; if( !( nType & util::NumberFormat::DATE ) ) { //set a date format to the axis @@ -334,7 +334,7 @@ bool DiagramHelper::isDateNumberFormat( sal_Int32 nNumberFormat, const Reference if( xKeyProps.is() ) { sal_Int32 nType = util::NumberFormat::UNDEFINED; - xKeyProps->getPropertyValue( "Type" ) >>= nType; + xKeyProps->getPropertyValue( u"Type"_ustr ) >>= nType; bIsDate = nType & util::NumberFormat::DATE; } return bIsDate; @@ -452,8 +452,8 @@ bool DiagramHelper::setDiagramPositioning( const rtl::Reference<::chart::ChartMo RelativePosition aOldPos; RelativeSize aOldSize; - xDiagram->getPropertyValue("RelativePosition" ) >>= aOldPos; - xDiagram->getPropertyValue("RelativeSize" ) >>= aOldSize; + xDiagram->getPropertyValue(u"RelativePosition"_ustr ) >>= aOldPos; + xDiagram->getPropertyValue(u"RelativeSize"_ustr ) >>= aOldSize; RelativePosition aNewPos; aNewPos.Anchor = drawing::Alignment_TOP_LEFT; @@ -473,8 +473,8 @@ bool DiagramHelper::setDiagramPositioning( const rtl::Reference<::chart::ChartMo if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 ) aNewPos.Secondary = 1.0 - aNewSize.Secondary; - xDiagram->setPropertyValue( "RelativePosition", uno::Any(aNewPos) ); - xDiagram->setPropertyValue( "RelativeSize", uno::Any(aNewSize) ); + xDiagram->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aNewPos) ); + xDiagram->setPropertyValue( u"RelativeSize"_ustr, uno::Any(aNewSize) ); bChanged = (aOldPos.Anchor!=aNewPos.Anchor) || (aOldPos.Primary!=aNewPos.Primary) || @@ -496,8 +496,8 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const rtl::Reference RelativePosition aRelPos; RelativeSize aRelSize; - xDiagram->getPropertyValue("RelativePosition" ) >>= aRelPos; - xDiagram->getPropertyValue("RelativeSize" ) >>= aRelSize; + xDiagram->getPropertyValue(u"RelativePosition"_ustr ) >>= aRelPos; + xDiagram->getPropertyValue(u"RelativeSize"_ustr ) >>= aRelSize; awt::Size aAbsSize( static_cast< sal_Int32 >( aRelSize.Primary * aPageSize.Width ), diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 3d049a44527f..03a35391c21e 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -161,7 +161,7 @@ void ErrorBar::setPropertyValue( const OUString& rPropName, const uno::Any& rAny else if(rPropName == "ShowNegativeError") rAny >>= mbShowNegativeError; else if(rPropName == "ErrorBarRangePositive" || rPropName == "ErrorBarRangeNegative") - throw beans::UnknownPropertyException("read-only property", static_cast< uno::XWeak*>(this)); + throw beans::UnknownPropertyException(u"read-only property"_ustr, static_cast< uno::XWeak*>(this)); else if(rPropName == "LineDashName") rAny >>= maDashName; else if(rPropName == "LineDash") @@ -199,7 +199,7 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere uno::Reference< chart2::data::XDataSequence > xSequence( labeledData->getValues()); uno::Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW ); OUString aRole; - if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) && + if( ( xSeqProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) && aRole.match( "error-bars" ) && aRole.indexOf(aDirection) >= 0 ) { return xSequence->getSourceRangeRepresentation(); @@ -450,7 +450,7 @@ css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames() { return { lcl_aServiceName, - "com.sun.star.chart2.ErrorBar" + u"com.sun.star.chart2.ErrorBar"_ustr }; } diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 5b95b0a719be..22f3e84a5802 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -774,19 +774,19 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( { Sequence< beans::PropertyValue > aArguments{ beans::PropertyValue( - "CellRangeRepresentation", -1, uno::Any( lcl_aCompleteRange ), + u"CellRangeRepresentation"_ustr, -1, uno::Any( lcl_aCompleteRange ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "DataRowSource", -1, uno::Any( + u"DataRowSource"_ustr, -1, uno::Any( m_bDataInColumns ? css::chart::ChartDataRowSource_COLUMNS : css::chart::ChartDataRowSource_ROWS ), beans::PropertyState_DIRECT_VALUE ), // internal data always contains labels and categories beans::PropertyValue( - "FirstCellAsLabel", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ), + u"FirstCellAsLabel"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "HasCategories", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ) + u"HasCategories"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ) }; // #i85913# Sequence Mapping is not needed for internal data, as it is // applied to the data when the data source is created. @@ -1081,7 +1081,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( u"0"_ustr)); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1104,7 +1104,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( u"0"_ustr)); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1123,7 +1123,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s : m_aInternalData.getRowCount()); // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( u"0"_ustr)); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1220,7 +1220,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM // <https://bugs.documentfoundation.org/show_bug.cgi?id=112783> "PIVOT CHARTS: Save produces // invalid file because of invalid cell address": if (aXMLRange == "PivotChart") { - return ""; + return u""_ustr; } static constexpr OUString aPivotTableID(u"PT@"_ustr); @@ -1468,7 +1468,7 @@ sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) { comphelper::SequenceAsHashMap aArgs(_aArguments); - if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) ) + if ( aArgs.getUnpackedValueOrDefault( u"CreateDefaultData"_ustr, false ) ) m_aInternalData.createDefaultData(); } @@ -1481,7 +1481,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 "com.sun.star.comp.chart.InternalDataProvider"; + return u"com.sun.star.comp.chart.InternalDataProvider"_ustr; } sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName ) @@ -1491,7 +1491,7 @@ sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames() { - return { "com.sun.star.chart2.data.DataProvider" }; + return { u"com.sun.star.chart2.data.DataProvider"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index bf7b13443d1d..16afb3a6076c 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -152,7 +152,7 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: OUString SAL_CALL LabeledDataSequence::getImplementationName() { - return "com.sun.star.comp.chart2.LabeledDataSequence"; + return u"com.sun.star.comp.chart2.LabeledDataSequence"_ustr; } sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName ) @@ -162,7 +162,7 @@ sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rService css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames() { - return { "com.sun.star.chart2.data.LabeledDataSequence" }; + return { u"com.sun.star.chart2.data.LabeledDataSequence"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 2c52f136398d..05609541d4ef 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -39,24 +39,24 @@ rtl::Reference< Legend > LegendHelper::showLegend( ChartModel& rModel rtl::Reference< Legend > xLegend = LegendHelper::getLegend( rModel, xContext, true ); if( xLegend.is()) { - xLegend->setPropertyValue( "Show", uno::Any(true) ); + xLegend->setPropertyValue( u"Show"_ustr, uno::Any(true) ); chart2::RelativePosition aRelativePosition; - if( !(xLegend->getPropertyValue( "RelativePosition") >>= aRelativePosition) ) + if( !(xLegend->getPropertyValue( u"RelativePosition"_ustr) >>= aRelativePosition) ) { chart2::LegendPosition ePos = chart2::LegendPosition_LINE_END; - if( !(xLegend->getPropertyValue( "AnchorPosition") >>= ePos ) ) - xLegend->setPropertyValue( "AnchorPosition", uno::Any( ePos )); + if( !(xLegend->getPropertyValue( u"AnchorPosition"_ustr) >>= ePos ) ) + xLegend->setPropertyValue( u"AnchorPosition"_ustr, uno::Any( ePos )); css::chart::ChartLegendExpansion eExpansion = ( ePos == chart2::LegendPosition_LINE_END || ePos == chart2::LegendPosition_LINE_START ) ? css::chart::ChartLegendExpansion_HIGH : css::chart::ChartLegendExpansion_WIDE; - if( !(xLegend->getPropertyValue( "Expansion") >>= eExpansion ) ) - xLegend->setPropertyValue( "Expansion", uno::Any( eExpansion )); + if( !(xLegend->getPropertyValue( u"Expansion"_ustr) >>= eExpansion ) ) + xLegend->setPropertyValue( u"Expansion"_ustr, uno::Any( eExpansion )); - xLegend->setPropertyValue( "RelativePosition", uno::Any()); + xLegend->setPropertyValue( u"RelativePosition"_ustr, uno::Any()); } } @@ -68,7 +68,7 @@ void LegendHelper::hideLegend( ChartModel& rModel ) rtl::Reference< Legend > xLegend = LegendHelper::getLegend( rModel, nullptr ); if( xLegend.is()) { - xLegend->setPropertyValue( "Show", uno::Any(false) ); + xLegend->setPropertyValue( u"Show"_ustr, uno::Any(false) ); } } @@ -111,7 +111,7 @@ bool LegendHelper::hasLegend( const rtl::Reference< Diagram > & xDiagram ) { uno::Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendProp.is()) - xLegendProp->getPropertyValue( "Show") >>= bReturn; + xLegendProp->getPropertyValue( u"Show"_ustr) >>= bReturn; } return bReturn; diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx index b3c5fc6ccf53..8b9598c7461c 100644 --- a/chart2/source/tools/LinePropertiesHelper.cxx +++ b/chart2/source/tools/LinePropertiesHelper.cxx @@ -109,11 +109,11 @@ bool LinePropertiesHelper::IsLineVisible( const css::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; + xLineProperties->getPropertyValue( u"LineStyle"_ustr ) >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) { sal_Int16 nLineTransparence=0; - xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence; + xLineProperties->getPropertyValue( u"LineTransparence"_ustr ) >>= nLineTransparence; if(nLineTransparence!=100) { bRet = true; @@ -136,14 +136,14 @@ void LinePropertiesHelper::SetLineVisible( const css::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; + xLineProperties->getPropertyValue( u"LineStyle"_ustr ) >>= aLineStyle; if( aLineStyle == drawing::LineStyle_NONE ) - xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ); + xLineProperties->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ); sal_Int16 nLineTransparence=0; - xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence; + xLineProperties->getPropertyValue( u"LineTransparence"_ustr ) >>= nLineTransparence; if(nLineTransparence==100) - xLineProperties->setPropertyValue( "LineTransparence", uno::Any( sal_Int16(0) ) ); + xLineProperties->setPropertyValue( u"LineTransparence"_ustr, uno::Any( sal_Int16(0) ) ); } } catch( const uno::Exception & ) @@ -160,9 +160,9 @@ void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; + xLineProperties->getPropertyValue( u"LineStyle"_ustr ) >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) - xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) ); + xLineProperties->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } } catch( const uno::Exception & ) @@ -178,7 +178,7 @@ void LinePropertiesHelper::SetLineColor( const css::uno::Reference< { if( xLineProperties.is() ) { - xLineProperties->setPropertyValue( "LineColor", uno::Any( nColor ) ); + xLineProperties->setPropertyValue( u"LineColor"_ustr, uno::Any( nColor ) ); } } catch( const uno::Exception & ) diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index ac67a12e5e9b..b9bfd1a303a7 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -112,7 +112,7 @@ OUString MeanValueRegressionCurveCalculator::ImplGetRepresentation( { *pFormulaLength -= aBuf.getLength(); if ( *pFormulaLength <= 0 ) - return "###"; + return u"###"_ustr; } return ( aBuf + getFormattedString( xNumFormatter, nNumberFormatKey, m_fMeanValue, pFormulaLength ) ); } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index f71262f738b9..6d3f2b01d6fc 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -159,7 +159,7 @@ OUString MovingAverageRegressionCurveCalculator::ImplGetRepresentation( { OUString aRet = SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS ); // change text for Moving Average - OUString aWildcard( "%PERIOD" ); + OUString aWildcard( u"%PERIOD"_ustr ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { // replace period diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index 1cc79a8eaec0..da21b751a6df 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -49,7 +49,7 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() { - return "com.sun.star.comp.chart.XMLNameSpaceMap"; + return u"com.sun.star.comp.chart.XMLNameSpaceMap"_ustr; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) @@ -59,7 +59,7 @@ sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() { - return { "com.sun.star.xml.NamespaceMap" }; + return { u"com.sun.star.xml.NamespaceMap"_ustr }; } // XNameContainer diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index e00df1fae04e..9687fd60e161 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -53,7 +53,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum { uno::Reference<beans::XPropertySet> xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY); - OUString sNullDate( "NullDate" ); + OUString sNullDate( u"NullDate"_ustr ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) ) m_aNullDate = xProp->getPropertyValue(sNullDate); SvNumberFormatsSupplierObj* pSupplierObj = comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( xSupplier ); diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 29e7298974da..b35584e12171 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -364,7 +364,7 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) { if( ! SetStyle( xStyle )) throw lang::IllegalArgumentException( - "Empty Style", + u"Empty Style"_ustr, static_cast< beans::XPropertySet * >( this ), 0 ); } diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index d5b2f068c8a0..712ca15796ce 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -459,7 +459,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles( OUString ObjectIdentifier::createParticleForDiagram() { //TODO: if more than one diagram is implemented, add the correct diagram index here - return "D=0"; + return u"D=0"_ustr; } OUString ObjectIdentifier::createParticleForCoordinateSystem( @@ -1238,14 +1238,14 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( { rtl::Reference<ChartType> xChartType( lcl_getFirstStockChartType( xChartModel ) ); if(xChartType.is()) - xChartType->getPropertyValue( "BlackDay" ) >>= xObjectProperties; + xChartType->getPropertyValue( u"BlackDay"_ustr ) >>= xObjectProperties; } break; case OBJECTTYPE_DATA_STOCK_GAIN: { rtl::Reference<ChartType> xChartType( lcl_getFirstStockChartType( xChartModel ) ); if(xChartType.is()) - xChartType->getPropertyValue( "WhiteDay" ) >>= xObjectProperties; + xChartType->getPropertyValue( u"WhiteDay"_ustr ) >>= xObjectProperties; } break; case OBJECTTYPE_DATA_TABLE: diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 48e21eccaf25..60c2b950a970 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -198,11 +198,11 @@ OUString addLineDashUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.DashTable"), + xFact->createInstance( u"com.sun.star.drawing.DashTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartDash ", rPreferredName ); + rValue, xNameCnt, u"ChartDash "_ustr, rPreferredName ); } return OUString(); } @@ -215,11 +215,11 @@ OUString addGradientUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.GradientTable"), + xFact->createInstance( u"com.sun.star.drawing.GradientTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartGradient ", rPreferredName ); + rValue, xNameCnt, u"ChartGradient "_ustr, rPreferredName ); } return OUString(); } @@ -232,11 +232,11 @@ OUString addTransparencyGradientUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.TransparencyGradientTable"), + xFact->createInstance( u"com.sun.star.drawing.TransparencyGradientTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartTransparencyGradient ", rPreferredName ); + rValue, xNameCnt, u"ChartTransparencyGradient "_ustr, rPreferredName ); } return OUString(); } @@ -249,11 +249,11 @@ OUString addHatchUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.HatchTable"), + xFact->createInstance( u"com.sun.star.drawing.HatchTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartHatch ", rPreferredName ); + rValue, xNameCnt, u"ChartHatch "_ustr, rPreferredName ); } return OUString(); } @@ -266,11 +266,11 @@ OUString addBitmapUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.BitmapTable"), + xFact->createInstance( u"com.sun.star.drawing.BitmapTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartBitmap ", rPreferredName ); + rValue, xNameCnt, u"ChartBitmap "_ustr, rPreferredName ); } return OUString(); } diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 1b2ae9153fcd..eb3dffb2bdcc 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -229,7 +229,7 @@ void RangeHighlighter::fillRangesForErrorBars( sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; bUsesRangesAsErrorBars = ( xErrorBar.is() && - (xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle) && + (xErrorBar->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle) && nStyle == css::chart::ErrorBarStyle::FROM_DATA ); } catch( const uno::Exception & ) diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 714fa83b425c..57c2015ad23b 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -67,7 +67,7 @@ void ReferenceSizeProvider::setValuesAtTitle( Reference< beans::XPropertySet > xTitleProp( xTitle, uno::UNO_QUERY_THROW ); awt::Size aOldRefSize; bool bHasOldRefSize( - xTitleProp->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ); + xTitleProp->getPropertyValue( u"ReferencePageSize"_ustr) >>= aOldRefSize ); // set from auto-resize on to off -> adapt font sizes at XFormattedStrings if( bHasOldRefSize && ! useAutoScale()) @@ -172,7 +172,7 @@ void ReferenceSizeProvider::getAutoResizeFromPropSet( { try { - if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue()) + if( xProp->getPropertyValue( u"ReferencePageSize"_ustr ).hasValue()) eSingleState = AUTO_RESIZE_YES; else eSingleState = AUTO_RESIZE_NO; diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 8f22f9834bdc..36cb6c4c621a 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -42,8 +42,8 @@ RegressionCurveCalculator::RegressionCurveCalculator() , mForceIntercept(false) , mInterceptValue(std::numeric_limits<double>::quiet_NaN()) , mPeriod(2) - , mXName("x") - , mYName("f(x)") + , mXName(u"x"_ustr) + , mYName(u"f(x)"_ustr) , mnMovingType(0) { } @@ -76,7 +76,7 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Int32 nMovingType ) { if( aPeriod < 0 ) - throw lang::IllegalArgumentException("aPeriod may not be < 0", static_cast<cppu::OWeakObject*>(this), 3); + throw lang::IllegalArgumentException(u"aPeriod may not be < 0"_ustr, static_cast<cppu::OWeakObject*>(this), 3); mDegree = aDegree; mForceIntercept = aForceIntercept; mInterceptValue = aInterceptValue; @@ -90,12 +90,12 @@ OUString RegressionCurveCalculator::getFormattedString( double fNumber, const sal_Int32* pStringLength /* = nullptr */ ) { if ( pStringLength && *pStringLength <= 0 ) - return "###"; + return u"###"_ustr; OUString aResult; if( xNumFormatter.is() ) { - bool bStandard = ::cppu::any2bool( ::comphelper::getNumberFormatProperty( xNumFormatter, nNumberFormatKey, "StandardFormat" ) ); + bool bStandard = ::cppu::any2bool( ::comphelper::getNumberFormatProperty( xNumFormatter, nNumberFormatKey, u"StandardFormat"_ustr ) ); if( pStringLength && bStandard ) { // round fNumber to *pStringLength characters const sal_Int32 nMinDigit = 6; // minimum significant digits for General format @@ -131,7 +131,7 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa sal_Bool /* bMaySkipPointsInCalculation */ ) { if( nPointCount < 2 ) - throw lang::IllegalArgumentException("too few points", static_cast<cppu::OWeakObject*>(this), 2); + throw lang::IllegalArgumentException(u"too few points"_ustr, static_cast<cppu::OWeakObject*>(this), 2); // determine if scaling and inverse scaling for x-values work bool bDoXScaling( xScalingX.is()); @@ -205,11 +205,11 @@ void RegressionCurveCalculator::addStringToEquation( void SAL_CALL RegressionCurveCalculator::setXYNames( const OUString& aXName, const OUString& aYName ) { if ( aXName.isEmpty() ) - mXName = OUString ("x"); + mXName = u"x"_ustr; else mXName = aXName; if ( aYName.isEmpty() ) - mYName = OUString ("f(x)"); + mYName = u"f(x)"_ustr; else mYName = aYName; } diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index efb6bea5c3aa..193a525737d9 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -193,7 +193,7 @@ void RegressionCurveHelper::initializeCurveCalculator( Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues()); Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); OUString aRole; - if( xProp->getPropertyValue( "Role" ) >>= aRole ) + if( xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) { if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" ) { @@ -372,8 +372,8 @@ void RegressionCurveHelper::addMeanValueLine( uno::Reference< XPropertySet > xProp( xCurve, uno::UNO_QUERY ); if( xProp.is()) { - xProp->setPropertyValue( "LineColor", - xSeriesProp->getPropertyValue( "Color")); + xProp->setPropertyValue( u"LineColor"_ustr, + xSeriesProp->getPropertyValue( u"Color"_ustr)); } } } @@ -392,8 +392,8 @@ void RegressionCurveHelper::addMeanValueLine( if( xSeriesProp.is()) { - xCurve->setPropertyValue( "LineColor", - xSeriesProp->getPropertyValue( "Color")); + xCurve->setPropertyValue( u"LineColor"_ustr, + xSeriesProp->getPropertyValue( u"Color"_ustr)); } } @@ -486,8 +486,8 @@ rtl::Reference< RegressionCurveModel > RegressionCurveHelper::addRegressionCurve uno::Reference< XPropertySet > xSeriesProp( xRegressionCurveContainer, uno::UNO_QUERY ); if( xSeriesProp.is()) { - xCurve->setPropertyValue( "LineColor", - xSeriesProp->getPropertyValue( "Color")); + xCurve->setPropertyValue( u"LineColor"_ustr, + xSeriesProp->getPropertyValue( u"Color"_ustr)); } } } @@ -526,8 +526,8 @@ rtl::Reference< RegressionCurveModel > RegressionCurveHelper::addRegressionCurve comphelper::copyProperties( xPropertySource, xCurve ); else { - xCurve->setPropertyValue( "LineColor", - xRegressionCurveContainer->getPropertyValue( "Color")); + xCurve->setPropertyValue( u"LineColor"_ustr, + xRegressionCurveContainer->getPropertyValue( u"Color"_ustr)); } } xRegressionCurveContainer->addRegressionCurve( xCurve ); @@ -584,10 +584,10 @@ void RegressionCurveHelper::removeEquations( uno::Reference< beans::XPropertySet > xEqProp( curve->getEquationProperties() ) ; if( xEqProp.is()) { - xEqProp->setPropertyValue( "ShowEquation", uno::Any( false )); - xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") )); - xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x) ") )); - xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false )); + xEqProp->setPropertyValue( u"ShowEquation"_ustr, uno::Any( false )); + xEqProp->setPropertyValue( u"XName"_ustr, uno::Any( u"x"_ustr )); + xEqProp->setPropertyValue( u"YName"_ustr, uno::Any( u"f(x) "_ustr )); + xEqProp->setPropertyValue( u"ShowCorrelationCoefficient"_ustr, uno::Any( false )); } } } @@ -827,7 +827,7 @@ OUString RegressionCurveHelper::getRegressionCurveSpecificName(const Reference< if(!xProperties.is()) return aResult; - xProperties->getPropertyValue("CurveName") >>= aResult; + xProperties->getPropertyValue(u"CurveName"_ustr) >>= aResult; return aResult; } @@ -887,8 +887,8 @@ bool RegressionCurveHelper::hasEquation( const Reference< chart2::XRegressionCur { bool bShowEquation = false; bool bShowCoefficient = false; - xEquationProp->getPropertyValue( "ShowEquation") >>= bShowEquation; - xEquationProp->getPropertyValue( "ShowCorrelationCoefficient") >>= bShowCoefficient; + xEquationProp->getPropertyValue( u"ShowEquation"_ustr) >>= bShowEquation; + xEquationProp->getPropertyValue( u"ShowCorrelationCoefficient"_ustr) >>= bShowCoefficient; bHasEquation = bShowEquation || bShowCoefficient; } } @@ -903,7 +903,7 @@ bool RegressionCurveHelper::MayHaveCorrelationCoefficient( const Reference< char uno::Reference< beans::XPropertySet > xEquationProp( xCurve->getEquationProperties() ); if( xEquationProp.is() ) { - xEquationProp->getPropertyValue( "MayHaveCorrelationCoefficient") >>= bMayHaveCorrelationCoefficient; + xEquationProp->getPropertyValue( u"MayHaveCorrelationCoefficient"_ustr) >>= bMayHaveCorrelationCoefficient; } } return bMayHaveCorrelationCoefficient; diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 06be003ef106..7bc16f64fc96 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -193,7 +193,7 @@ void RegressionCurveModel::setPropertyMayHaveR2() { if( m_xEquationProperties.is()) { bool bMayHaveR2 = m_eRegressionCurveType != CURVE_TYPE_MOVING_AVERAGE; - m_xEquationProperties->setPropertyValue( "MayHaveCorrelationCoefficient", uno::Any( bMayHaveR2 ) ); + m_xEquationProperties->setPropertyValue( u"MayHaveCorrelationCoefficient"_ustr, uno::Any( bMayHaveR2 ) ); } } @@ -203,19 +203,19 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() switch( m_eRegressionCurveType ) { case CURVE_TYPE_MEAN_VALUE: - return "com.sun.star.chart2.MeanValueRegressionCurve"; + return u"com.sun.star.chart2.MeanValueRegressionCurve"_ustr; case CURVE_TYPE_LINEAR: - return "com.sun.star.chart2.LinearRegressionCurve"; + return u"com.sun.star.chart2.LinearRegressionCurve"_ustr; case CURVE_TYPE_LOGARITHM: - return "com.sun.star.chart2.LogarithmicRegressionCurve"; + return u"com.sun.star.chart2.LogarithmicRegressionCurve"_ustr; case CURVE_TYPE_EXPONENTIAL: - return "com.sun.star.chart2.ExponentialRegressionCurve"; + return u"com.sun.star.chart2.ExponentialRegressionCurve"_ustr; case CURVE_TYPE_POWER: - return "com.sun.star.chart2.PotentialRegressionCurve"; + return u"com.sun.star.chart2.PotentialRegressionCurve"_ustr; case CURVE_TYPE_POLYNOMIAL: - return "com.sun.star.chart2.PolynomialRegressionCurve"; + return u"com.sun.star.chart2.PolynomialRegressionCurve"_ustr; case CURVE_TYPE_MOVING_AVERAGE: - return "com.sun.star.chart2.MovingAverageRegressionCurve"; + return u"com.sun.star.chart2.MovingAverageRegressionCurve"_ustr; } return OUString(); @@ -298,7 +298,7 @@ MeanValueRegressionCurve::~MeanValueRegressionCurve() OUString SAL_CALL MeanValueRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.MeanValueRegressionCurve"; + return u"com.sun.star.comp.chart2.MeanValueRegressionCurve"_ustr; } sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rServiceName ) @@ -308,7 +308,7 @@ sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rSe css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.MeanValueRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.MeanValueRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() @@ -328,7 +328,7 @@ LinearRegressionCurve::~LinearRegressionCurve() OUString SAL_CALL LinearRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.LinearRegressionCurve"; + return u"com.sun.star.comp.chart2.LinearRegressionCurve"_ustr; } sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServiceName ) @@ -338,7 +338,7 @@ sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServi css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.LinearRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.LinearRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() @@ -358,7 +358,7 @@ LogarithmicRegressionCurve::~LogarithmicRegressionCurve() OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.LogarithmicRegressionCurve"; + return u"com.sun.star.comp.chart2.LogarithmicRegressionCurve"_ustr; } sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& rServiceName ) @@ -368,7 +368,7 @@ sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& r css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.LogarithmicRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.LogarithmicRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() @@ -388,7 +388,7 @@ ExponentialRegressionCurve::~ExponentialRegressionCurve() OUString SAL_CALL ExponentialRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.ExponentialRegressionCurve"; + return u"com.sun.star.comp.chart2.ExponentialRegressionCurve"_ustr; } sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& rServiceName ) @@ -398,7 +398,7 @@ sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& r css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.ExponentialRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.ExponentialRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() @@ -418,7 +418,7 @@ PotentialRegressionCurve::~PotentialRegressionCurve() OUString SAL_CALL PotentialRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.PotentialRegressionCurve"; + return u"com.sun.star.comp.chart2.PotentialRegressionCurve"_ustr; } sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rServiceName ) @@ -428,7 +428,7 @@ sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rSe css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.PotentialRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.PotentialRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() @@ -448,7 +448,7 @@ PolynomialRegressionCurve::~PolynomialRegressionCurve() OUString SAL_CALL PolynomialRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.PolynomialRegressionCurve"; + return u"com.sun.star.comp.chart2.PolynomialRegressionCurve"_ustr; } sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rServiceName ) @@ -458,7 +458,7 @@ sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rS css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.PolynomialRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.PolynomialRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() @@ -478,7 +478,7 @@ MovingAverageRegressionCurve::~MovingAverageRegressionCurve() OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.MovingAverageRegressionCurve"; + return u"com.sun.star.comp.chart2.MovingAverageRegressionCurve"_ustr; } sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& rServiceName ) @@ -488,7 +488,7 @@ sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.MovingAverageRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.MovingAverageRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 34bbd6b491d9..e487ec6d5242 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -121,8 +121,8 @@ void lcl_AddPropertiesToVector( ::chart::CharacterProperties::AddDefaultsToMap( aOutMap ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_SHOW, false ); - ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_XNAME, OUString("x") ); - ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_YNAME, OUString("f(x)") ); + ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_XNAME, u"x"_ustr ); + ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_YNAME, u"f(x)"_ustr ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_MAY_HAVE_CORRELATION_COEFF, true ); //::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_SEPARATOR, OUString( '\n' )); @@ -268,7 +268,7 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< OUString SAL_CALL RegressionEquation::getImplementationName() { - return "com.sun.star.comp.chart2.RegressionEquation"; + return u"com.sun.star.comp.chart2.RegressionEquation"_ustr; } sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName ) @@ -278,11 +278,11 @@ sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionEquation", - "com.sun.star.beans.PropertySet", - "com.sun.star.drawing.FillProperties", - "com.sun.star.drawing.LineProperties", - "com.sun.star.style.CharacterProperties" }; + return { u"com.sun.star.chart2.RegressionEquation"_ustr, + u"com.sun.star.beans.PropertySet"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr }; } using impl::RegressionEquation_Base; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index b7179537c43b..940fe7e92521 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -160,7 +160,7 @@ uno::Reference< XScaling > SAL_CALL { // ToDo: ApproxEqual ? if( m_fSlope == 0 ) - throw uno::RuntimeException("Divide by zero exception"); + throw uno::RuntimeException(u"Divide by zero exception"_ustr); return new LinearScaling( 1.0 / m_fSlope, m_fOffset / m_fSlope ); } @@ -208,7 +208,7 @@ uno::Reference< XScaling > SAL_CALL { // ToDo: ApproxEqual ? if( m_fExponent == 0 ) - throw uno::RuntimeException("Divide by zero exception"); + throw uno::RuntimeException(u"Divide by zero exception"_ustr); return new PowerScaling( 1.0 / m_fExponent ); } diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 5f3bbdf802d6..618236d7efbd 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -112,7 +112,7 @@ void lcl_setRole( { Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->setPropertyValue( "Role", uno::Any( rRole )); + xSeqProp->setPropertyValue( u"Role"_ustr, uno::Any( rRole )); } void lcl_addSequenceToDataSource( @@ -299,7 +299,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( OSL_ASSERT( xErrorBar.is()); if( xErrorBar.is()) { - xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( nStyle )); + xErrorBar->setPropertyValue( u"ErrorBarStyle"_ustr, uno::Any( nStyle )); } xDataSeries->setPropertyValue( aPropName, uno::Any( xErrorBar )); @@ -329,7 +329,7 @@ bool StatisticsHelper::hasErrorBars( sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && - ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && + ( xErrorBar->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle ) && nStyle != css::chart::ErrorBarStyle::NONE ); } @@ -339,7 +339,7 @@ void StatisticsHelper::removeErrorBars( { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); if ( xErrorBar.is()) - xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( + xErrorBar->setPropertyValue( u"ErrorBarStyle"_ustr, uno::Any( css::chart::ErrorBarStyle::NONE )); } @@ -351,7 +351,7 @@ bool StatisticsHelper::usesErrorBarRanges( sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && - ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && + ( xErrorBar->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle ) && nStyle == css::chart::ErrorBarStyle::FROM_DATA ); } diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 47fa8bb49317..f8bb84a26f06 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -48,7 +48,7 @@ bool lcl_isRightAngledAxesSetAndSupported( const rtl::Reference< Diagram >& xDia if( xDiagram.is() ) { bool bRightAngledAxes = false; - xDiagram->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes; + xDiagram->getPropertyValue( u"RightAngledAxes"_ustr) >>= bRightAngledAxes; if(bRightAngledAxes) { if( ChartTypeHelper::isSupportingRightAngledAxes( @@ -665,8 +665,8 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram->getDataSeries(); sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() ); - OUString aPercentDiagonalPropertyName( "PercentDiagonal" ); - OUString aBorderStylePropertyName( "BorderStyle" ); + OUString aPercentDiagonalPropertyName( u"PercentDiagonal"_ustr ); + OUString aBorderStylePropertyName( u"BorderStyle"_ustr ); for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS ) { @@ -765,10 +765,10 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines( for( auto const& xSeries : aSeriesList) { if( nRoundedEdges>=0 && nRoundedEdges<=100 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "PercentDiagonal", aARoundedEdges ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"PercentDiagonal"_ustr, aARoundedEdges ); if( nObjectLines==0 || nObjectLines==1 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", aALineStyle ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, aALineStyle ); } } diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index e9f76c619985..3cbfe810e1b1 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -185,7 +185,7 @@ rtl::Reference< Title > TitleHelper::createOrShowTitle( rtl::Reference< Title > xTitled( TitleHelper::getTitle( eTitleType, xModel ) ); if( xTitled.is()) { - xTitled->setPropertyValue("Visible",css::uno::Any(true)); + xTitled->setPropertyValue(u"Visible"_ustr,css::uno::Any(true)); return xTitled; } else @@ -221,7 +221,7 @@ rtl::Reference< Title > TitleHelper::createTitle( } if( xAxis.is() ) { - xAxis->setPropertyValue( "Show", uno::Any( false ) ); + xAxis->setPropertyValue( u"Show"_ustr, uno::Any( false ) ); xTitled = lcl_getTitleParent( eTitleType, xModel ); } } @@ -279,7 +279,7 @@ rtl::Reference< Title > TitleHelper::createTitle( || (!bIsVertical && eTitleType == TitleHelper::SECONDARY_Y_AXIS_TITLE) || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) ) { - xTitle->setPropertyValue( "TextRotation", uno::Any( 90.0 )); + xTitle->setPropertyValue( u"TextRotation"_ustr, uno::Any( 90.0 )); } } catch( const uno::Exception & ) @@ -334,7 +334,7 @@ void TitleHelper::setFormattedString( const rtl::Reference< Title >& xTitle, return; bool bStacked = false; - xTitle->getPropertyValue("StackCharacters") >>= bStacked; + xTitle->getPropertyValue(u"StackCharacters"_ustr) >>= bStacked; if (bStacked) { @@ -358,7 +358,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText bool bStacked = false; if( xTitle.is() ) - xTitle->getPropertyValue( "StackCharacters" ) >>= bStacked; + xTitle->getPropertyValue( u"StackCharacters"_ustr ) >>= bStacked; OUString aNewText = rNewText; if( bStacked ) @@ -399,9 +399,9 @@ void TitleHelper::setCompleteString( const OUString& rNewText try { uno::Any aFontSize( *pDefaultCharHeight ); - xFormattedString->setPropertyValue( "CharHeight", aFontSize ); - xFormattedString->setPropertyValue( "CharHeightAsian", aFontSize ); - xFormattedString->setPropertyValue( "CharHeightComplex", aFontSize ); + xFormattedString->setPropertyValue( u"CharHeight"_ustr, aFontSize ); + xFormattedString->setPropertyValue( u"CharHeightAsian"_ustr, aFontSize ); + xFormattedString->setPropertyValue( u"CharHeightComplex"_ustr, aFontSize ); } catch( const uno::Exception & ) { @@ -450,7 +450,7 @@ void TitleHelper::hideTitle( TitleHelper::eTitleType nTitleIndex if( xTitled.is()) { css::uno::Reference<css::beans::XPropertySet> xProps(xTitled, css::uno::UNO_QUERY_THROW); - xProps->setPropertyValue("Visible",css::uno::Any(false)); + xProps->setPropertyValue(u"Visible"_ustr,css::uno::Any(false)); } } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index b7929719df02..f718b051f655 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -93,19 +93,19 @@ UncachedDataSequence::~UncachedDataSequence() void UncachedDataSequence::registerProperties() { - registerProperty( "NumberFormatKey", + registerProperty( u"NumberFormatKey"_ustr, PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, cppu::UnoType<decltype(m_nNumberFormatKey)>::get() ); - registerProperty( "Role", + registerProperty( u"Role"_ustr, PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, cppu::UnoType<decltype(m_sRole)>::get() ); - registerProperty( "CachedXMLRange", + registerProperty( u"CachedXMLRange"_ustr, PROP_XML_RANGE, 0, // PropertyAttributes & m_aXMLRange, @@ -151,9 +151,9 @@ css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServic { return { lcl_aServiceName, - "com.sun.star.chart2.data.DataSequence", - "com.sun.star.chart2.data.NumericalDataSequence", - "com.sun.star.chart2.data.TextualDataSequence" + u"com.sun.star.chart2.data.DataSequence"_ustr, + u"com.sun.star.chart2.data.NumericalDataSequence"_ustr, + u"com.sun.star.chart2.data.TextualDataSequence"_ustr }; } diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 4e62dca5bd10..170aaa5b2e52 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -70,12 +70,12 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) { - rList.emplace_back( new WrappedIgnoreProperty( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineDashName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineColor", uno::Any( sal_Int32(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineTransparence", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineWidth", uno::Any( sal_Int32(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineJoint", uno::Any( drawing::LineJoint_ROUND ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineDashName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineColor"_ustr, uno::Any( sal_Int32(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineTransparence"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineWidth"_ustr, uno::Any( sal_Int32(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineJoint"_ustr, uno::Any( drawing::LineJoint_ROUND ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) @@ -86,26 +86,26 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< std::unique_ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) { - rList.emplace_back( new WrappedIgnoreProperty( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillColor", uno::Any( sal_Int32(-1) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillTransparence", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillGradientName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillHatchName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBackground", uno::Any( false ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillStyle"_ustr, uno::Any( drawing::FillStyle_SOLID ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillColor"_ustr, uno::Any( sal_Int32(-1) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillTransparence"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillTransparenceGradientName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillGradientName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillHatchName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBackground"_ustr, uno::Any( false ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) { - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::Any( drawing::RectanglePoint_LEFT_TOP ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::Any( false ) ) );//todo correct default? - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::Any( sal_Int32(10) ) ) );//todo which default? - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::Any( sal_Int32(10) ) ) );//todo which default? - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::Any( drawing::BitmapMode_REPEAT ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapOffsetX"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapOffsetY"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapPositionOffsetX"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapPositionOffsetY"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapRectanglePoint"_ustr, uno::Any( drawing::RectanglePoint_LEFT_TOP ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapLogicalSize"_ustr, uno::Any( false ) ) );//todo correct default? + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapSizeX"_ustr, uno::Any( sal_Int32(10) ) ) );//todo which default? + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapSizeY"_ustr, uno::Any( sal_Int32(10) ) ) );//todo which default? + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapMode"_ustr, uno::Any( drawing::BitmapMode_REPEAT ) ) ); } } //namespace chart |