summaryrefslogtreecommitdiff
path: root/oox/source/drawingml/chart
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/drawingml/chart')
-rw-r--r--oox/source/drawingml/chart/axisconverter.cxx12
-rw-r--r--oox/source/drawingml/chart/chartconverter.cxx2
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx2
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx2
-rw-r--r--oox/source/drawingml/chart/plotareaconverter.cxx2
-rw-r--r--oox/source/drawingml/chart/seriesconverter.cxx32
-rw-r--r--oox/source/drawingml/chart/titleconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/typegroupconverter.cxx20
8 files changed, 39 insertions, 39 deletions
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index bf4b4f87a667..1ad07f53776d 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -130,7 +130,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
ObjectFormatter& rFormatter = getFormatter();
// create the axis object (always)
- xAxis.set( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Axis" ) ), UNO_QUERY_THROW );
+ xAxis.set( createInstance( "com.sun.star.chart2.Axis" ), UNO_QUERY_THROW );
PropertySet aAxisProp( xAxis );
// #i58688# axis enabled
aAxisProp.setProperty( PROP_Show, !mrModel.mbDeleted );
@@ -219,7 +219,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
if( mrModel.mnTypeId == C_TOKEN( dateAx ) )
{
// scaling algorithm
- aScaleData.Scaling.set( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.LinearScaling" ) ), UNO_QUERY );
+ aScaleData.Scaling.set( createInstance( "com.sun.star.chart2.LinearScaling" ), UNO_QUERY );
// min/max
lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin );
lclSetValueOrClearAny( aScaleData.Maximum, mrModel.mofMax );
@@ -250,8 +250,8 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
// scaling algorithm
bool bLogScale = lclIsLogarithmicScale( mrModel );
OUString aScalingService = bLogScale ?
- CREATE_OUSTRING( "com.sun.star.chart2.LogarithmicScaling" ) :
- CREATE_OUSTRING( "com.sun.star.chart2.LinearScaling" );
+ OUString( "com.sun.star.chart2.LogarithmicScaling" ) :
+ OUString( "com.sun.star.chart2.LinearScaling" );
aScaleData.Scaling.set( createInstance( aScalingService ), UNO_QUERY );
// min/max
lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin );
@@ -334,7 +334,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
{
Reference< XTitled > xTitled( xAxis, UNO_QUERY_THROW );
TitleConverter aTitleConv( *this, *mrModel.mxTitle );
- aTitleConv.convertFromModel( xTitled, CREATE_OUSTRING( "Axis Title" ), OBJECTTYPE_AXISTITLE, nAxesSetIdx, nAxisIdx );
+ aTitleConv.convertFromModel( xTitled, "Axis Title", OBJECTTYPE_AXISTITLE, nAxesSetIdx, nAxisIdx );
}
}
catch( Exception& )
@@ -358,4 +358,4 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
} // namespace drawingml
} // namespace oox
-/* vim:n:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index 607572d489f9..e280f088da8d 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -54,7 +54,7 @@ static OUString lclGenerateApiString( const OUString& rString )
OUString aRetString = rString;
sal_Int32 nQuotePos = aRetString.getLength();
while( (nQuotePos = aRetString.lastIndexOf( '"', nQuotePos )) >= 0 )
- aRetString = aRetString.replaceAt( nQuotePos, 1, CREATE_OUSTRING( "\"\"" ) );
+ aRetString = aRetString.replaceAt( nQuotePos, 1, "\"\"" );
return OUStringBuffer().append( sal_Unicode( '"' ) ).append( aRetString ).append( sal_Unicode( '"' ) ).makeStringAndClear();
}
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index dd7bded7d01d..db0421585aac 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -120,7 +120,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
if( mrModel.mxTitle.is() || !aAutoTitle.isEmpty() )
{
if( aAutoTitle.isEmpty() )
- aAutoTitle = CREATE_OUSTRING( "Chart Title" );
+ aAutoTitle = "Chart Title";
Reference< XTitled > xTitled( getChartDocument(), UNO_QUERY_THROW );
TitleConverter aTitleConv( *this, mrModel.mxTitle.getOrCreate() );
aTitleConv.convertFromModel( xTitled, aAutoTitle, OBJECTTYPE_CHARTTITLE );
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 8c3695993e43..dc76fef505e2 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1014,7 +1014,7 @@ void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32
ObjectFormatterData::ObjectFormatterData( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) :
mrFilter( rFilter ),
maModelObjHelper( Reference< XMultiServiceFactory >( rxChartDoc, UNO_QUERY ) ),
- maEnUsLocale( CREATE_OUSTRING( "en" ), CREATE_OUSTRING( "US" ), OUString() ),
+ maEnUsLocale( "en", "US", OUString() ),
mnMaxSeriesIdx( -1 )
{
const ObjectTypeFormatEntry* pEntryEnd = STATIC_ARRAY_END( spObjTypeFormatEntries );
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index 5346291a5c22..ff67b5fb3a1e 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -318,7 +318,7 @@ void PlotAreaConverter::convertFromModel( View3DModel& rView3DModel )
Reference< XDiagram > xDiagram;
try
{
- xDiagram.set( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Diagram" ) ), UNO_QUERY_THROW );
+ xDiagram.set( createInstance( "com.sun.star.chart2.Diagram" ), UNO_QUERY_THROW );
getChartDocument()->setFirstDiagram( xDiagram );
}
catch( Exception& )
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 157f4cdbf7c3..adfe078c0766 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -76,14 +76,14 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence(
if( pTitle )
{
TextConverter aTextConv( rParent, *pTitle );
- xTitleSeq = aTextConv.createDataSequence( CREATE_OUSTRING( "label" ) );
+ xTitleSeq = aTextConv.createDataSequence( "label" );
}
// create the labeled data sequence, if values or title are present
Reference< XLabeledDataSequence > xLabeledSeq;
if( xValueSeq.is() || xTitleSeq.is() )
{
- xLabeledSeq.set( rParent.createInstance( CREATE_OUSTRING( "com.sun.star.chart2.data.LabeledDataSequence" ) ), UNO_QUERY );
+ xLabeledSeq.set( rParent.createInstance( "com.sun.star.chart2.data.LabeledDataSequence" ), UNO_QUERY );
if( xLabeledSeq.is() )
{
xLabeledSeq->setValues( xValueSeq );
@@ -141,7 +141,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt
// data label separator (do not overwrite series separator, if no explicit point separator is present)
if( bDataSeriesLabel || rDataLabel.moaSeparator.has() )
- rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( CREATE_OUSTRING( "; " ) ) );
+ rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( "; " ) );
// data label placement (do not overwrite series placement, if no explicit point placement is present)
if( bDataSeriesLabel || rDataLabel.monLabelPos.has() )
@@ -256,7 +256,7 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData
bool bShowNeg = (mrModel.mnTypeId == XML_minus) || (mrModel.mnTypeId == XML_both);
if( bShowPos || bShowNeg ) try
{
- Reference< XPropertySet > xErrorBar( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.ErrorBar" ) ), UNO_QUERY_THROW );
+ Reference< XPropertySet > xErrorBar( createInstance( "com.sun.star.chart2.ErrorBar" ), UNO_QUERY_THROW );
PropertySet aBarProp( xErrorBar );
// plus/minus bars
@@ -351,15 +351,15 @@ Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence(
case ErrorBarModel::PLUS:
switch( mrModel.mnDirection )
{
- case XML_x: aRole = CREATE_OUSTRING( "error-bars-x-positive" ); break;
- case XML_y: aRole = CREATE_OUSTRING( "error-bars-y-positive" ); break;
+ case XML_x: aRole = "error-bars-x-positive"; break;
+ case XML_y: aRole = "error-bars-y-positive"; break;
}
break;
case ErrorBarModel::MINUS:
switch( mrModel.mnDirection )
{
- case XML_x: aRole = CREATE_OUSTRING( "error-bars-x-negative" ); break;
- case XML_y: aRole = CREATE_OUSTRING( "error-bars-y-negative" ); break;
+ case XML_x: aRole = "error-bars-x-negative"; break;
+ case XML_y: aRole = "error-bars-y-negative"; break;
}
break;
}
@@ -403,12 +403,12 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat
OUString aServiceName;
switch( mrModel.mnTypeId )
{
- case XML_exp: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.ExponentialRegressionCurve" ); break;
- case XML_linear: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.LinearRegressionCurve" ); break;
- case XML_log: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.LogarithmicRegressionCurve" ); break;
+ case XML_exp: aServiceName = "com.sun.star.chart2.ExponentialRegressionCurve"; break;
+ case XML_linear: aServiceName = "com.sun.star.chart2.LinearRegressionCurve"; break;
+ case XML_log: aServiceName = "com.sun.star.chart2.LogarithmicRegressionCurve"; break;
case XML_movingAvg: /* #i66819# moving average trendlines not supported */ break;
case XML_poly: /* #i20819# polynomial trendlines not supported */ break;
- case XML_power: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PotentialRegressionCurve" ); break;
+ case XML_power: aServiceName = "com.sun.star.chart2.PotentialRegressionCurve"; break;
default: OSL_FAIL( "TrendlineConverter::convertFromModel - unknown trendline type" );
}
if( !aServiceName.isEmpty() )
@@ -510,7 +510,7 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve
const TypeGroupInfo& rTypeInfo = rTypeGroup.getTypeInfo();
// create the data series object
- Reference< XDataSeries > xDataSeries( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.DataSeries" ) ), UNO_QUERY );
+ Reference< XDataSeries > xDataSeries( createInstance( "com.sun.star.chart2.DataSeries" ), UNO_QUERY );
PropertySet aSeriesProp( xDataSeries );
// attach data and title sequences to series
@@ -521,7 +521,7 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve
// create vector of all value sequences
::std::vector< Reference< XLabeledDataSequence > > aLabeledSeqVec;
// add Y values
- Reference< XLabeledDataSequence > xYValueSeq = createValueSequence( CREATE_OUSTRING( "values-y" ) );
+ Reference< XLabeledDataSequence > xYValueSeq = createValueSequence( "values-y" );
if( xYValueSeq.is() )
{
aLabeledSeqVec.push_back( xYValueSeq );
@@ -532,13 +532,13 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve
// add X values of scatter and bubble charts
if( !rTypeInfo.mbCategoryAxis )
{
- Reference< XLabeledDataSequence > xXValueSeq = createCategorySequence( CREATE_OUSTRING( "values-x" ) );
+ Reference< XLabeledDataSequence > xXValueSeq = createCategorySequence( "values-x" );
if( xXValueSeq.is() )
aLabeledSeqVec.push_back( xXValueSeq );
// add size values of bubble charts
if( rTypeInfo.meTypeId == TYPEID_BUBBLE )
{
- Reference< XLabeledDataSequence > xSizeValueSeq = createLabeledDataSequence( SeriesModel::POINTS, CREATE_OUSTRING( "values-size" ), true );
+ Reference< XLabeledDataSequence > xSizeValueSeq = createLabeledDataSequence( SeriesModel::POINTS, "values-size", true );
if( xSizeValueSeq.is() )
aLabeledSeqVec.push_back( xSizeValueSeq );
}
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index cda8f947ebd1..d71cb977fa0e 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -120,7 +120,7 @@ Reference< XFormattedString > TextConverter::appendFormattedString(
Reference< XFormattedString > xFmtStr;
try
{
- xFmtStr.set( ConverterRoot::createInstance( CREATE_OUSTRING( "com.sun.star.chart2.FormattedString" ) ), UNO_QUERY_THROW );
+ xFmtStr.set( ConverterRoot::createInstance( "com.sun.star.chart2.FormattedString" ), UNO_QUERY_THROW );
xFmtStr->setString( bAddNewLine ? (rString + OUString( sal_Unicode( '\n' ) )) : rString );
orStringVec.push_back( xFmtStr );
}
@@ -152,7 +152,7 @@ void TitleConverter::convertFromModel( const Reference< XTitled >& rxTitled, con
if( aStringSeq.hasElements() ) try
{
// create the title object and set the string data
- Reference< XTitle > xTitle( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Title" ) ), UNO_QUERY_THROW );
+ Reference< XTitle > xTitle( createInstance( "com.sun.star.chart2.Title" ), UNO_QUERY_THROW );
xTitle->setText( aStringSeq );
rxTitled->setTitleObject( xTitle );
@@ -193,7 +193,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
namespace cssc2 = ::com::sun::star::chart2;
// create the legend
- Reference< XLegend > xLegend( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Legend" ) ), UNO_QUERY_THROW );
+ Reference< XLegend > xLegend( createInstance( "com.sun.star.chart2.Legend" ), UNO_QUERY_THROW );
rxDiagram->setLegend( xLegend );
PropertySet aPropSet( xLegend );
aPropSet.setProperty( PROP_Show, true );
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 7b72fd42a1d3..7f996bfa062b 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -243,16 +243,16 @@ Reference< XCoordinateSystem > TypeGroupConverter::createCoordinateSystem()
if( maTypeInfo.mbPolarCoordSystem )
{
if( mb3dChart )
- aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PolarCoordinateSystem3d" );
+ aServiceName = "com.sun.star.chart2.PolarCoordinateSystem3d";
else
- aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PolarCoordinateSystem2d" );
+ aServiceName = "com.sun.star.chart2.PolarCoordinateSystem2d";
}
else
{
if( mb3dChart )
- aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.CartesianCoordinateSystem3d" );
+ aServiceName = "com.sun.star.chart2.CartesianCoordinateSystem3d";
else
- aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.CartesianCoordinateSystem2d" );
+ aServiceName = "com.sun.star.chart2.CartesianCoordinateSystem2d";
}
// create the coordinate system object
@@ -279,7 +279,7 @@ Reference< XLabeledDataSequence > TypeGroupConverter::createCategorySequence()
if( (*aIt)->maSources.has( SeriesModel::CATEGORIES ) )
{
SeriesConverter aSeriesConv( *this, **aIt );
- xLabeledSeq = aSeriesConv.createCategorySequence( CREATE_OUSTRING( "categories" ) );
+ xLabeledSeq = aSeriesConv.createCategorySequence( "categories" );
}
}
return xLabeledSeq;
@@ -346,7 +346,7 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
if( maTypeInfo.meTypeId == TYPEID_STOCK )
{
// create the data series object
- Reference< XDataSeries > xDataSeries( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.DataSeries" ) ), UNO_QUERY );
+ Reference< XDataSeries > xDataSeries( createInstance( "com.sun.star.chart2.DataSeries" ), UNO_QUERY );
Reference< XDataSink > xDataSink( xDataSeries, UNO_QUERY );
if( xDataSink.is() )
{
@@ -360,10 +360,10 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
OUString aRole;
switch( nRoleIdx )
{
- case 0: aRole = CREATE_OUSTRING( "values-first" ); break;
- case 1: aRole = CREATE_OUSTRING( "values-max" ); break;
- case 2: aRole = CREATE_OUSTRING( "values-min" ); break;
- case 3: aRole = CREATE_OUSTRING( "values-last" ); break;
+ case 0: aRole = "values-first"; break;
+ case 1: aRole = "values-max"; break;
+ case 2: aRole = "values-min"; break;
+ case 3: aRole = "values-last"; break;
}
Reference< XLabeledDataSequence > xDataSeq = (*aIt)->createValueSequence( aRole );
if( xDataSeq.is() )
generated by cgit (git 2.34.1) at 2025-01-06 10:27:27 +0000