[Libreoffice-commits] .: xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 9 09:23:21 PST 2010
xmloff/source/chart/PropertyMaps.cxx | 10 +-
xmloff/source/chart/SchXMLChartContext.cxx | 44 ++++----
xmloff/source/chart/SchXMLExport.cxx | 66 ++++++-------
xmloff/source/chart/SchXMLImport.cxx | 6 -
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 128 +++++++++++++-------------
xmloff/source/chart/SchXMLSeries2Context.cxx | 18 +--
xmloff/source/chart/SchXMLSeriesHelper.cxx | 6 -
xmloff/source/chart/SchXMLTools.cxx | 44 ++++----
xmloff/source/core/RDFaExportHelper.cxx | 6 -
xmloff/source/core/unoatrcn.cxx | 6 -
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmluconv.cxx | 4
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/sdxmlimp.cxx | 8 -
xmloff/source/draw/shapeexport.cxx | 6 -
xmloff/source/draw/shapeexport2.cxx | 8 -
xmloff/source/draw/xexptran.cxx | 48 ++++-----
xmloff/source/draw/ximpshap.cxx | 2
18 files changed, 207 insertions(+), 207 deletions(-)
New commits:
commit 18d7f167c7a98dea516a81a2e2e83125e6a8df06
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Tue Nov 9 17:15:52 2010 +0000
RTL macro converted from createFromAscii
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index f1b6c9c..c05d124 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -226,24 +226,24 @@ void XMLChartExportPropertyMapper::ContextFilter(
// if Auto... is set the corresponding properties mustn't be exported
case XML_SCH_CONTEXT_MIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoMin" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMin" ));
break;
case XML_SCH_CONTEXT_MAX:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoMax" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ));
break;
case XML_SCH_CONTEXT_STEP_MAIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoStepMain" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" ));
break;
case XML_SCH_CONTEXT_STEP_HELP_COUNT:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoStepHelp" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp" ));
break;
case XML_SCH_CONTEXT_ORIGIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoOrigin" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" ));
break;
// the following property is deprecated
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index f24d7cc..aecdd24 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -132,7 +132,7 @@ void lcl_setRoleAtLabeledSequence(
{
uno::Reference< beans::XPropertySet > xProp( xValues, uno::UNO_QUERY );
if( xProp.is())
- xProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( rRole ));
+ xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole ));
}
}
@@ -423,9 +423,9 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
{
try
{
- xDocProp->getPropertyValue( ::rtl::OUString::createFromAscii("BaseDiagram")) >>= aOldChartTypeName;
+ xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" ))) >>= aOldChartTypeName;
maChartTypeServiceName = SchXMLTools::GetNewChartTypeName( aOldChartTypeName );
- xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) );
+ xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_False) );
}
catch( uno::Exception & )
{
@@ -703,15 +703,15 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
uno::Sequence< beans::PropertyValue > aArgs( 3 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("CellRangeRepresentation"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )),
-1, uno::makeAny( rRectangularRange ),
beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("DataRowSource"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )),
-1, uno::makeAny( eDataRowSource ),
beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("FirstCellAsLabel"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )),
-1, uno::makeAny( bFirstCellAsLabel ),
beans::PropertyState_DIRECT_VALUE );
@@ -719,7 +719,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
{
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("SequenceMapping"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SequenceMapping" )),
-1, uno::makeAny( sColTrans.getLength()
? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() )
: lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ),
@@ -745,7 +745,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
{
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("ChartOleObjectName"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartOleObjectName" )),
-1, uno::makeAny( aChartOleObjectName ),
beans::PropertyState_DIRECT_VALUE );
}
@@ -757,7 +757,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("HasCategories"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )),
-1, uno::makeAny( bHasCateories ),
beans::PropertyState_DIRECT_VALUE );
@@ -861,7 +861,7 @@ void SchXMLChartContext::EndElement()
xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
}
if( bHasOwnData )
- msChartAddress = ::rtl::OUString::createFromAscii("all");
+ msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" ));
bool bSwitchRangesFromOuterToInternalIfNecessary = false;
if( !bHasOwnData && mbAllRangeAddressesAvailable )
@@ -909,7 +909,7 @@ void SchXMLChartContext::EndElement()
if(!bHasOwnData)
{
bHasOwnData = true;
- msChartAddress = ::rtl::OUString::createFromAscii("all");
+ msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" ));
if( !xNewDoc->hasInternalDataProvider() )
{
xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
@@ -994,7 +994,7 @@ void SchXMLChartContext::EndElement()
}
if( xProp.is())
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_True) );
}
void SchXMLChartContext::MergeSeriesForStockChart()
@@ -1023,7 +1023,7 @@ void SchXMLChartContext::MergeSeriesForStockChart()
{
xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
- xCTProp->getPropertyValue( ::rtl::OUString::createFromAscii("Japanese")) >>= bHasJapaneseCandlestick;
+ xCTProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bHasJapaneseCandlestick;
break;
}
}
@@ -1045,27 +1045,27 @@ void SchXMLChartContext::MergeSeriesForStockChart()
if( bHasJapaneseCandlestick )
{
// open values
- lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString::createFromAscii("values-first"));
+ lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )));
aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
// low values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString::createFromAscii("values-min"));
+ aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )));
}
else
{
// low values
- lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString::createFromAscii("values-min"));
+ lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )));
aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
}
// high values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString::createFromAscii("values-max"));
+ aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )));
// close values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString::createFromAscii("values-last"));
+ aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )));
}
xDSContainer->setDataSeries( aNewSeries );
}
@@ -1108,7 +1108,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
if( xProp.is())
{
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "HasMainTitle" ), aTrueBool );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasMainTitle" )), aTrueBool );
}
uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY );
pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
@@ -1121,7 +1121,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
if( xProp.is())
{
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSubTitle" ), aTrueBool );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSubTitle" )), aTrueBool );
}
uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY );
pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
@@ -1341,7 +1341,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
aTrueBool <<= (sal_Bool)(sal_True);
try
{
- xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "HasLegend" ), aTrueBool );
+ xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasLegend" )), aTrueBool );
}
catch( beans::UnknownPropertyException )
{
@@ -1381,7 +1381,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
{
uno::Any aAny;
aAny <<= (chart::ChartLegendPosition)(nEnumVal);
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "Alignment" ), aAny );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Alignment" )), aAny );
}
}
catch( beans::UnknownPropertyException )
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index ddc359b..c837c6d 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -282,7 +282,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
{
Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
if( xFactProp.is())
- xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+ xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
}
catch( uno::Exception& )
{}
@@ -383,7 +383,7 @@ Reference< chart2::data::XDataSource > lcl_createDataSource(
if( xContext.is() )
xSink.set(
xContext->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.chart2.data.DataSource"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.DataSource" )),
xContext ), uno::UNO_QUERY_THROW );
if( xSink.is())
xSink->setData( aData );
@@ -449,12 +449,12 @@ 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::createFromAscii("values-x" ) ) );
+ lcl_getDataSequenceByRole( aSeriesSeqVector, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) );
if( xXValues.is() )
aLabeledSeqVector.push_back( xXValues );
//add all other sequences now without x-values
- lcl_MatchesRole aHasXValues( OUString::createFromAscii("values-x" ) );
+ lcl_MatchesRole aHasXValues( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) );
for( sal_Int32 nN=0; nN<aSeriesSeqVector.getLength(); nN++ )
{
if( !aHasXValues( aSeriesSeqVector[nN] ) )
@@ -1064,7 +1064,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
msCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
}
- msTableName = OUString::createFromAscii( "local-table" );
+ msTableName = OUString(RTL_CONSTASCII_USTRINGPARAM( "local-table" ));
// create factory
mxPropertyHandlerFactory = new XMLChartPropHdlFactory;
@@ -1080,16 +1080,16 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
// register chart auto-style family
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_SCH_CHART_ID,
- OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_NAME ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_NAME )),
mxExpPropMapper.get(),
- OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_PREFIX ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_PREFIX )));
// register shape family
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_SD_GRAPHICS_ID,
- OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_NAME ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_NAME )),
mxExpPropMapper.get(),
- OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX )));
// register paragraph family also for shapes
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_TEXT_PARAGRAPH,
@@ -1515,7 +1515,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
// get a sequence of non-chart shapes (inserted via clipboard)
try
{
- Any aShapesAny = xDocPropSet->getPropertyValue( OUString::createFromAscii( "AdditionalShapes" ));
+ Any aShapesAny = xDocPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AdditionalShapes" )));
aShapesAny >>= mxAdditionalShapes;
}
catch( uno::Exception & rEx )
@@ -2117,7 +2117,7 @@ void SchXMLExportHelper_Impl::exportAxes(
return;
// variables for autostyles
- const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
+ const OUString sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" )));
Reference< beans::XPropertySet > xPropSet;
std::vector< XMLPropertyState > aPropertyStates;
@@ -2150,31 +2150,31 @@ void SchXMLExportHelper_Impl::exportAxes(
if (xServiceInfo.is())
{
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartAxisXSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisXSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")), bHasXAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartAxisYSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisYSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis")), bHasYAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartAxisZSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisZSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis")), bHasZAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisXSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisXSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")), bHasSecondaryXAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisYSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisYSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis")), bHasSecondaryYAxis);
@@ -2725,8 +2725,8 @@ void SchXMLExportHelper_Impl::exportSeries(
std::vector< XMLPropertyState > aPropertyStates;
- const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
- const OUString sPercentageNumFormat( OUString::createFromAscii( "PercentageNumberFormat" ));
+ const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+ const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat"));
Sequence< Reference< chart2::XCoordinateSystem > >
aCooSysSeq( xBCooSysCnt->getCoordinateSystems());
@@ -2751,7 +2751,7 @@ void SchXMLExportHelper_Impl::exportSeries(
sal_Bool bJapaneseCandleSticks = sal_False;
Reference< beans::XPropertySet > xCTProp( aCTSeq[nCTIdx], uno::UNO_QUERY );
if( xCTProp.is())
- xCTProp->getPropertyValue( OUString::createFromAscii("Japanese")) >>= bJapaneseCandleSticks;
+ xCTProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bJapaneseCandleSticks;
exportCandleStickSeries(
xDSCnt->getDataSeries(), xNewDiagram, bJapaneseCandleSticks, bExportContent );
continue;
@@ -2791,7 +2791,7 @@ void SchXMLExportHelper_Impl::exportSeries(
{
Reference< beans::XPropertySet > xSeqProp( xTempValueSeq, uno::UNO_QUERY );
if( xSeqProp.is())
- xSeqProp->getPropertyValue(OUString::createFromAscii("Role")) >>= aRole;
+ xSeqProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole;
// "main" sequence
if( aRole.equals( aLabelRole ))
{
@@ -2933,7 +2933,7 @@ void SchXMLExportHelper_Impl::exportSeries(
Reference< chart2::data::XDataSequence > xYValuesForBubbleChart;
if( bIsBubbleChart )
{
- Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-y" ) ) );
+ Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )) ) );
if( xSequence.is() )
{
xYValuesForBubbleChart = xSequence->getValues();
@@ -2943,7 +2943,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
if( bIsScatterChart || bIsBubbleChart )
{
- Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-x" ) ) );
+ Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) );
if( xSequence.is() )
{
Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
@@ -3214,7 +3214,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
xSource->getDataSequences());
sal_Int32 nSeriesLength =
- lcl_getSequenceLengthByRole( aSeqCnt, OUString::createFromAscii("values-last"));
+ lcl_getSequenceLengthByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )));
if( bExportContent )
{
@@ -3225,7 +3225,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
if( bJapaneseCandleSticks )
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-first"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3242,7 +3242,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// low
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-min"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3259,7 +3259,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// high
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-max"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3276,7 +3276,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// close
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-last"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3332,8 +3332,8 @@ void SchXMLExportHelper_Impl::exportDataPoints(
std::vector< XMLPropertyState > aPropertyStates;
- const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
- const OUString sPercentageNumFormat( OUString::createFromAscii( "PercentageNumberFormat" ));
+ const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+ const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat"));
bool bVaryColorsByPoint = false;
Sequence< sal_Int32 > aDataPointSeq;
@@ -3733,7 +3733,7 @@ void SchXMLExport::_ExportContent()
if( xServ.is())
{
if( xServ->supportsService(
- OUString::createFromAscii( "com.sun.star.chart.ChartTableAddressSupplier" )))
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTableAddressSupplier" ))))
{
Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY );
if( xProp.is())
@@ -3743,13 +3743,13 @@ void SchXMLExport::_ExportContent()
{
OUString sChartAddress;
aAny = xProp->getPropertyValue(
- OUString::createFromAscii( "ChartRangeAddress" ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartRangeAddress" )));
aAny >>= sChartAddress;
maExportHelper.m_pImpl->SetChartRangeAddress( sChartAddress );
OUString sTableNumberList;
aAny = xProp->getPropertyValue(
- OUString::createFromAscii( "TableNumberList" ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "TableNumberList" )));
aAny >>= sTableNumberList;
maExportHelper.m_pImpl->SetTableNumberList( sTableNumberList );
@@ -4033,7 +4033,7 @@ OUString SAL_CALL SchXMLExport::getImplementationName() throw( uno::RuntimeExcep
case EXPORT_SETTINGS:
// there is no settings component in chart
default:
- return OUString::createFromAscii( "SchXMLExport" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport" ));
}
}
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 69a9889..2e203c4 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -81,7 +81,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
{
Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
if( xFactProp.is())
- xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+ xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
}
catch( uno::Exception& )
{}
@@ -621,7 +621,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
{
xResult.set(
xContext->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.chart2.DataSeries"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DataSeries" )),
xContext ), uno::UNO_QUERY_THROW );
}
if( xResult.is() )
@@ -956,7 +956,7 @@ OUString SAL_CALL SchXMLImport::getImplementationName() throw( uno::RuntimeExcep
case IMPORT_SETTINGS:
// there is no settings component in chart
default:
- return OUString::createFromAscii( "SchXMLImport" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport" ));
}
}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 64bfc89..b53dbe6 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -147,7 +147,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe
if( xProp.is() )
{
drawing::CameraGeometry aCamGeo;
- xProp->getPropertyValue( ::rtl::OUString::createFromAscii("D3DCameraGeometry")) >>= aCamGeo;
+ xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "D3DCameraGeometry" ))) >>= aCamGeo;
maVRP.setX( aCamGeo.vrp.PositionX );
maVRP.setY( aCamGeo.vrp.PositionY );
maVRP.setZ( aCamGeo.vrp.PositionZ );
@@ -240,51 +240,51 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
{
try
{
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisXSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxisGrid" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTwoAxisXSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisXSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryXAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryXAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisYSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxisGrid" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTwoAxisYSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisYSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryYAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryYAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisZSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisZSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasZAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasZAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisDescription" )), aFalseBool );
}
uno::Any aAny;
chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS;
aAny <<= eSource;
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "DataRowSource" ), aAny );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), aAny );
}
catch( beans::UnknownPropertyException & )
{
@@ -362,12 +362,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
uno::Any aAny;
aAny <<= (sal_Bool)(mrColHasLabels);
xDocProp->setPropertyValue(
- ::rtl::OUString::createFromAscii( "DataSourceLabelsInFirstColumn" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstColumn" )),
aAny );
aAny <<= (sal_Bool)(mrRowHasLabels);
xDocProp->setPropertyValue(
- ::rtl::OUString::createFromAscii( "DataSourceLabelsInFirstRow" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstRow" )),
aAny );
}
catch( beans::UnknownPropertyException & )
@@ -397,7 +397,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
pPropStyleContext->FillPropertySet( xProp );
// get the data row source that was set without having data
- xProp->getPropertyValue( ::rtl::OUString::createFromAscii("DataRowSource"))
+ xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )))
>>= mrDataRowSource;
//lines on/off
@@ -507,7 +507,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
// data yet.
mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ );
if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS )
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "DataRowSource" ), uno::makeAny(mrDataRowSource) );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), uno::makeAny(mrDataRowSource) );
}
}
@@ -635,7 +635,7 @@ void SchXMLPlotAreaContext::EndElement()
if( xDiaProp.is())
{
sal_Bool bIsThreeDim = sal_False;
- uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString::createFromAscii( "Dim3D" ));
+ uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Dim3D" )));
aAny >>= bIsThreeDim;
// set 3d scene attributes
@@ -747,31 +747,31 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
chart2::ScaleData aMainXScale = xMainXAxis->getScaleData();
if( 0 == maChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) )
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
double fCrossoverValue = 0.0;
aMainXScale.Origin >>= fCrossoverValue;
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverValue")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
, uno::makeAny( fCrossoverValue ) );
if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
}
else
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
}
}
@@ -779,48 +779,48 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
{
if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
}
else
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
}
}
chart2::ScaleData aMainYScale = xMainYAxis->getScaleData();
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
double fCrossoverValue = 0.0;
aMainYScale.Origin >>= fCrossoverValue;
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverValue")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
, uno::makeAny( fCrossoverValue ) );
if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE )
{
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryXAxisProp.is() )
- xSecondaryXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
}
else
{
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryXAxisProp.is() )
- xSecondaryXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
}
}
@@ -878,7 +878,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is())
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasXAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getXAxisTitle(), uno::UNO_QUERY );
}
}
@@ -888,7 +888,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is() )
{
if( xDiaProp.is() )
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSecondaryXAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondXAxisTitle(), uno::UNO_QUERY );
}
}
@@ -900,7 +900,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is())
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasYAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getYAxisTitle(), uno::UNO_QUERY );
}
}
@@ -910,7 +910,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is() )
{
if( xDiaProp.is() )
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSecondaryYAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondYAxisTitle(), uno::UNO_QUERY );
}
}
@@ -921,7 +921,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is())
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasZAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getZAxisTitle(), uno::UNO_QUERY );
}
break;
@@ -955,13 +955,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
if( bIsMajor )
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasXAxisGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aTrueBool );
xGridProp = xSuppl->getXMainGrid();
}
else
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasXAxisHelpGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisHelpGrid" )), aTrueBool );
xGridProp = xSuppl->getXHelpGrid();
}
}
@@ -975,13 +975,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
if( bIsMajor )
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasYAxisGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aTrueBool );
xGridProp = xSuppl->getYMainGrid();
}
else
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasYAxisHelpGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisHelpGrid" )), aTrueBool );
xGridProp = xSuppl->getYHelpGrid();
}
}
@@ -995,13 +995,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
if( bIsMajor )
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasZAxisGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisGrid" )), aTrueBool );
xGridProp = xSuppl->getZMainGrid();
}
else
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasZAxisHelpGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisHelpGrid" )), aTrueBool );
xGridProp = xSuppl->getZHelpGrid();
}
}
@@ -1159,7 +1159,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1174,7 +1174,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryXAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1192,7 +1192,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1210,7 +1210,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxis" ), uno::makeAny(sal_True) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), uno::makeAny(sal_True) );
}
catch( beans::UnknownPropertyException & )
{
@@ -1224,7 +1224,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryYAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1241,7 +1241,7 @@ void SchXMLAxisContext::CreateAxis()
bool bSettingZAxisSuccedded = false;
try
{
- rtl::OUString sHasZAxis( rtl::OUString::createFromAscii( "HasZAxis" ) );
+ rtl::OUString sHasZAxis( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )) );
xDiaProp->setPropertyValue( sHasZAxis, aTrueBool );
xDiaProp->getPropertyValue( sHasZAxis ) >>= bSettingZAxisSuccedded;
}
@@ -1269,10 +1269,10 @@ void SchXMLAxisContext::CreateAxis()
xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )),
uno::makeAny( COL_BLACK ));
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "DisplayLabels" ), aFalseBool );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DisplayLabels" )), aFalseBool );
// #88077# AutoOrigin 'on' is default
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "AutoOrigin" ), aTrueBool );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" )), aTrueBool );
if( msAutoStyleName.getLength())
{
@@ -1328,7 +1328,7 @@ void SchXMLAxisContext::CreateAxis()
uno::Reference< beans::XPropertySet > xNewAxisProp( xAxis, uno::UNO_QUERY );
if( xNewAxisProp.is() )
{
- xNewAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LineStyle")
+ xNewAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LineStyle" ))
, uno::makeAny(drawing::LineStyle_NONE));
}
}
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 0b1a680..248a282 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -239,7 +239,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createAndAddSequenceToSeries
Reference< chart2::data::XDataSequence > xSeq = SchXMLTools::CreateDataSequence( rRange, xChartDoc );
Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY );
if( xSeqProp.is())
- xSeqProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( rRole));
+ xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole));
xLabeledSeq->setValues( xSeq );
// add new sequence to data series / push to front to have the correct sequence order if charttype is changed afterwards
@@ -387,7 +387,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
&& m_bStockHasVolume
&& mnSeriesIndex == 0 )
{
- maSeriesChartTypeName = OUString::createFromAscii( "com.sun.star.chart2.ColumnChartType" );
+ maSeriesChartTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ));
bIsCandleStick = false;
}
else
@@ -428,10 +428,10 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY );
if( xSeqProp.is())
{
- OUString aMainRole( OUString::createFromAscii("values-y") );
+ OUString aMainRole(RTL_CONSTASCII_USTRINGPARAM("values-y"));
if( maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.BubbleChartType") ) )
- aMainRole = OUString::createFromAscii("values-size");
- xSeqProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( aMainRole ));
+ aMainRole = OUString(RTL_CONSTASCII_USTRINGPARAM( "values-size" ));
+ xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( aMainRole ));
}
xLabeledSeq->setValues( xSeq );
@@ -520,7 +520,7 @@ void SchXMLSeries2Context::EndElement()
//different handling for different chart types necessary
if( bIsScatterChart || ( nDomainCount==1 && !bIsBubbleChart ) )
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ;
bool bCreateXValues = true;
if( !maDomainAddresses.empty() )
{
@@ -553,7 +553,7 @@ void SchXMLSeries2Context::EndElement()
{
if( nDomainCount>1 )
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
if( !m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
{
//for bubble chart the second domain contains the x values which should become an index smaller than y values for own data table
@@ -566,12 +566,12 @@ void SchXMLSeries2Context::EndElement()
}
else if( m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ;
aDomainInfos.push_back( aDomainInfo );
}
if( nDomainCount>0)
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-y"), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() )
{
m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress = maDomainAddresses.front();
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 4828937..c2a07ca 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -207,7 +207,7 @@ Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries(
for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdx<aCTSeq.getLength(); ++nCTIdx )
{
if( aCTSeq[nCTIdx]->getChartType().equals(
- ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType")))
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))))
{
Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() );
@@ -240,7 +240,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
if( xFactory.is() )
{
xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
- OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY );
Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
if(xInit.is())
{
@@ -277,7 +277,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
if( xFactory.is() )
{
xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
- OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY );
Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
if(xInit.is())
{
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 95feefb..6c3adad 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -85,7 +85,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
{
Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
if( xFactProp.is())
- xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+ xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
}
catch( uno::Exception& )
{}
@@ -197,35 +197,35 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap()
//shape property -- chart model object property
static tMakeStringStringMap g_aChartTypeNameMap =
tMakeStringStringMap
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.LineDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.LineChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.LineDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.AreaDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.AreaChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.AreaDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.BarDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ColumnChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BarDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.PieDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.PieChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.PieDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.DonutDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.DonutChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.DonutDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DonutChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.XYDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ScatterChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.NetDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.NetChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.NetDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.FilledNetDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.FilledNetChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.FilledNetDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.StockDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.CandleStickChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.StockDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.BubbleDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.BubbleChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BubbleDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" )) )
;
return g_aChartTypeNameMap;
@@ -386,7 +386,7 @@ Reference< chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence()
if( xContext.is() )
xResult.set(
xContext->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.chart2.data.LabeledDataSequence"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.LabeledDataSequence" )),
xContext ), uno::UNO_QUERY_THROW );
return xResult;
}
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index 3ee87f6..c972cfe 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -104,8 +104,8 @@ getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI)
xContext->getServiceManager(), uno::UNO_SET_THROW);
uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
xServiceFactory->createInstanceWithContext(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.uri.UriReferenceFactory"), xContext),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.uri.UriReferenceFactory")), xContext),
uno::UNO_QUERY_THROW);
uno::Reference< uri::XUriReference > const xBaseURI(
@@ -215,7 +215,7 @@ RDFaExportHelper::AddRDFa(
::boost::bind(&makeCURIE, &m_rExport,
::boost::bind(&rdf::Statement::Predicate, _1))),
::comphelper::OUStringBufferAppender(property),
- ::rtl::OUString::createFromAscii(" "));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY,
property.makeStringAndClear());
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index b2ec0f6..8a9fe6d 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -160,7 +160,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName)
xml::AttributeData aData;
aData.Namespace = mpContainer->GetAttrNamespace(nAttr);
- aData.Type = OUString::createFromAscii("CDATA");
+ aData.Type = OUString(RTL_CONSTASCII_USTRINGPARAM("CDATA"));
aData.Value = mpContainer->GetAttrValue(nAttr);
uno::Any aAny;
@@ -287,13 +287,13 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name)
//XServiceInfo
OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( uno::RuntimeException )
{
- return OUString::createFromAscii( "SvUnoAttributeContainer" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "SvUnoAttributeContainer" ));
}
uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void)
throw( uno::RuntimeException )
{
- OUString aSN( OUString::createFromAscii( "com.sun.star.xml.AttributeContainer" ) );
+ OUString aSN( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.AttributeContainer" )) );
uno::Sequence< OUString > aNS( &aSN, 1L );
return aNS;
}
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 5471d94..7d75757 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1352,7 +1352,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
// get filter component
Reference< xml::sax::XDocumentHandler > xTmpDocHandler(
xFactory->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
aArgs), UNO_QUERY);
OSL_ENSURE( xTmpDocHandler.is(),
"can't instantiate OASIS transformer component" );
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index e3b6ac8..d586ec7 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -1907,8 +1907,8 @@ OUString SvXMLUnitConverter::encodeStyleName(
->xCharClass =
Reference < XCharacterClassification >(
mxServiceFactory->createInstance(
- OUString::createFromAscii(
- "com.sun.star.i18n.CharacterClassification_Unicode") ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.i18n.CharacterClassification_Unicode")) ),
UNO_QUERY );
OSL_ENSURE( xCharClass.is(),
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 4938f3e..82d6078 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1881,7 +1881,7 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
void SdXMLExport::_ExportMeta()
{
uno::Sequence<beans::NamedValue> stats(1);
- stats[0] = beans::NamedValue(::rtl::OUString::createFromAscii("ObjectCount"),
+ stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ObjectCount" )),
uno::makeAny(mnObjectCount));
// update document statistics at the model
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 45341e8..b016b5e 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -740,8 +740,8 @@ SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
} else if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
( IsXMLToken(rLocalName, XML_DOCUMENT)) ) {
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
- mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetModel(), uno::UNO_QUERY_THROW);
@@ -765,8 +765,8 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
if (!IsStylesOnlyMode() && (getImportFlags() & IMPORT_META))
{
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
- mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetModel(), uno::UNO_QUERY_THROW);
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 13bdb55..6aeb51a 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -173,10 +173,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement
{
uno::Sequence< uno::Any > aArgument( 1 );
uno::Sequence< beans::PropertyValue > aPropValues( 2 );
- aPropValues[ 0 ].Name = rtl::OUString::createFromAscii( "CustomShape" );
+ aPropValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CustomShape" ));
aPropValues[ 0 ].Value <<= xShape;
sal_Bool bForceGroupWithText = sal_True;
- aPropValues[ 1 ].Name = rtl::OUString::createFromAscii( "ForceGroupWithText" );
+ aPropValues[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ForceGroupWithText" ));
aPropValues[ 1 ].Value <<= bForceGroupWithText;
aArgument[ 0 ] <<= aPropValues;
uno::Reference< uno::XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) );
@@ -685,7 +685,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
{
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
OUString aLayerName;
- xProps->getPropertyValue( OUString::createFromAscii( "LayerName" ) ) >>= aLayerName;
+ xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerName" )) ) >>= aLayerName;
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LAYER, aLayerName );
}
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index e9c2b12..43b0daa 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -564,8 +564,8 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
OUString aDescription;
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
- xProps->getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTitle;
- xProps->getPropertyValue( OUString::createFromAscii( "Description" ) ) >>= aDescription;
+ xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) >>= aTitle;
+ xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Description" )) ) >>= aDescription;
if(aTitle.getLength())
{
@@ -1144,7 +1144,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
{
if( aStr[ 0 ] == '#' )
{
- aStreamURL = OUString::createFromAscii( "vnd.sun.star.Package:" );
+ aStreamURL = OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ));
aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) );
}
@@ -1593,7 +1593,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
{
// OOo internal links have no storage persistance, URL is stored in the XML file
// the result LinkURL is empty in case the object is not a link
- xPropSet->getPropertyValue( OUString::createFromAscii( "LinkURL" ) ) >>= sURL;
+ xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LinkURL" )) ) >>= sURL;
}
xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ) ) >>= sPersistName;
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index e932772..b8eb90f 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -425,14 +425,14 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
{
case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
{
- aNewString += OUString::createFromAscii("rotate (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
{
- aNewString += OUString::createFromAscii("scale (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getX());
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getY());
@@ -441,7 +441,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
{
- aNewString += OUString::createFromAscii("translate (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getY(), true);
@@ -450,21 +450,21 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
{
- aNewString += OUString::createFromAscii("skewX (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewX (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
{
- aNewString += OUString::createFromAscii("skewY (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewY (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
{
- aNewString += OUString::createFromAscii("matrix (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
// a
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 0));
@@ -531,12 +531,12 @@ void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConver
const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength());
const sal_Int32 nLen(aStr.getLength());
- const OUString aString_rotate(OUString::createFromAscii("rotate"));
- const OUString aString_scale(OUString::createFromAscii("scale"));
- const OUString aString_translate(OUString::createFromAscii("translate"));
- const OUString aString_skewX(OUString::createFromAscii("skewX"));
- const OUString aString_skewY(OUString::createFromAscii("skewY"));
- const OUString aString_matrix(OUString::createFromAscii("matrix"));
+ const OUString aString_rotate(RTL_CONSTASCII_USTRINGPARAM( "rotate" ));
+ const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" ));
+ const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" ));
+ const OUString aString_skewX(RTL_CONSTASCII_USTRINGPARAM( "skewX" ));
+ const OUString aString_skewY(RTL_CONSTASCII_USTRINGPARAM( "skewY" ));
+ const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" ));
sal_Int32 nPos(0);
@@ -901,28 +901,28 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
{
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
{
- aNewString += OUString::createFromAscii("rotatex (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatex (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
{
- aNewString += OUString::createFromAscii("rotatey (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatey (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
{
- aNewString += OUString::createFromAscii("rotatez (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatez (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
{
- aNewString += OUString::createFromAscii("scale (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getX());
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getY());
@@ -933,7 +933,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
{
- aNewString += OUString::createFromAscii("translate (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getY(), true);
@@ -944,7 +944,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
{
- aNewString += OUString::createFromAscii("matrix (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
// a
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 0));
@@ -1035,12 +1035,12 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength());
const sal_Int32 nLen(aStr.getLength());
- const OUString aString_rotatex(OUString::createFromAscii("rotatex"));
- const OUString aString_rotatey(OUString::createFromAscii("rotatey"));
- const OUString aString_rotatez(OUString::createFromAscii("rotatez"));
- const OUString aString_scale(OUString::createFromAscii("scale"));
- const OUString aString_translate(OUString::createFromAscii("translate"));
- const OUString aString_matrix(OUString::createFromAscii("matrix"));
+ const OUString aString_rotatex(RTL_CONSTASCII_USTRINGPARAM( "rotatex" ));
+ const OUString aString_rotatey(RTL_CONSTASCII_USTRINGPARAM( "rotatey" ));
+ const OUString aString_rotatez(RTL_CONSTASCII_USTRINGPARAM( "rotatez" ));
+ const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" ));
+ const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" ));
+ const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" ));
sal_Int32 nPos(0);
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 31c6b9a..d1c0118 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -510,7 +510,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName )
if ( OUString::createFromAscii(pServiceName).compareToAscii( "com.sun.star.drawing.OLE2Shape" ) == 0 &&
uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() )
{
- xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString::createFromAscii("com.sun.star.drawing.temporaryForXMLImportOLE2Shape")), uno::UNO_QUERY);
+ xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.temporaryForXMLImportOLE2Shape"))), uno::UNO_QUERY);
}
else
{
More information about the Libreoffice-commits
mailing list