summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-21 16:20:06 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-21 16:20:06 +0100
commit50dd37752c609f970194b2b124c8cff10cdbda84 (patch)
tree7e84cb3b5a7fc86ff48cf5215c6d6756b2792b32 /xmloff
parente379a111fbd2c287383f5ba508b54bcca352f472 (diff)
RTL_CONSTASCII_USTRINGPARAM in libs core 45
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx4
-rw-r--r--xmloff/source/meta/MetaExportComponent.cxx2
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx12
-rw-r--r--xmloff/source/style/prstylei.cxx10
4 files changed, 14 insertions, 14 deletions
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 2e203c418c..0f24d8741b 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -740,8 +740,8 @@ SvXMLImportContext *SchXMLImport::CreateContext( USHORT nPrefix, const OUString&
if (xDPS.is()) {
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
mxServiceFactory->createInstance(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
pContext = (IsXMLToken(rLocalName, XML_DOCUMENT_META))
? new SvXMLMetaDocumentContext(*this,
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index e25127d60e..8a4ab891c5 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -125,7 +125,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
// get filter component
xDocHandler = uno::Reference< xml::sax::XDocumentHandler >(
xFactory->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
aArgs),
uno::UNO_QUERY_THROW );
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 86fdac8283..acf935186b 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -65,13 +65,13 @@ SvXMLImportContext* XMLMetaImportComponent::CreateContext(
IsXMLToken(rLocalName, XML_DOCUMENT_META) )
{
if (!mxDocProps.is()) {
- throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+ throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"XMLMetaImportComponent::CreateContext: setTargetDocument "
- "has not been called"), *this);
+ "has not been called")), *this);
}
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);
return new SvXMLMetaDocumentContext(
*this, nPrefix, rLocalName, mxDocProps, xDocBuilder);
@@ -88,9 +88,9 @@ void SAL_CALL XMLMetaImportComponent::setTargetDocument(
{
mxDocProps = uno::Reference< document::XDocumentProperties >::query( xDoc );
if( !mxDocProps.is() )
- throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+ throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"XMLMetaImportComponent::setTargetDocument: argument is no "
- "XDocumentProperties"), uno::Reference<uno::XInterface>(*this), 0);
+ "XDocumentProperties")), uno::Reference<uno::XInterface>(*this), 0);
}
uno::Sequence< rtl::OUString > SAL_CALL
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index c11799ca21..554d39496b 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -209,15 +209,15 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
aValues.realloc( nLen + 2 );
PropertyValue *pProps = aValues.getArray() + nLen;
- pProps->Name = rtl::OUString::createFromAscii("ParaStyleName");
+ pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName"));
OUString sParent( GetParentName() );
if( sParent.getLength() )
sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
else
- sParent = rtl::OUString::createFromAscii("Standard");
+ sParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
pProps->Value <<= sParent;
++pProps;
- pProps->Name = rtl::OUString::createFromAscii("ParaConditionalStyleName");
+ pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaConditionalStyleName"));
pProps->Value <<= sParent;
}
@@ -226,8 +226,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
Sequence< OUString > aPropNames(1);
aPropNames[0] = GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ?
- rtl::OUString::createFromAscii("ParaAutoStyleName") :
- rtl::OUString::createFromAscii("CharAutoStyleName");
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAutoStyleName")) :
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoStyleName"));
Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames );
if( aAny.hasElements() )
{