summaryrefslogtreecommitdiff
path: root/xmloff/source/chart
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/chart')
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.cxx2
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx2
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx2
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx3
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx4
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx50
6 files changed, 31 insertions, 32 deletions
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 3ddf60b4b9c9..b14618fefa42 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -779,7 +779,7 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
if( xMainXAxisProp.is() && xMainYAxisProp.is() )
{
chart2::ScaleData aMainXScale = xMainXAxis->getScaleData();
- if( 0 == rChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) )
+ if( 0 == rChartTypeServiceName.reverseCompareTo( "com.sun.star.chart2.ScatterChartType" ) )
{
xMainYAxisProp->setPropertyValue( OUString("CrossoverPosition")
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 608c3422d716..0632b6b84fd4 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -862,7 +862,7 @@ void SchXMLChartContext::EndElement()
bool bLinesOn = true;
if( (maSeriesDefaultsAndStyles.maLinesOnProperty >>= bLinesOn) && !bLinesOn )
{
- if( 0 == maChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) )
+ if( 0 == maChartTypeServiceName.reverseCompareTo( "com.sun.star.chart2.ScatterChartType" ) )
{
bSwitchOffLinesForScatter = true;
SchXMLSeries2Context::switchSeriesLinesOff( maSeriesDefaultsAndStyles.maSeriesStyleList );
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index a84f714c5761..e15819bf91ec 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2088,7 +2088,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
// stock-chart elements
OUString sChartType ( xDiagram->getDiagramType());
- if( 0 == sChartType.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart.StockDiagram" )))
+ if( 0 == sChartType.reverseCompareTo( "com.sun.star.chart.StockDiagram" ))
{
Reference< chart::XStatisticDisplay > xStockPropProvider( xDiagram, uno::UNO_QUERY );
if( xStockPropProvider.is())
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 0697e8e89593..8d10bf134e2d 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -598,8 +598,7 @@ void SchXMLPlotAreaContext::EndElement()
}
// #i32366# stock has volume
- if( ( 0 == mxDiagram->getDiagramType().reverseCompareToAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart.StockDiagram" ))) &&
+ if( ( 0 == mxDiagram->getDiagramType().reverseCompareTo("com.sun.star.chart.StockDiagram" )) &&
mbStockHasVolume )
{
try
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index e3188b945a6a..2764efc8ebf8 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -275,9 +275,9 @@ SchXMLSeries2Context::SchXMLSeries2Context(
mbSymbolSizeIsMissingInFile(false),
maChartSize( rChartSize )
{
- if( 0 == aGlobalChartTypeName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.DonutChartType" ) ) )
+ if( 0 == aGlobalChartTypeName.reverseCompareTo( "com.sun.star.chart2.DonutChartType" ) )
{
- maSeriesChartTypeName = ::rtl::OUString("com.sun.star.chart2.PieChartType" );
+ maSeriesChartTypeName = "com.sun.star.chart2.PieChartType";
maGlobalChartTypeName = maSeriesChartTypeName;
}
}
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 2c83c3e9d208..974a6c57b17e 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -223,58 +223,58 @@ OUString GetChartTypeByClassName(
bool bInternalType = false;
if( bUseOldNames )
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart."));
+ aResultBuffer.append( "com.sun.star.chart.");
else
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2."));
+ aResultBuffer.append( "com.sun.star.chart2.");
bInternalType = true;
if( IsXMLToken( rClassName, XML_LINE ))
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Line"));
+ aResultBuffer.append("Line");
else if( IsXMLToken( rClassName, XML_AREA ))
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Area"));
+ aResultBuffer.append("Area");
else if( IsXMLToken( rClassName, XML_BAR ))
{
if( bUseOldNames )
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Bar"));
+ aResultBuffer.append("Bar");
else
{
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Column"));
+ aResultBuffer.append("Column");
// @todo: might be Bar
}
}
else if( IsXMLToken( rClassName, XML_CIRCLE ))
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Pie"));
+ aResultBuffer.append("Pie");
else if( IsXMLToken( rClassName, XML_RING ))
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Donut"));
+ aResultBuffer.append("Donut");
else if( IsXMLToken( rClassName, XML_SCATTER ))
{
if( bUseOldNames )
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("XY"));
+ aResultBuffer.append("XY");
else
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Scatter"));
+ aResultBuffer.append("Scatter");
}
else if( IsXMLToken( rClassName, XML_BUBBLE ))
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Bubble"));
+ aResultBuffer.append("Bubble");
else if( IsXMLToken( rClassName, XML_RADAR ))
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Net"));
+ aResultBuffer.append("Net");
else if( IsXMLToken( rClassName, XML_FILLED_RADAR ))
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("FilledNet"));
+ aResultBuffer.append("FilledNet");
else if( IsXMLToken( rClassName, XML_STOCK ))
{
if( bUseOldNames )
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Stock"));
+ aResultBuffer.append("Stock");
else
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("CandleStick"));
+ aResultBuffer.append("CandleStick");
}
else if( IsXMLToken( rClassName, XML_SURFACE ))
{
//@todo change this if a surface chart is available
if( bUseOldNames )
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Bar"));
+ aResultBuffer.append("Bar");
else
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Column"));
+ aResultBuffer.append("Column");
}
else
bInternalType = false;
@@ -283,9 +283,9 @@ OUString GetChartTypeByClassName(
return OUString();
if( bUseOldNames )
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Diagram"));
+ aResultBuffer.append("Diagram");
else
- aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("ChartType"));
+ aResultBuffer.append("ChartType");
return aResultBuffer.makeStringAndClear();
@@ -322,15 +322,15 @@ XMLTokenEnum getTokenByChartType(
eResult = XML_LINE;
else if ( aServiceName == "Area" )
eResult = XML_AREA;
- else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bar")) ||
- (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Column"))))
+ else if( aServiceName == "Bar" ||
+ (!bUseOldNames && aServiceName == "Column"))
eResult = XML_BAR;
else if ( aServiceName == "Pie" )
eResult = XML_CIRCLE;
else if ( aServiceName == "Donut" )
eResult = XML_RING;
- else if( (bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("XY"))) ||
- (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Scatter"))))
+ else if( (bUseOldNames && aServiceName == "XY") ||
+ (!bUseOldNames && aServiceName == "Scatter"))
eResult = XML_SCATTER;
else if ( aServiceName == "Bubble" )
eResult = XML_BUBBLE;
@@ -338,8 +338,8 @@ XMLTokenEnum getTokenByChartType(
eResult = XML_RADAR;
else if ( aServiceName == "FilledNet" )
eResult = XML_FILLED_RADAR;
- else if( (bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Stock"))) ||
- (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CandleStick"))))
+ else if( (bUseOldNames && aServiceName == "Stock") ||
+ (!bUseOldNames && aServiceName == "CandleStick"))
eResult = XML_STOCK;
}
}
generated by cgit (git 2.34.1) at 2025-01-16 08:43:57 +0000