RTL_CONSTASCII_USTRINGPARAM in filters 8 (build problem in sal ?)

14 files changed, 53 insertions, 49 deletions

diff --git a/unoxml/source/dom/cdatasection.cxx b/unoxml/source/dom/cdatasection.cxx
index 1bb7d6d72f19..2f432138c0e0 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(RTL_CONSTASCII_USTRINGPARAM("#cdata-section"));
+        return OUString::createFromAscii("#cdata-section");
     }
 
     OUString SAL_CALL CCDATASection::getNodeValue() throw (RuntimeException)
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index 060d33d3f546..c5e09540b79c 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(RTL_CONSTASCII_USTRINGPARAM("DOMCharacterDataModified"))), UNO_QUERY);
+            OUString::createFromAscii("DOMCharacterDataModified")), UNO_QUERY);
         event->initMutationEvent(
-                OUString(RTL_CONSTASCII_USTRINGPARAM("DOMCharacterDataModified")),
+                OUString::createFromAscii("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 d7a8ff605f43..4b7dd5a72154 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(RTL_CONSTASCII_USTRINGPARAM("#comment"));
+        return OUString::createFromAscii("#comment");
     }
 
     OUString SAL_CALL CComment::getNodeValue() throw (RuntimeException)
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 60b044c7f43e..30cdbbb34056 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(RTL_CONSTASCII_USTRINGPARAM(":")) + aQName;
+                    aQName = aNsPrefix + OUString::createFromAscii(":") + aQName;
                 newElement = createElementNS(aNsUri, aQName);
             }
             else
@@ -524,7 +524,7 @@ namespace DOM
                     if (aAttrUri.getLength() > 0)
                     {
                         if (aAttrPrefix.getLength() > 0)
-                            aAttrName = aAttrPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aAttrName;
+                            aAttrName = aAttrPrefix + OUString::createFromAscii(":") + 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(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInsertedIntoDocument"))), UNO_QUERY);
-            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInsertedIntoDocument"))
+                OUString::createFromAscii("DOMNodeInsertedIntoDocument")), UNO_QUERY);
+            event->initMutationEvent(OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("#document"));
+        return OUString::createFromAscii("#document");
     }
     OUString SAL_CALL CDocument::getNodeValue() throw (RuntimeException)
     {
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 1c7f3140a33e..3f6d67d53811 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(RTL_CONSTASCII_USTRINGPARAM("libxml2 warning\n")));
+        OUStringBuffer buf(OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("libxml2 error\n")));
+        OUStringBuffer buf(OUString::createFromAscii("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 00c344f77bad..9e93449b001c 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(RTL_CONSTASCII_USTRINGPARAM("#document-fragment"));
+        return OUString::createFromAscii("#document-fragment");
     }
     OUString SAL_CALL CDocumentFragment::getNodeValue() throw (RuntimeException)
     {
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 1f86e33c9185..2c4264f07cf3 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();
+        OUString type = OUString::createFromAscii("");
         // 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(RTL_CONSTASCII_USTRINGPARAM("xmlns"))
-                : OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:")) + prefix;
+                ? OUString::createFromAscii("xmlns")
+                : OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
-            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")),
+                OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
+            event->initMutationEvent(OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
-            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")),
+                OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
+            event->initMutationEvent(OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
-                event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")), sal_True, sal_False,
+                    OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
+                event->initMutationEvent(OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM(":"))) < 0)
+        if (aName.getLength() > 0 && aName.indexOf(OUString::createFromAscii(":")) < 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 5b0d96758459..15a870aed933 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(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified"));
+            OUString aType = OUString::createFromAscii("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 79f42b6fd1f9..1c8cf054a27b 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(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInserted"))), UNO_QUERY);
-            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInserted"))
+                OUString::createFromAscii("DOMNodeInserted")), UNO_QUERY);
+            event->initMutationEvent(OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("DOMNodeRemoved"))), UNO_QUERY);
-            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeRemoved")), sal_True,
+                OUString::createFromAscii("DOMNodeRemoved")), UNO_QUERY);
+            event->initMutationEvent(OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified"))), UNO_QUERY);
-        event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified")), sal_True,
+            OUString::createFromAscii("DOMSubtreeModified")), UNO_QUERY);
+        event->initMutationEvent(OUString::createFromAscii("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 d6d87754eb6a..50b611445d7c 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder"))), UNO_QUERY_THROW);
+                OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("xmlns:"))) == 0)
+            if (attr_qname.indexOf(OUString::createFromAscii("xmlns:")) == 0)
             {
                 newprefix = attr_qname.copy(attr_qname.indexOf(':')+1);
                 aNSMap.insert(NSMap::value_type(newprefix, attr_value));
             }
