summaryrefslogtreecommitdiff
path: root/xmloff/source/chart
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-06 09:38:44 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-06 09:38:44 +0100
commit41a000b7428ea111f99acf1ce00c1d34747e987e (patch)
treea5f95de375ef3b9c63f65e1aaaf83a66f068d4d1 /xmloff/source/chart
parentfd80fa38db85129934326e7e31f249a967c5ec04 (diff)
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: Ibb9372bc45a0bc0b9083ad0e405440bbbe5ef678
Diffstat (limited to 'xmloff/source/chart')
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.cxx2
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx10
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx16
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx6
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx4
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx2
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx4
7 files changed, 22 insertions, 22 deletions
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index c480081568f3..9f8a0dea35c3 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -567,7 +567,7 @@ void SchXMLAxisContext::CreateAxis()
}
m_rbAxisPositionAttributeImported = m_rbAxisPositionAttributeImported || SchXMLTools::getPropertyFromContext(
- OUString("CrossoverPosition"), pPropStyleContext, pStylesCtxt ).hasValue();
+ "CrossoverPosition", pPropStyleContext, pStylesCtxt ).hasValue();
}
}
}
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index b33438aa6c1c..0637caa9285c 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -957,27 +957,27 @@ void SchXMLChartContext::MergeSeriesForStockChart()
if( bHasJapaneseCandlestick )
{
// open values
- lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString( "values-first" ));
+ lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], "values-first");
aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
// low values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString( "values-min" ));
+ aNewSeries[i], "values-min");
}
else
{
// low values
- lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString( "values-min" ));
+ lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], "values-min");
aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
}
// high values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString( "values-max" ));
+ aNewSeries[i], "values-max");
// close values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString( "values-last" ));
+ aNewSeries[i], "values-last");
}
xDSContainer->setDataSeries( aNewSeries );
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 527be5994144..01a9b21141e8 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -432,7 +432,7 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c
//the first x-values is always the next sequence //todo ... other x-values get lost for old format
Reference< chart2::data::XLabeledDataSequence > xXValues(
- lcl_getDataSequenceByRole( aSeriesSeqVector, OUString( "values-x" ) ) );
+ lcl_getDataSequenceByRole( aSeriesSeqVector, "values-x" ) );
if( xXValues.is() )
aLabeledSeqVector.push_back( xXValues );
@@ -2768,7 +2768,7 @@ void SchXMLExportHelper_Impl::exportSeries(
Reference< chart2::data::XDataSequence > xYValuesForBubbleChart;
if( bIsBubbleChart )
{
- Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString( "values-y" ) ) );
+ Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, "values-y" ) );
if( xSequence.is() )
{
xYValuesForBubbleChart = xSequence->getValues();
@@ -2778,7 +2778,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
if( bIsScatterChart || bIsBubbleChart )
{
- Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString( "values-x" ) ) );
+ Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, "values-x" ) );
if( xSequence.is() )
{
Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
@@ -3139,7 +3139,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
xSource->getDataSequences());
sal_Int32 nSeriesLength =
- lcl_getSequenceLengthByRole( aSeqCnt, OUString( "values-last" ));
+ lcl_getSequenceLengthByRole( aSeqCnt, "values-last");
if( bExportContent )
{
@@ -3151,7 +3151,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
if( bJapaneseCandleSticks )
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString( "values-first" ), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, "values-first", xNewDoc, m_aDataSequencesToExport ));
if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( !aRanges.first.isEmpty())
@@ -3168,7 +3168,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// low
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString( "values-min" ), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, "values-min", xNewDoc, m_aDataSequencesToExport ));
if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( !aRanges.first.isEmpty())
@@ -3185,7 +3185,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// high
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString( "values-max" ), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, "values-max", xNewDoc, m_aDataSequencesToExport ));
if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( !aRanges.first.isEmpty())
@@ -3202,7 +3202,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// close
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString( "values-last" ), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, "values-last", xNewDoc, m_aDataSequencesToExport ));
if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( !aRanges.first.isEmpty())
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 6b5a4a22ccaa..9f5b9c0d79b7 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -322,7 +322,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
//lines on/off
//this old property is not supported fully anymore with the new chart, so we need to get the information a little bit different from similar properties
mrSeriesDefaultsAndStyles.maLinesOnProperty = SchXMLTools::getPropertyFromContext(
- OUString("Lines"), pPropStyleContext, pStylesCtxt );
+ "Lines", pPropStyleContext, pStylesCtxt );
//handle automatic position and size
m_aOuterPositioning.readAutomaticPositioningProperties( pPropStyleContext, pStylesCtxt );
@@ -736,9 +736,9 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS
{
//handle automatic position and size
SchXMLTools::getPropertyFromContext(
- OUString("AutomaticSize"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize;
+ "AutomaticSize", pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize;
SchXMLTools::getPropertyFromContext(
- OUString("AutomaticPosition"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition;
+ "AutomaticPosition", pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition;
}
}
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index fcb0a910ca26..871797e34052 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -172,7 +172,7 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe
void lcl_resetSymbolSizeForPointsIfNecessary( const uno::Reference< beans::XPropertySet >& xPointProp, const SvXMLImport& rImport
, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt )
{
- uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize"), pPropStyleContext, pStylesCtxt ) );
+ uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( "SymbolSize", pPropStyleContext, pStylesCtxt ) );
if( !aASymbolSize.hasValue() )
lcl_setSymbolSizeIfNeeded( xPointProp, rImport );
}
@@ -481,7 +481,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
const XMLPropStyleContext* pPropStyleContext = dynamic_cast< const XMLPropStyleContext * >( pStyle );
- uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize")
+ uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( "SymbolSize"
, pPropStyleContext, pStylesCtxt ) );
mbSymbolSizeIsMissingInFile = !aASymbolSize.hasValue();
}
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 409e1f623884..dea1a00f6a06 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -954,7 +954,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
if( ! bCategoriesApplied )
{
SchXMLTools::CreateCategories(
- xDataProv, xChartDoc, OUString("categories"),
+ xDataProv, xChartDoc, "categories",
0 /* nCooSysIndex */, 0 /* nDimension */ );
}
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index ca3f36b9bedd..b308c6597280 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -106,8 +106,8 @@ void XMLChartStyleContext::FillPropertySet(
DBG_ASSERT( false, "unknown property exception -> shape style not completely imported for chart style" );
}
- lcl_NumberFormatStyleToProperty( msDataStyleName, OUString( "NumberFormat" ), mrStyles, rPropSet );
- lcl_NumberFormatStyleToProperty( msPercentageDataStyleName, OUString( "PercentageNumberFormat" ), mrStyles, rPropSet );
+ lcl_NumberFormatStyleToProperty( msDataStyleName, "NumberFormat", mrStyles, rPropSet );
+ lcl_NumberFormatStyleToProperty( msPercentageDataStyleName, "PercentageNumberFormat", mrStyles, rPropSet );
}
SvXMLImportContext *XMLChartStyleContext::CreateChildContext(