[Libreoffice-commits] .: oox/source unoxml/source writerfilter/qa writerfilter/source writerfilter/unocomponent writerperfect/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Nov 28 09:36:25 PST 2010
oox/source/core/xmlfilterbase.cxx | 2
oox/source/drawingml/shape.cxx | 12 +--
oox/source/export/SchXMLSeriesHelper.cxx | 6 -
oox/source/export/chartexport.cxx | 32 +++++-----
oox/source/ppt/pptshape.cxx | 4 -
oox/source/vml/vmlshape.cxx | 20 +++---
oox/source/vml/vmlshapecontext.cxx | 4 -
oox/source/xls/commentsbuffer.cxx | 2
unoxml/source/dom/cdatasection.cxx | 2
unoxml/source/dom/characterdata.cxx | 4 -
unoxml/source/dom/comment.cxx | 2
unoxml/source/dom/document.cxx | 10 +--
unoxml/source/dom/documentbuilder.cxx | 4 -
unoxml/source/dom/documentfragment.cxx | 2
unoxml/source/dom/element.cxx | 20 +++---
unoxml/source/dom/elementlist.cxx | 2
unoxml/source/dom/node.cxx | 12 +--
unoxml/source/dom/saxbuilder.cxx | 8 +-
unoxml/source/dom/text.cxx | 2
unoxml/source/events/testlistener.cxx | 10 +--
unoxml/source/rdf/librdf_repository.cxx | 18 ++---
unoxml/source/xpath/xpathapi.cxx | 6 -
writerfilter/qa/cppunittests/odiapi/testProperty.cxx | 16 ++---
writerfilter/qa/cppunittests/sl/testOD_SL.cxx | 6 -
writerfilter/source/dmapper/ConversionHelper.cxx | 14 ++--
writerfilter/source/dmapper/DomainMapper.cxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 -
writerfilter/source/dmapper/GraphicImport.cxx | 8 +-
writerfilter/source/dmapper/NumberingManager.cxx | 6 -
writerfilter/source/dmapper/SettingsTable.cxx | 2
writerfilter/source/dmapper/StyleSheetTable.cxx | 2
writerfilter/source/filter/WriterFilterDetection.cxx | 4 -
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 2
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx | 4 -
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx | 4 -
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx | 16 ++---
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx | 6 -
writerperfect/source/wpdimp/WordPerfectImportFilter.cxx | 2
writerperfect/source/wpdimp/wpft_genericfilter.cxx | 4 -
writerperfect/source/wpgimp/WPGImportFilter.cxx | 2
writerperfect/source/wpgimp/wpgimport_genericfilter.cxx | 2
writerperfect/source/wpsimp/MSWorksImportFilter.cxx | 2
writerperfect/source/wpsimp/msworks_genericfilter.cxx | 2
43 files changed, 146 insertions(+), 150 deletions(-)
New commits:
commit 8ab5c92afc35783f551486c27cf877d17ed4b6ab
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 28 18:35:13 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in filters 12
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 37e26f4..c07e3db 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -142,7 +142,7 @@ static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiS
{
Reference< XPropertySet > xFactProp( aFactory, UNO_QUERY );
if( xFactProp.is() )
- xFactProp->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xContext;
+ xFactProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext;
}
catch( Exception& )
{}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2d2d1c4..35c8b7a 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -246,7 +246,7 @@ Reference< XShape > Shape::createAndInsert(
OUString aServiceName = rServiceName;
if( mxCreateCallback.get() )
aServiceName = mxCreateCallback->onCreateXShape( aServiceName, awt::Rectangle( aPosition.X / 360, aPosition.Y / 360, aSize.Width / 360, aSize.Height / 360 ) );
- sal_Bool bIsCustomShape = aServiceName == OUString::createFromAscii( "com.sun.star.drawing.CustomShape" );
+ sal_Bool bIsCustomShape = aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape"));
basegfx::B2DHomMatrix aTransformation;
if( aSize.Width != 1 || aSize.Height != 1)
@@ -289,7 +289,7 @@ Reference< XShape > Shape::createAndInsert(
}
// special for lineshape
- if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) )
+ if ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")) )
{
::basegfx::B2DPolygon aPoly;
aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -310,7 +310,7 @@ Reference< XShape > Shape::createAndInsert(
maShapeProperties[ PROP_PolyPolygon ] <<= aPolyPolySequence;
}
- else if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.ConnectorShape" ) )
+ else if ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")) )
{
::basegfx::B2DPolygon aPoly;
aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -438,9 +438,9 @@ Reference< XShape > Shape::createAndInsert(
// applying properties
PropertySet aPropSet( xSet );
- if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
+ if ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) )
mpGraphicPropertiesPtr->pushToPropSet( aPropSet, rGraphicHelper );
- if ( mpTablePropertiesPtr.get() && ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.TableShape" ) ) )
+ if ( mpTablePropertiesPtr.get() && ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TableShape")) ) )
mpTablePropertiesPtr->pushToPropSet( rFilterBase, xSet, mpMasterTextListStyle );
aFillProperties.pushToPropSet( aPropSet, rModelObjectHelper, rGraphicHelper, FillProperties::DEFAULT_IDS, mnRotation, nFillPhClr );
aLineProperties.pushToPropSet( aPropSet, rModelObjectHelper, rGraphicHelper, LineProperties::DEFAULT_IDS, nLinePhClr );
@@ -455,7 +455,7 @@ Reference< XShape > Shape::createAndInsert(
xSet->setPropertyValue( rPropName, Any( false ) );
// do not set properties at a group shape (this causes assertions from svx)
- if( aServiceName != OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) )
+ if( aServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")) )
aPropSet.setProperties( aShapeProperties );
if( bIsCustomShape )
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx
index c755a53..83111ec 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/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/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 524b728..fb91d80 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -142,7 +142,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& )
{}
@@ -231,7 +231,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
{
Sequence< Reference< chart2::data::XLabeledDataSequence > > aUnusedSequences( xDiagram->getUnusedData() );
- lcl_MatchesRole aHasCategories( OUString::createFromAscii("categories" ) );
+ lcl_MatchesRole aHasCategories( OUString(RTL_CONSTASCII_USTRINGPARAM("categories")) );
for( sal_Int32 nN=0; nN<aUnusedSequences.getLength(); nN++ )
{
if( aHasCategories( aUnusedSequences[nN] ) )
@@ -254,7 +254,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 );
@@ -320,12 +320,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] ) )
@@ -641,7 +641,7 @@ OUString ChartExport::parseFormula( const OUString& rRange )
{
try
{
- xParser.set( xSF->createInstance( OUString::createFromAscii( "com.sun.star.sheet.FormulaParser" ) ), UNO_QUERY );
+ xParser.set( xSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FormulaParser")) ), UNO_QUERY );
}
catch( Exception& )
{
@@ -653,12 +653,12 @@ OUString ChartExport::parseFormula( const OUString& rRange )
Reference< XPropertySet > xParserProps( xParser, uno::UNO_QUERY );
if( xParserProps.is() )
{
- xParserProps->setPropertyValue( OUString::createFromAscii("FormulaConvention"), uno::makeAny(::com::sun::star::sheet::AddressConvention::OOO) );
+ xParserProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FormulaConvention")), uno::makeAny(::com::sun::star::sheet::AddressConvention::OOO) );
}
uno::Sequence<sheet::FormulaToken> aTokens = xParser->parseFormula( rRange, CellAddress( 0, 0, 0 ) );
if( xParserProps.is() )
{
- xParserProps->setPropertyValue( OUString::createFromAscii("FormulaConvention"), uno::makeAny(::com::sun::star::sheet::AddressConvention::XL_OOX) );
+ xParserProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FormulaConvention")), uno::makeAny(::com::sun::star::sheet::AddressConvention::XL_OOX) );
}
aResult = xParser->printFormula( aTokens, CellAddress( 0, 0, 0 ) );
}
@@ -878,7 +878,7 @@ void ChartExport::_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())
@@ -888,13 +888,13 @@ void ChartExport::_ExportContent()
{
OUString sChartAddress;
aAny = xProp->getPropertyValue(
- OUString::createFromAscii( "ChartRangeAddress" ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("ChartRangeAddress")));
aAny >>= msChartAddress;
//maExportHelper.SetChartRangeAddress( sChartAddress );
OUString sTableNumberList;
aAny = xProp->getPropertyValue(
- OUString::createFromAscii( "TableNumberList" ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList")));
aAny >>= msTableNumberList;
//maExportHelper.SetTableNumberList( sTableNumberList );
@@ -1604,7 +1604,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
sal_Bool bJapaneseCandleSticks = sal_False;
Reference< beans::XPropertySet > xCTProp( xChartType, uno::UNO_QUERY );
if( xCTProp.is())
- xCTProp->getPropertyValue( OUString::createFromAscii("Japanese")) >>= bJapaneseCandleSticks;
+ xCTProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Japanese"))) >>= bJapaneseCandleSticks;
exportCandleStickSeries(
xDSCnt->getDataSeries(), bJapaneseCandleSticks, nAttachedAxis );
return;
@@ -1636,7 +1636,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
{
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 ))
{
@@ -1731,7 +1731,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
|| (eChartType == chart::TYPEID_BUBBLE) )
{
// export xVal
- 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() );
@@ -1744,7 +1744,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
if( eChartType == chart::TYPEID_BUBBLE )
{
// export yVal
- 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() )
{
Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
@@ -1791,7 +1791,7 @@ void ChartExport::exportCandleStickSeries(
xSource->getDataSequences());
//sal_Int32 nSeriesLength =
- // lcl_getSequenceLengthByRole( aSeqCnt, OUString::createFromAscii("values-last"));
+ // lcl_getSequenceLengthByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM("values-last")));
Reference< chart2::XChartDocument > xNewDoc( getModel(), uno::UNO_QUERY );
const char* sSeries[] = {"values-first","values-max","values-min","values-last",0};
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 139d6cf..e3b606b 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -84,8 +84,8 @@ void PPTShape::addShape(
Reference< lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW );
sal_Bool bClearText = sal_False;
- if ( sServiceName != OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) &&
- sServiceName != OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) )
+ if ( sServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) &&
+ sServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) )
{
switch( mnSubType )
{
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b951e37..9954706 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -171,22 +171,22 @@ void lclSetXShapeRect( const Reference< XShape >& rxShape, const Rectangle& rSha
try
{
// The size
- xProps->setPropertyValue( OUString::createFromAscii( "SizeType" ), Any( SizeType::FIX ) );
- xProps->setPropertyValue( OUString::createFromAscii( "FrameIsAutomaticHeight" ), Any( sal_False ) );
- xProps->setPropertyValue( OUString::createFromAscii( "Height" ), Any( rShapeRect.Height ) );
- xProps->setPropertyValue( OUString::createFromAscii( "Width" ), Any( rShapeRect.Width ) );
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SizeType")), Any( SizeType::FIX ) );
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutomaticHeight")), Any( sal_False ) );
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Height")), Any( rShapeRect.Height ) );
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Width")), Any( rShapeRect.Width ) );
// The position
- xProps->setPropertyValue( OUString::createFromAscii( "HoriOrientPosition" ), Any( rShapeRect.X ) );
- xProps->setPropertyValue( OUString::createFromAscii( "HoriOrientRelation" ),
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")), Any( rShapeRect.X ) );
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientRelation")),
Any( RelOrientation::FRAME ) );
- xProps->setPropertyValue( OUString::createFromAscii( "HoriOrient" ),
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")),
Any( HoriOrientation::NONE ) );
- xProps->setPropertyValue( OUString::createFromAscii( "VertOrientPosition" ), Any( rShapeRect.Y ) );
- xProps->setPropertyValue( OUString::createFromAscii( "VertOrientRelation" ),
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")), Any( rShapeRect.Y ) );
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientRelation")),
Any( RelOrientation::FRAME ) );
- xProps->setPropertyValue( OUString::createFromAscii( "VertOrient" ),
+ xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")),
Any( VertOrientation::NONE ) );
}
catch ( Exception& )
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 052577b..5b9648e 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -294,7 +294,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri
// Custom shape in Writer with a textbox are transformed into a frame
if ( nElement == ( NMSP_VML + XML_textbox ) )
dynamic_cast<SimpleShape&>( mrShape ).setService(
- OUString::createFromAscii( "com.sun.star.text.TextFrame" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) );
// Excel specific shape client data
if( isRootElement() && (nElement == VMLX_TOKEN( ClientData )) )
@@ -342,7 +342,7 @@ ContextHandlerRef RectangleShapeContext::onCreateContext( sal_Int32 nElement, co
{
if ( nElement == ( NMSP_VML + XML_textbox ) )
dynamic_cast< SimpleShape &>( mrShape ).setService(
- OUString::createFromAscii( "com.sun.star.text.TextFrame" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) );
// The parent class's context is fine
return ShapeContext::onCreateContext( nElement, rAttribs );
diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
index 276c91a..960c6c3 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/oox/source/xls/commentsbuffer.cxx
@@ -211,7 +211,7 @@ void Comment::finalizeImport()
Reference< XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), UNO_SET_THROW );
Reference <XText> xText( xAnnoShape, UNO_QUERY_THROW );
Reference <XTextRange> xTextRange( xText, UNO_QUERY_THROW );
- xTextRange->setString( OUString::createFromAscii("") ); // Clear contents
+ xTextRange->setString( OUString() ); // Clear contents
maModel.mxText->convert( xText, -1 );
// Add shape formatting properties (autoFill, colHidden and rowHidden are dropped)
diff --git a/unoxml/source/dom/cdatasection.cxx b/unoxml/source/dom/cdatasection.cxx
index db4386d..7f7ae9f 100644
--- a/unoxml/source/dom/cdatasection.cxx
+++ b/unoxml/source/dom/cdatasection.cxx
@@ -51,7 +51,7 @@ namespace DOM
OUString SAL_CALL CCDATASection::getNodeName()throw (RuntimeException)
{
- return OUString::createFromAscii("#cdata-section");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("#cdata-section"));
}
OUString SAL_CALL CCDATASection::getNodeValue() throw (RuntimeException)
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index d4bd9c4..7e9c532 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -41,9 +41,9 @@ namespace DOM
{
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMCharacterDataModified")), UNO_QUERY);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMCharacterDataModified"))), UNO_QUERY);
event->initMutationEvent(
- OUString::createFromAscii("DOMCharacterDataModified"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMCharacterDataModified")),
sal_True, sal_False, Reference< XNode >(),
prevValue, newValue, OUString(), (AttrChangeType)0 );
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx
index cc28259..800c762 100644
--- a/unoxml/source/dom/comment.cxx
+++ b/unoxml/source/dom/comment.cxx
@@ -49,7 +49,7 @@ namespace DOM
OUString SAL_CALL CComment::getNodeName()throw (RuntimeException)
{
- return OUString::createFromAscii("#comment");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("#comment"));
}
OUString SAL_CALL CComment::getNodeValue() throw (RuntimeException)
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 0b22b6b..2c92450 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -504,7 +504,7 @@ namespace DOM
{
if (aNsPrefix.getLength() > 0)
- aQName = aNsPrefix + OUString::createFromAscii(":") + aQName;
+ aQName = aNsPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aQName;
newElement = createElementNS(aNsUri, aQName);
}
else
@@ -524,7 +524,7 @@ namespace DOM
if (aAttrUri.getLength() > 0)
{
if (aAttrPrefix.getLength() > 0)
- aAttrName = aAttrPrefix + OUString::createFromAscii(":") + aAttrName;
+ aAttrName = aAttrPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aAttrName;
newElement->setAttributeNS(aAttrUri, aAttrName, curAttr->getValue());
}
else
@@ -590,8 +590,8 @@ namespace DOM
{
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMNodeInsertedIntoDocument")), UNO_QUERY);
- event->initMutationEvent(OUString::createFromAscii("DOMNodeInsertedIntoDocument")
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInsertedIntoDocument"))), UNO_QUERY);
+ event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInsertedIntoDocument"))
, sal_True, sal_False, Reference< XNode >(),
OUString(), OUString(), OUString(), (AttrChangeType)0 );
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -601,7 +601,7 @@ namespace DOM
}
OUString SAL_CALL CDocument::getNodeName()throw (RuntimeException)
{
- return OUString::createFromAscii("#document");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("#document"));
}
OUString SAL_CALL CDocument::getNodeValue() throw (RuntimeException)
{
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 4cb7741..bcce353 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -297,7 +297,7 @@ namespace DOM
// default warning handler triggers assertion
static void warning_func(void * ctx, const char * /*msg*/, ...)
{
- OUStringBuffer buf(OUString::createFromAscii("libxml2 warning\n"));
+ OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 warning\n")));
buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx)));
OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
OSL_ENSURE(sal_False, msg.getStr());
@@ -306,7 +306,7 @@ namespace DOM
// default error handler triggers assertion
static void error_func(void * ctx, const char * /*msg*/, ...)
{
- OUStringBuffer buf(OUString::createFromAscii("libxml2 error\n"));
+ OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error\n")));
buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx)));
OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
OSL_ENSURE(sal_False, msg.getStr());
diff --git a/unoxml/source/dom/documentfragment.cxx b/unoxml/source/dom/documentfragment.cxx
index 179af4c..1c198f6 100644
--- a/unoxml/source/dom/documentfragment.cxx
+++ b/unoxml/source/dom/documentfragment.cxx
@@ -37,7 +37,7 @@ namespace DOM
}
OUString SAL_CALL CDocumentFragment::getNodeName()throw (RuntimeException)
{
- return OUString::createFromAscii("#document-fragment");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("#document-fragment"));
}
OUString SAL_CALL CDocumentFragment::getNodeValue() throw (RuntimeException)
{
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index e990215..2918a01 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -53,7 +53,7 @@ namespace DOM
if (!i_xHandler.is()) throw RuntimeException();
comphelper::AttributeList *pAttrs =
new comphelper::AttributeList();
- OUString type = OUString::createFromAscii("");
+ OUString type = OUString();
// add namespace definitions to attributes
for (xmlNsPtr pNs = m_aNodePtr->nsDef; pNs != 0; pNs = pNs->next) {
const xmlChar *pPrefix = pNs->prefix;
@@ -61,8 +61,8 @@ namespace DOM
strlen(reinterpret_cast<const char*>(pPrefix)),
RTL_TEXTENCODING_UTF8);
OUString name = (prefix.equalsAscii(""))
- ? OUString::createFromAscii("xmlns")
- : OUString::createFromAscii("xmlns:") + prefix;
+ ? OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns"))
+ : OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:")) + prefix;
const xmlChar *pHref = pNs->href;
OUString val(reinterpret_cast<const sal_Char*>(pHref),
strlen(reinterpret_cast<const char*>(pHref)),
@@ -463,8 +463,8 @@ namespace DOM
// dispatch DOMAttrModified event
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
- event->initMutationEvent(OUString::createFromAscii("DOMAttrModified"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
+ event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")),
sal_True, sal_False, Reference< XNode >(aAttr, UNO_QUERY),
OUString(), aAttr->getValue(), aAttr->getName(), AttrChangeType_ADDITION);
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -518,8 +518,8 @@ namespace DOM
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
- event->initMutationEvent(OUString::createFromAscii("DOMAttrModified"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
+ event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")),
sal_True, sal_False, Reference< XNode >(getAttributeNode(name), UNO_QUERY),
oldValue, value, name, aChangeType);
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -588,8 +588,8 @@ namespace DOM
// dispatch DOMAttrModified event
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
- event->initMutationEvent(OUString::createFromAscii("DOMAttrModified"), sal_True, sal_False,
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
+ event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")), sal_True, sal_False,
Reference< XNode >(getAttributeNodeNS(namespaceURI, OUString((char*)xLName, strlen((char*)xLName), RTL_TEXTENCODING_UTF8)), UNO_QUERY),
oldValue, value, qualifiedName, aChangeType);
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -632,7 +632,7 @@ namespace DOM
void SAL_CALL CElement::setElementName(const OUString& aName) throw (RuntimeException, DOMException)
{
- if (aName.getLength() > 0 && aName.indexOf(OUString::createFromAscii(":")) < 0)
+ if (aName.getLength() > 0 && aName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(":"))) < 0)
{
OString oName = OUStringToOString(aName, RTL_TEXTENCODING_UTF8);
xmlChar *xName = (xmlChar*)oName.getStr();
diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx
index f3f7613..138b712 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -66,7 +66,7 @@ namespace DOM
// get the XNode
Reference< XNode > xNode(CNode::get(static_cast<const CNode*>(pElement)->m_aNodePtr));
Reference< XEventTarget > xTarget(xNode, UNO_QUERY_THROW);
- OUString aType = OUString::createFromAscii("DOMSubtreeModified");
+ OUString aType(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified"));
sal_Bool capture = sal_False;
xTarget->addEventListener(aType, Reference< XEventListener >(this), capture);
} catch (Exception &e){
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index ba005b3..593c931 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -466,8 +466,8 @@ namespace DOM
{
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMNodeInserted")), UNO_QUERY);
- event->initMutationEvent(OUString::createFromAscii("DOMNodeInserted")
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInserted"))), UNO_QUERY);
+ event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInserted"))
, sal_True, sal_False, Reference< XNode >(CNode::get(m_aNodePtr)),
OUString(), OUString(), OUString(), (AttrChangeType)0 );
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -861,8 +861,8 @@ namespace DOM
{
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMNodeRemoved")), UNO_QUERY);
- event->initMutationEvent(OUString::createFromAscii("DOMNodeRemoved"), sal_True,
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeRemoved"))), UNO_QUERY);
+ event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeRemoved")), sal_True,
sal_False, Reference< XNode >(CNode::get(m_aNodePtr)),
OUString(), OUString(), OUString(), (AttrChangeType)0 );
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -950,8 +950,8 @@ namespace DOM
// target is _this_ node
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- OUString::createFromAscii("DOMSubtreeModified")), UNO_QUERY);
- event->initMutationEvent(OUString::createFromAscii("DOMSubtreeModified"), sal_True,
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified"))), UNO_QUERY);
+ event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified")), sal_True,
sal_False, Reference< XNode >(),
OUString(), OUString(), OUString(), (AttrChangeType)0 );
dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 17d7eac..b106615 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -164,7 +164,7 @@ namespace DOM
throw SAXException();
Reference< XDocumentBuilder > aBuilder(m_aServiceManager->createInstance(
- OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY_THROW);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder"))), UNO_QUERY_THROW);
Reference< XDocument > aDocument = aBuilder->newDocument();
m_aNodeStack.push(Reference< XNode >(aDocument, UNO_QUERY));
m_aDocument = aDocument;
@@ -210,12 +210,12 @@ namespace DOM
attr_qname = attribs->getNameByIndex(i);
attr_value = attribs->getValueByIndex(i);
// new prefix mapping
- if (attr_qname.indexOf(OUString::createFromAscii("xmlns:")) == 0)
+ if (attr_qname.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:"))) == 0)
{
newprefix = attr_qname.copy(attr_qname.indexOf(':')+1);
aNSMap.insert(NSMap::value_type(newprefix, attr_value));
}
- else if (attr_qname == OUString::createFromAscii("xmlns"))
+ else if (attr_qname == OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns")))
{
// new default prefix
aNSMap.insert(NSMap::value_type(OUString(), attr_value));
@@ -300,7 +300,7 @@ namespace DOM
OUString aRefName;
OUString aPrefix = aElement->getPrefix();
if (aPrefix.getLength() > 0)
- aRefName = aPrefix + OUString::createFromAscii(":") + aElement->getTagName();
+ aRefName = aPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aElement->getTagName();
else
aRefName = aElement->getTagName();
if (aRefName != aName) // consistency check
diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx
index 66ad5a9..0551d7c 100644
--- a/unoxml/source/dom/text.cxx
+++ b/unoxml/source/dom/text.cxx
@@ -54,7 +54,7 @@ namespace DOM
OUString SAL_CALL CText::getNodeName()throw (RuntimeException)
{
- return OUString::createFromAscii("#text");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("#text"));
}
void SAL_CALL CText::fastSaxify( Context& io_rContext )
diff --git a/unoxml/source/events/testlistener.cxx b/unoxml/source/events/testlistener.cxx
index 0320458..e95f1e7 100644
--- a/unoxml/source/events/testlistener.cxx
+++ b/unoxml/source/events/testlistener.cxx
@@ -92,21 +92,21 @@ namespace DOM { namespace events
void SAL_CALL CTestListener::initialize(const Sequence< Any >& args) throw(RuntimeException)
{
if (args.getLength() < 3) throw IllegalArgumentException(
- OUString::createFromAscii("Wrong number of arguments"), Reference< XInterface >(), 0);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong number of arguments")), Reference< XInterface >(), 0);
Reference <XEventTarget> aTarget;
if(! (args[0] >>= aTarget)) throw IllegalArgumentException(
- OUString::createFromAscii("Illegal argument 1"), Reference< XInterface >(), 1);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 1")), Reference< XInterface >(), 1);
OUString aType;
if (! (args[1] >>= aType))
- throw IllegalArgumentException(OUString::createFromAscii("Illegal argument 2"), Reference< XInterface >(), 2);
+ throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 2")), Reference< XInterface >(), 2);
sal_Bool bCapture = sal_False;
if(! (args[2] >>= bCapture)) throw IllegalArgumentException(
- OUString::createFromAscii("Illegal argument 3"), Reference< XInterface >(), 3);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 3")), Reference< XInterface >(), 3);
- if(! (args[3] >>= m_name)) m_name = OUString::createFromAscii("<unnamed listener>");
+ if(! (args[3] >>= m_name)) m_name = OUString(RTL_CONSTASCII_USTRINGPARAM("<unnamed listener>"));
m_target = aTarget;
m_type = aType;
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 3676d42..3f46fb3 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -1382,14 +1382,10 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
throw (uno::RuntimeException, lang::IllegalArgumentException,
rdf::RepositoryException)
{
- static const ::rtl::OUString s_cell(
- ::rtl::OUString::createFromAscii("com.sun.star.table.Cell"));
- static const ::rtl::OUString s_cellprops( // for writer
- ::rtl::OUString::createFromAscii("com.sun.star.text.CellProperties"));
- static const ::rtl::OUString s_paragraph(
- ::rtl::OUString::createFromAscii("com.sun.star.text.Paragraph"));
- static const ::rtl::OUString s_bookmark(
- ::rtl::OUString::createFromAscii("com.sun.star.text.Bookmark"));
+ static const ::rtl::OUString s_cell(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.Cell"));
+ static const ::rtl::OUString s_cellprops(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.CellProperties")); // for writer
+ static const ::rtl::OUString s_paragraph(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph"));
+ static const ::rtl::OUString s_bookmark(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark"));
static const ::rtl::OUString s_meta( ::rtl::OUString::createFromAscii(
"com.sun.star.text.InContentMetadata"));
@@ -1444,7 +1440,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
"ensureMetadataReference did not"), *this);
}
::rtl::OUString const sXmlId(mdref.First +
- ::rtl::OUString::createFromAscii("#") + mdref.Second);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")) + mdref.Second);
uno::Reference<rdf::XURI> xXmlId;
try {
xXmlId.set( rdf::URI::create(m_xContext,
@@ -1508,7 +1504,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
try {
xXmlId.set( rdf::URI::create(m_xContext,
::rtl::OUString::createFromAscii(s_nsOOo)
- + mdref.First + ::rtl::OUString::createFromAscii("#")
+ + mdref.First + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#"))
+ mdref.Second),
uno::UNO_QUERY_THROW);
} catch (lang::IllegalArgumentException & iae) {
@@ -1536,7 +1532,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >();
}
::rtl::OUString const sXmlId(mdref.First +
- ::rtl::OUString::createFromAscii("#") + mdref.Second);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")) + mdref.Second);
uno::Reference<rdf::XURI> xXmlId;
try {
xXmlId.set( rdf::URI::create(m_xContext,
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 97c5a88..2940c87 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -279,7 +279,7 @@ namespace XPath
va_end(args);
::rtl::OUStringBuffer buf(
- OUString::createFromAscii("libxml2 error:\n"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error:\n")));
buf.appendAscii(str);
OString msg = OUStringToOString(buf.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
@@ -290,11 +290,11 @@ namespace XPath
{
(void) userData;
::rtl::OUStringBuffer buf(
- OUString::createFromAscii("libxml2 error:\n"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error:\n")));
if (error) {
buf.append(make_error_message(error));
} else {
- buf.append(OUString::createFromAscii("no error argument!"));
+ buf.append(OUString(RTL_CONSTASCII_USTRINGPARAM("no error argument!")));
}
OString msg = OUStringToOString(buf.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index 3eb3f2b..943097e 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -49,7 +49,7 @@ OString getTempFileName(const OUString& fileName)
OUString ousTmpUrl;
FileBase::getTempDirURL(ousTmpUrl);
if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
- ousTmpUrl += OUString::createFromAscii("/");
+ ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
ousTmpUrl += fileName;
OUString sysTmpPath;
@@ -273,12 +273,12 @@ public:
pool->insert(ps4);
- OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropertyPool_int.dot"));
+ OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_int.dot")));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
- OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropertyPool_ext.dot"));
+ OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_ext.dot")));
printf("Pool dump: %s\n", tmpFileName2.getStr());
ExternalViewLoggerImpl evl(tmpFileName2.getStr());
pool->dump(&evl);
@@ -373,12 +373,12 @@ public:
CPPUNIT_ASSERT_MESSAGE("paraProps == failed failed", paraProps == paragraphProps);
- OString tmpFileName = getTempFileName(OUString::createFromAscii("testComplexParaProps_int.dot"));
+ OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_int.dot")));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
- OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testComplexParaProps_ext.dot"));
+ OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_ext.dot")));
printf("Pool dump: %s\n", tmpFileName2.getStr());
ExternalViewLoggerImpl evl(tmpFileName2.getStr());
pool->dump(&evl);
@@ -505,21 +505,21 @@ public:
pb2->insert(createStringProperty(NS_style::LN_font_face, "Roman"));
PropertyPoolHandle_Pointer_t ph2 = pool->insert(pb2);
- OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_1.dot"));
+ OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_1.dot")));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
}
- OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_2.dot"));
+ OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_2.dot")));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
pool->garbageCollection();
- OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_after.dot"));
+ OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_after.dot")));
printf("Pool dump: %s\n", tmpFileName2.getStr());
FileLoggerImpl fl2(tmpFileName2.getStr());
pool->dump(&fl2);
diff --git a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
index 9dded73..6d28974 100644
--- a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
+++ b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
@@ -75,7 +75,7 @@ OString getTempFileName(const OUString& fileName)
OUString ousTmpUrl;
FileBase::getTempDirURL(ousTmpUrl);
if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
- ousTmpUrl += OUString::createFromAscii("/");
+ ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
ousTmpUrl += fileName;
OUString sysTmpPath;
@@ -94,12 +94,12 @@ public:
std::auto_ptr<xxml::XXmlReader> reader=xxml::XXmlReader::createXXmlReader(*handler);
reader->read("helloworld.odt.flat.xml");
- OString tmpFileName = getTempFileName(OUString::createFromAscii("dumpSlPool_int.dot"));
+ OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("dumpSlPool_int.dot")));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
propertyPool->dump(&fl);
- OString tmpFileName2 = getTempFileName(OUString::createFromAscii("dumpSlPool_ext.dot"));
+ OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("dumpSlPool_ext.dot")));
printf("Pool dump: %s\n", tmpFileName2.getStr());
ExternalViewLoggerImpl evl(tmpFileName2.getStr());
propertyPool->dump(&evl);
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 3211636..17414aa 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -418,7 +418,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
//todo: this cannot be the right way to replace a part of the string!
aNewFormat.setCharAt( nI, 'Y' );
aNewFormat.setCharAt( nI + 1, 'Y' );
- aNewFormat.insert(nI + 2, ::rtl::OUString::createFromAscii("YY"));
+ aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YY")));
nLen+=2;
nI+=3;
}
@@ -431,7 +431,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
//todo: this cannot be the right way to replace a part of the string!
aNewFormat.setCharAt( nI, 'y' );
aNewFormat.setCharAt( nI + 1, 'y' );
- aNewFormat.insert(nI + 2, ::rtl::OUString::createFromAscii("yy"));
+ aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("yy")));
nLen+=2;
nI+=3;
}
@@ -442,7 +442,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
// MM We have to escape '/' in case it's used as a char
//todo: this cannot be the right way to replace a part of the string!
aNewFormat.setCharAt( nI, '\\' );
- aNewFormat.insert(nI + 1, ::rtl::OUString::createFromAscii("/"));
+ aNewFormat.insert(nI + 1, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")));
nI++;
nLen++;
}
@@ -455,18 +455,18 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
if (bForceJapanese)
{
- rLocale.Language = ::rtl::OUString::createFromAscii("ja");
- rLocale.Country = ::rtl::OUString::createFromAscii("JP");
+ rLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja"));
+ rLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JP"));
}
if (bForceNatNum)
{
- aNewFormat.insert( 0, ::rtl::OUString::createFromAscii("[NatNum1][$-411]"));
+ aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[NatNum1][$-411]")));
}
if (bHijri)
{
- aNewFormat.insert( 0, ::rtl::OUString::createFromAscii("[~hijri]"));
+ aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[~hijri]")));
}
return aNewFormat.makeStringAndClear();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 239f89a..659a97c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -4314,7 +4314,7 @@ void DomainMapper::startParagraphGroup()
m_pImpl->getTableManager().startParagraphGroup();
m_pImpl->PushProperties(CONTEXT_PARAGRAPH);
- static ::rtl::OUString sDefault( ::rtl::OUString::createFromAscii("Standard") );
+ static ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("Standard") );
if (m_pImpl->GetTopContext())
{
m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, uno::makeAny( sDefault ) );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 59a897f..54ca809 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -184,7 +184,7 @@ uno::Reference< container::XNameContainer > DomainMapper_Impl::GetPageStyles(
if(!m_xPageStyles.is())
{
uno::Reference< style::XStyleFamiliesSupplier > xSupplier( m_xTextDocument, uno::UNO_QUERY );
- xSupplier->getStyleFamilies()->getByName(::rtl::OUString::createFromAscii("PageStyles")) >>= m_xPageStyles;
+ xSupplier->getStyleFamilies()->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))) >>= m_xPageStyles;
}
return m_xPageStyles;
}
@@ -1469,7 +1469,7 @@ extract a parameter (with or without quotes) between the command and the followi
}
else
{
- nEndIndex = rCommand.indexOf( ::rtl::OUString::createFromAscii(" \\"), nStartIndex);
+ nEndIndex = rCommand.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \\")), nStartIndex);
}
::rtl::OUString sRet;
if( nEndIndex > nStartIndex + 1 )
@@ -2640,7 +2640,7 @@ void DomainMapper_Impl::handleAuthor
{
//create a custom property field
sServiceName +=
- ::rtl::OUString::createFromAscii("DocInfo.Custom");
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocInfo.Custom"));
bIsCustomField = true;
}
else
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 8dcd6b9..439972c 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1055,10 +1055,10 @@ void GraphicImport::attribute(Id nName, Value & val)
( xShape, uno::UNO_QUERY_THROW );
rtl::OUString sUrl;
- xShapeProps->getPropertyValue( rtl::OUString::createFromAscii( "GraphicURL" ) ) >>= sUrl;
+ xShapeProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")) ) >>= sUrl;
::com::sun::star::beans::PropertyValues aMediaProperties( 1 );
- aMediaProperties[0].Name = rtl::OUString::createFromAscii( "URL" );
+ aMediaProperties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
aMediaProperties[0].Value <<= sUrl;
m_xGraphicObject = createGraphicObject( aMediaProperties );
@@ -1071,9 +1071,9 @@ void GraphicImport::attribute(Id nName, Value & val)
uno::Reference< beans::XPropertySet > xGraphProps( m_xGraphicObject,
uno::UNO_QUERY );
awt::Size aSize = xShape->getSize( );
- xGraphProps->setPropertyValue( rtl::OUString::createFromAscii( "Height" ),
+ xGraphProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")),
uno::makeAny( aSize.Height ) );
- xGraphProps->setPropertyValue( rtl::OUString::createFromAscii( "Width" ),
+ xGraphProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")),
uno::makeAny( aSize.Width ) );
}
}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 4ce39b1..2489a37 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -439,7 +439,7 @@ ListDef::~ListDef( )
OUString ListDef::GetStyleName( sal_Int32 nId )
{
- OUString sStyleName( OUString::createFromAscii( "WWNum" ) );
+ OUString sStyleName( RTL_CONSTASCII_USTRINGPARAM("WWNum") );
sStyleName += OUString::valueOf( nId );
return sStyleName;
@@ -476,7 +476,7 @@ uno::Reference< container::XNameContainer > lcl_getUnoNumberingStyles(
try
{
uno::Reference< style::XStyleFamiliesSupplier > xFamilies( xFactory, uno::UNO_QUERY_THROW );
- uno::Any oFamily = xFamilies->getStyleFamilies( )->getByName( OUString::createFromAscii( "NumberingStyles" ) );
+ uno::Any oFamily = xFamilies->getStyleFamilies( )->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyles")) );
oFamily >>= xStyles;
}
@@ -501,7 +501,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
// Create the numbering style
uno::Reference< beans::XPropertySet > xStyle (
xFactory->createInstance(
- OUString::createFromAscii("com.sun.star.style.NumberingStyle")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.NumberingStyle"))),
uno::UNO_QUERY_THROW );
rtl::OUString sStyleName = GetStyleName( GetId( ) );
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 386d46f..6e125f5 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -267,7 +267,7 @@ void SettingsTable::ApplyProperties( uno::Reference< text::XTextDocument > xDoc
uno::Reference< beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY );
// Record changes value
- xDocProps->setPropertyValue( ::rtl::OUString::createFromAscii( "RecordChanges" ), uno::makeAny( m_pImpl->m_bRecordChanges ) );
+ xDocProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecordChanges")), uno::makeAny( m_pImpl->m_bRecordChanges ) );
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 6df8e0e..91ac2c1 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -926,7 +926,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
{
aPropValues.realloc( aPropValues.getLength( ) + 1 );
beans::PropertyValue aStyleVal( rPropNameSupplier.GetName( PROP_NUMBERING_STYLE_NAME ), 0,
- uno::makeAny( rtl::OUString::createFromAscii( "" ) ),
+ uno::makeAny( rtl::OUString() ),
beans::PropertyState_DIRECT_VALUE );
aPropValues[ aPropValues.getLength( ) - 1 ] = aStyleVal;
}
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 562b0cb..94afe39 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -97,10 +97,10 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
{
SotStorageRef xStg = new SotStorage( pStream, FALSE );
- bool bTable2 = xStg->IsContained( rtl::OUString::createFromAscii("1Table" ));
+ bool bTable2 = xStg->IsContained( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1Table")));
SotStorageStreamRef xRef =
- xStg->OpenSotStream(rtl::OUString::createFromAscii("WordDocument"),
+ xStg->OpenSotStream(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WordDocument")),
STREAM_STD_READ | STREAM_NOCREATE );
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index a0d6a9d..843381a 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -262,7 +262,7 @@ uno::Reference<xml::sax::XParser> OOXMLStreamImpl::getParser()
uno::Reference<xml::sax::XParser> xParser
(xFactory->createInstanceWithContext
- ( rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ),
+ ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")),
mxContext ),
uno::UNO_QUERY );
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
index de4f147..48421d3 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
@@ -100,8 +100,8 @@ public:
xContext), uno::UNO_QUERY_THROW);
xInputStream = xFileAccess->openFileRead(absFileUrl) ;
- mLF = rtl::OUString::createFromAscii("\n");
- mCRLF = rtl::OUString::createFromAscii("\r\n");
+ mLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
+ mCRLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n"));
}
rtl::OUString getURL()
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
index 89cd8e8..f2499fc 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
@@ -101,8 +101,8 @@ public:
xContext), uno::UNO_QUERY_THROW);
xInputStream = xFileAccess->openFileRead(absFileUrl) ;
- mLF = rtl::OUString::createFromAscii("\n");
- mCRLF = rtl::OUString::createFromAscii("\r\n");
+ mLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
+ mCRLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n"));
}
rtl::OUString getURL()
diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
index a8de336..1386733 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
@@ -154,7 +154,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
aArgs0[0] <<= myStream;
uno::Reference< container::XNameContainer > xNameContainer(
xServiceFactory->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.embed.OLESimpleStorage" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
aArgs0 ),
uno::UNO_QUERY_THROW );
try {
@@ -171,7 +171,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
- xContentStreamPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.sun.star.oleobject")));
+ xContentStreamPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.oleobject"))));
uno::Reference<io::XOutputStream> myOutStream=xContentStream->getOutputStream();
uno::Sequence< ::sal_Int8 > seq1(binLen);
unsigned char *data1=binBufferStr;
@@ -197,21 +197,21 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
- xContentStreamPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.sun.star.oleobject")));
+ xContentStreamPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.oleobject"))));
printf("CONTENT STREAM OK\n");
uno::Sequence< uno::Any > aArgs1( 1 );
aArgs1[0] <<= xContentStream;
uno::Reference< container::XNameContainer > xNameContainer2(
xServiceFactory->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.embed.OLESimpleStorage" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
aArgs1 ),
uno::UNO_QUERY_THROW );
printf("OLE STORAGE OK\n");
uno::Any anyStream;
anyStream <<= myInStream;
- xNameContainer2->insertByName(rtl::OUString::createFromAscii("\1Ole10Native"), anyStream);
+ xNameContainer2->insertByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\1Ole10Native")), anyStream);
printf("INSERT OK\n");
uno::Reference<embed::XTransactedObject> xTransact(xNameContainer2, uno::UNO_QUERY);
@@ -311,7 +311,7 @@ public:
bytesTotal=xSeekable->getLength();
if (xStatusIndicator.is() && xSeekable.is())
{
- xStatusIndicator->start(::rtl::OUString::createFromAscii("Converting"), 100);
+ xStatusIndicator->start(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Converting")), 100);
}
}
@@ -386,7 +386,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
rtl_uString_release(dir);
uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
- xServiceFactory->createInstance (rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
+ xServiceFactory->createInstance (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), uno::UNO_QUERY_THROW);
rtl::OUString outFileUrl;
{
@@ -401,7 +401,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
aArgs2[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs2), uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
- xPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.oasis.opendocument.text")));
+ xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.text"))));
uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
uno::Reference< task::XStatusIndicator > xStatusIndicator;
diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
index 9b61773..d279426 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
@@ -201,7 +201,7 @@ public:
bytesTotal=xSeekable->getLength();
if (xStatusIndicator.is() && xSeekable.is())
{
- xStatusIndicator->start(::rtl::OUString::createFromAscii("Converting"), 100);
+ xStatusIndicator->start(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Converting")), 100);
}
}
@@ -270,7 +270,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
rtl_uString_release(dir);
uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
- xServiceFactory->createInstance (rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
+ xServiceFactory->createInstance (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), uno::UNO_QUERY_THROW);
#if 0
rtl::OUString outFileUrl;
@@ -286,7 +286,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
aArgs[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs), uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
- xPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.oasis.opendocument.text")));
+ xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.text"))));
#endif
uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
uno::Reference< task::XStatusIndicator > xStatusIndicator;
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
index cf70c6d..fe09e68 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
@@ -229,7 +229,7 @@ OUString SAL_CALL WordPerfectImportFilter::detect( com::sun::star::uno::Sequence
if ( location == Descriptor.getLength() )
{
Descriptor.realloc(nLength+1);
- Descriptor[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
+ Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
}
Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
index 2e8264f..67183bc 100644
--- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx
+++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
@@ -57,7 +57,7 @@ sal_Bool SAL_CALL component_writeInfo(
sal_Int32 nPos = 0;
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WordPerfectImportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
const Sequence< OUString > & rSNL = WordPerfectImportFilter_getSupportedServiceNames();
const OUString * pArray = rSNL.getConstArray();
@@ -65,7 +65,7 @@ sal_Bool SAL_CALL component_writeInfo(
xNewKey->createKey( pArray[nPos] );
#if 0
xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WordPerfectImportFilterDialog_getImplementationName() );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
const Sequence< OUString > & rSNL2 = WordPerfectImportFilterDialog_getSupportedServiceNames();
pArray = rSNL2.getConstArray();
diff --git a/writerperfect/source/wpgimp/WPGImportFilter.cxx b/writerperfect/source/wpgimp/WPGImportFilter.cxx
index b494e73..8a1f92d 100644
--- a/writerperfect/source/wpgimp/WPGImportFilter.cxx
+++ b/writerperfect/source/wpgimp/WPGImportFilter.cxx
@@ -180,7 +180,7 @@ OUString SAL_CALL WPGImportFilter::detect( com::sun::star::uno::Sequence< Proper
if ( location == Descriptor.getLength() )
{
Descriptor.realloc(nLength+1);
- Descriptor[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
+ Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
}
Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
index 16fd6e8..d168677 100644
--- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
+++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
@@ -58,7 +58,7 @@ sal_Bool SAL_CALL component_writeInfo(
sal_Int32 nPos = 0;
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WPGImportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
const Sequence< OUString > & rSNL = WPGImportFilter_getSupportedServiceNames();
const OUString * pArray = rSNL.getConstArray();
diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
index 9a4488d..211d3ae 100644
--- a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
+++ b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
@@ -197,7 +197,7 @@ OUString SAL_CALL MSWorksImportFilter::detect( com::sun::star::uno::Sequence< Pr
if ( location == Descriptor.getLength() )
{
Descriptor.realloc(nLength+1);
- Descriptor[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
+ Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
}
Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
index 8d6e7c6..6957914 100644
--- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx
+++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
@@ -58,7 +58,7 @@ sal_Bool SAL_CALL component_writeInfo(
sal_Int32 nPos = 0;
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( MSWorksImportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
const Sequence< OUString > & rSNL = MSWorksImportFilter_getSupportedServiceNames();
const OUString * pArray = rSNL.getConstArray();
More information about the Libreoffice-commits
mailing list