-            else if (attr_qname == OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns")))
+            else if (attr_qname == OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM(":")) + aElement->getTagName();
+            aRefName = aPrefix + OUString::createFromAscii(":") + 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 520adf3b77e3..a10ba9944702 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(RTL_CONSTASCII_USTRINGPARAM("#text"));
+        return OUString::createFromAscii("#text");
     }
 
     void SAL_CALL CText::fastSaxify( Context& io_rContext )
diff --git a/unoxml/source/events/testlistener.cxx b/unoxml/source/events/testlistener.cxx
index ee307fa27220..7c65d4ca606d 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(RTL_CONSTASCII_USTRINGPARAM("Wrong number of arguments")), Reference< XInterface >(), 0);
+            OUString::createFromAscii("Wrong number of arguments"), Reference< XInterface >(), 0);
 
         Reference <XEventTarget> aTarget;
         if(! (args[0] >>= aTarget)) throw IllegalArgumentException(
-                OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 1")), Reference< XInterface >(), 1);
+                OUString::createFromAscii("Illegal argument 1"), Reference< XInterface >(), 1);
 
         OUString aType;
         if (! (args[1] >>= aType))
-            throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 2")), Reference< XInterface >(), 2);
+            throw IllegalArgumentException(OUString::createFromAscii("Illegal argument 2"), Reference< XInterface >(), 2);
 
         sal_Bool bCapture = sal_False;
         if(! (args[2]  >>=  bCapture)) throw IllegalArgumentException(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 3")), Reference< XInterface >(), 3);
+            OUString::createFromAscii("Illegal argument 3"), Reference< XInterface >(), 3);
 
-        if(! (args[3] >>= m_name)) m_name = OUString(RTL_CONSTASCII_USTRINGPARAM("<unnamed listener>"));
+        if(! (args[3] >>= m_name)) m_name = OUString::createFromAscii("<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 2519fd29e411..0a3f875e1897 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -1382,10 +1382,14 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
 throw (uno::RuntimeException, lang::IllegalArgumentException,
     rdf::RepositoryException)
 {
-    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_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_meta( ::rtl::OUString::createFromAscii(
         "com.sun.star.text.InContentMetadata"));
 
@@ -1440,7 +1444,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
                 "ensureMetadataReference did not"), *this);
     }
     ::rtl::OUString const sXmlId(mdref.First +
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")) + mdref.Second);
+            ::rtl::OUString::createFromAscii("#") + mdref.Second);
     uno::Reference<rdf::XURI> xXmlId;
     try {
         xXmlId.set( rdf::URI::create(m_xContext,
@@ -1504,7 +1508,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     try {
         xXmlId.set( rdf::URI::create(m_xContext,
                 ::rtl::OUString::createFromAscii(s_nsOOo)
-                + mdref.First + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#"))
+                + mdref.First + ::rtl::OUString::createFromAscii("#")
                 + mdref.Second),
             uno::UNO_QUERY_THROW);
     } catch (lang::IllegalArgumentException & iae) {
@@ -1532,7 +1536,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >();
     }
     ::rtl::OUString const sXmlId(mdref.First +
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")) + mdref.Second);
+            ::rtl::OUString::createFromAscii("#") + 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 a800cefc5f52..aa83217797d1 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(RTL_CONSTASCII_USTRINGPARAM("libxml2 error:\n")));
+                OUString::createFromAscii("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(RTL_CONSTASCII_USTRINGPARAM("libxml2 error:\n")));
+                OUString::createFromAscii("libxml2 error:\n"));
             if (error) {
                 buf.append(make_error_message(error));
             } else {
-                buf.append(OUString(RTL_CONSTASCII_USTRINGPARAM("no error argument!")));
+                buf.append(OUString::createFromAscii("no error argument!"));
             }
             OString msg = OUStringToOString(buf.makeStringAndClear(),
                 RTL_TEXTENCODING_ASCII_US);