unoxml/qa/unit/domtest.cxx | 8
unoxml/source/dom/attr.cxx | 2
unoxml/source/dom/attributesmap.cxx | 8
unoxml/source/dom/cdatasection.cxx | 2
unoxml/source/dom/characterdata.cxx | 4
unoxml/source/dom/comment.cxx | 2
unoxml/source/dom/document.cxx | 6
unoxml/source/dom/documentbuilder.cxx | 4
unoxml/source/dom/documentfragment.cxx | 2
unoxml/source/dom/element.cxx | 16 -
unoxml/source/dom/elementlist.cxx | 4
unoxml/source/dom/node.cxx | 12 -
unoxml/source/dom/saxbuilder.cxx | 4
unoxml/source/dom/text.cxx | 2
unoxml/source/rdf/CBlankNode.cxx | 10
unoxml/source/rdf/CLiteral.cxx | 16 -
unoxml/source/rdf/CURI.cxx | 20 -
unoxml/source/rdf/librdf_repository.cxx | 342 ++++++++++++++++----------------
unoxml/source/xpath/xpathapi.cxx | 16 -
19 files changed, 240 insertions(+), 240 deletions(-)
New commits:
commit 98142886f21e40d0f7052f18108d9586f4b2fbc5
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 16 09:28:11 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 16 13:14:09 2024 +0200
loplugin:ostr in unoxml
Change-Id: Iffacc269c97371597188254b44623c011d1cf9db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167729
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index a97248167f60..96ecea6dd593 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -202,7 +202,7 @@ struct BasicTest : public test::BootstrapFixture
test::BootstrapFixture::setUp();
mxErrHandler.set( new ErrorHandler() );
- uno::Reference<XDocumentBuilder> xDB(
getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"),
uno::UNO_QUERY_THROW );
+ uno::Reference<XDocumentBuilder> xDB(
getMultiServiceFactory()->createInstance(u"com.sun.star.xml.dom.DocumentBuilder"_ustr),
uno::UNO_QUERY_THROW );
mxDomBuilder.set( xDB );
mxValidInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(validTestFile), std::size(validTestFile) - 1)) );
mxWarningInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(warningTestFile), std::size(warningTestFile) - 1)) );
@@ -286,7 +286,7 @@ struct SerializerTest : public test::BootstrapFixture
test::BootstrapFixture::setUp();
mxErrHandler.set( new ErrorHandler() );
- uno::Reference<XDocumentBuilder> xDB(
getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"),
uno::UNO_QUERY_THROW );
+ uno::Reference<XDocumentBuilder> xDB(
getMultiServiceFactory()->createInstance(u"com.sun.star.xml.dom.DocumentBuilder"_ustr),
uno::UNO_QUERY_THROW );
mxDomBuilder.set( xDB );
mxInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(validTestFile), std::size(validTestFile) - 1)) );
mxDomBuilder->setErrorHandler(mxErrHandler);
@@ -295,10 +295,10 @@ struct SerializerTest : public test::BootstrapFixture
maRegisteredNamespaces = {
beans::make_Pair(
- OUString( "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ),
+ u"urn:oasis:names:tc:opendocument:xmlns:office:1.0"_ustr,
xml::sax::FastToken::NAMESPACE),
beans::make_Pair(
- OUString( "http://www.w3.org/1999/xlink"; ),
+ u"http://www.w3.org/1999/xlink"_ustr,
2*xml::sax::FastToken::NAMESPACE)
};
}
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index d8d873cdf055..00349c5ae49e 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -195,7 +195,7 @@ namespace DOM
// dispatch DOM events to signal change in attribute value
// dispatch DomAttrModified + DOMSubtreeModified
- OUString sEventName( "DOMAttrModified" );
+ OUString sEventName( u"DOMAttrModified"_ustr );
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent >
event(docevent->createEvent(sEventName),UNO_QUERY);
event->initMutationEvent(
diff --git a/unoxml/source/dom/attributesmap.cxx
b/unoxml/source/dom/attributesmap.cxx
index f629d4cb3f31..ee0308b40255 100644
--- a/unoxml/source/dom/attributesmap.cxx
+++ b/unoxml/source/dom/attributesmap.cxx
@@ -163,7 +163,7 @@ namespace DOM
Reference< XAttr > const xAttr(m_pElement->getAttributeNode(name));
if (!xAttr.is()) {
throw DOMException(
- "CAttributesMap::removeNamedItem: no such attribute",
+ u"CAttributesMap::removeNamedItem: no such attribute"_ustr,
getXWeak(),
DOMExceptionType_NOT_FOUND_ERR);
}
@@ -182,7 +182,7 @@ namespace DOM
m_pElement->getAttributeNodeNS(namespaceURI, localName));
if (!xAttr.is()) {
throw DOMException(
- "CAttributesMap::removeNamedItemNS: no such attribute",
+ u"CAttributesMap::removeNamedItemNS: no such attribute"_ustr,
getXWeak(),
DOMExceptionType_NOT_FOUND_ERR);
}
@@ -198,7 +198,7 @@ namespace DOM
Reference< XAttr > const xAttr(xNode, UNO_QUERY);
if (!xNode.is()) {
throw DOMException(
- "CAttributesMap::setNamedItem: XAttr argument expected",
+ u"CAttributesMap::setNamedItem: XAttr argument expected"_ustr,
getXWeak(),
DOMExceptionType_HIERARCHY_REQUEST_ERR);
}
@@ -215,7 +215,7 @@ namespace DOM
Reference< XAttr > const xAttr(xNode, UNO_QUERY);
if (!xNode.is()) {
throw DOMException(
- "CAttributesMap::setNamedItemNS: XAttr argument expected",
+ u"CAttributesMap::setNamedItemNS: XAttr argument
expected"_ustr,
getXWeak(),
DOMExceptionType_HIERARCHY_REQUEST_ERR);
}
diff --git a/unoxml/source/dom/cdatasection.cxx
b/unoxml/source/dom/cdatasection.cxx
index 47dc773893bc..6cf1af90f478 100644
--- a/unoxml/source/dom/cdatasection.cxx
+++ b/unoxml/source/dom/cdatasection.cxx
@@ -48,7 +48,7 @@ namespace DOM
OUString SAL_CALL CCDATASection::getNodeName()
{
- return "#cdata-section";
+ return u"#cdata-section"_ustr;
}
OUString SAL_CALL CCDATASection::getNodeValue()
diff --git a/unoxml/source/dom/characterdata.cxx
b/unoxml/source/dom/characterdata.cxx
index fc58cc1f134f..9e21aa03846c 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -48,9 +48,9 @@ namespace DOM
{
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- "DOMCharacterDataModified"), UNO_QUERY);
+ u"DOMCharacterDataModified"_ustr), UNO_QUERY);
event->initMutationEvent(
- "DOMCharacterDataModified",
+ u"DOMCharacterDataModified"_ustr,
true, false, Reference< XNode >(),
prevValue, newValue, OUString(), AttrChangeType(0) );
dispatchEvent(event);
diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx
index 30bcb30aa0f4..5485947e5c35 100644
--- a/unoxml/source/dom/comment.cxx
+++ b/unoxml/source/dom/comment.cxx
@@ -44,7 +44,7 @@ namespace DOM
OUString SAL_CALL CComment::getNodeName()
{
- return "#comment";
+ return u"#comment"_ustr;
}
OUString SAL_CALL CComment::getNodeValue()
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 0825fc2cd7ed..6f8f780a9a88 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -868,9 +868,9 @@ namespace DOM
{
Reference< XDocumentEvent > const xDocevent(xDocument, UNO_QUERY);
Reference< XMutationEvent > const event(xDocevent->createEvent(
- "DOMNodeInsertedIntoDocument"), UNO_QUERY_THROW);
+ u"DOMNodeInsertedIntoDocument"_ustr), UNO_QUERY_THROW);
event->initMutationEvent(
- "DOMNodeInsertedIntoDocument", true, false, Reference< XNode
>(),
+ u"DOMNodeInsertedIntoDocument"_ustr, true, false, Reference<
XNode >(),
OUString(), OUString(), OUString(), AttrChangeType(0) );
Reference< XEventTarget > const xDocET(xDocument, UNO_QUERY);
xDocET->dispatchEvent(event);
@@ -912,7 +912,7 @@ namespace DOM
OUString SAL_CALL CDocument::getNodeName()
{
// does not need mutex currently
- return "#document";
+ return u"#document"_ustr;
}
OUString SAL_CALL CDocument::getNodeValue()
diff --git a/unoxml/source/dom/documentbuilder.cxx
b/unoxml/source/dom/documentbuilder.cxx
index 3898d58e4be4..46232463497d 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -97,12 +97,12 @@ namespace DOM
Sequence< OUString > SAL_CALL CDocumentBuilder::getSupportedServiceNames()
{
- return { "com.sun.star.xml.dom.DocumentBuilder" };
+ return { u"com.sun.star.xml.dom.DocumentBuilder"_ustr };
}
OUString SAL_CALL CDocumentBuilder::getImplementationName()
{
- return "com.sun.star.comp.xml.dom.DocumentBuilder";
+ return u"com.sun.star.comp.xml.dom.DocumentBuilder"_ustr;
}
sal_Bool SAL_CALL CDocumentBuilder::supportsService(const OUString&
aServiceName)
diff --git a/unoxml/source/dom/documentfragment.cxx
b/unoxml/source/dom/documentfragment.cxx
index dd3ed3c18f54..363eed94ea63 100644
--- a/unoxml/source/dom/documentfragment.cxx
+++ b/unoxml/source/dom/documentfragment.cxx
@@ -49,7 +49,7 @@ namespace DOM
OUString SAL_CALL CDocumentFragment::getNodeName()
{
- return "#document-fragment";
+ return u"#document-fragment"_ustr;
}
OUString SAL_CALL CDocumentFragment::getNodeValue()
{
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 6f60c8d950d2..69b40dc3ab5c 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -65,7 +65,7 @@ namespace DOM
strlen(reinterpret_cast<const char*>(pPrefix)),
RTL_TEXTENCODING_UTF8);
OUString name = (prefix.isEmpty())
- ? OUString( "xmlns" ) : "xmlns:" + prefix;
+ ? u"xmlns"_ustr : "xmlns:" + prefix;
const xmlChar *pHref = pNs->href;
OUString val(reinterpret_cast<const char*>(pHref),
strlen(reinterpret_cast<const char*>(pHref)),
@@ -191,7 +191,7 @@ namespace DOM
strlen(reinterpret_cast<char
const *>(pPrefix)),
RTL_TEXTENCODING_UTF8 );
- i_rContext.mxCurrentHandler->endUnknownElement( "",
aElementName );
+ i_rContext.mxCurrentHandler->endUnknownElement( u""_ustr,
aElementName );
}
}
catch( Exception& )
@@ -563,8 +563,8 @@ namespace DOM
// dispatch DOMAttrModified event
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- "DOMAttrModified"), UNO_QUERY);
- event->initMutationEvent("DOMAttrModified",
+ u"DOMAttrModified"_ustr), UNO_QUERY);
+ event->initMutationEvent(u"DOMAttrModified"_ustr,
true, false, xAttr,
OUString(), xAttr->getValue(), xAttr->getName(),
AttrChangeType_ADDITION);
@@ -625,8 +625,8 @@ namespace DOM
// dispatch DOMAttrModified event
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- "DOMAttrModified"), UNO_QUERY);
- event->initMutationEvent("DOMAttrModified",
+ u"DOMAttrModified"_ustr), UNO_QUERY);
+ event->initMutationEvent(u"DOMAttrModified"_ustr,
true, false,
getAttributeNode(name),
oldValue, value, name, aChangeType);
@@ -706,9 +706,9 @@ namespace DOM
// dispatch DOMAttrModified event
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- "DOMAttrModified"), UNO_QUERY);
+ u"DOMAttrModified"_ustr), UNO_QUERY);
event->initMutationEvent(
- "DOMAttrModified", true, false,
+ u"DOMAttrModified"_ustr, true, false,
getAttributeNodeNS(namespaceURI, OUString(reinterpret_cast<char
const *>(pLName), strlen(reinterpret_cast<char const *>(pLName)),
RTL_TEXTENCODING_UTF8)),
oldValue, value, qualifiedName, aChangeType);
diff --git a/unoxml/source/dom/elementlist.cxx
b/unoxml/source/dom/elementlist.cxx
index 275b7adb8769..dcea592d8718 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -98,7 +98,7 @@ namespace DOM
assert(xTarget.is());
if (!xTarget.is())
return;
- xTarget->removeEventListener("DOMSubtreeModified",
m_xEventListener, false/*capture*/);
+ xTarget->removeEventListener(u"DOMSubtreeModified"_ustr,
m_xEventListener, false/*capture*/);
}
}
@@ -108,7 +108,7 @@ namespace DOM
Reference< XEventTarget > const xTarget(
static_cast<XElement*>(& rElement), UNO_QUERY_THROW);
m_xEventListener = new WeakEventListener(this);
- xTarget->addEventListener("DOMSubtreeModified", m_xEventListener,
false/*capture*/);
+ xTarget->addEventListener(u"DOMSubtreeModified"_ustr,
m_xEventListener, false/*capture*/);
} catch (const Exception &){
TOOLS_WARN_EXCEPTION( "unoxml", "Exception caught while
registering NodeList as listener");
}
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index 2e3f56c68957..fdfabc5e21ce 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -367,8 +367,8 @@ namespace DOM
pNode->m_bUnlinked = false; // will be deleted by xmlFreeDoc
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- "DOMNodeInserted"), UNO_QUERY);
- event->initMutationEvent("DOMNodeInserted", true, false, this,
+ u"DOMNodeInserted"_ustr), UNO_QUERY);
+ event->initMutationEvent(u"DOMNodeInserted"_ustr, true, false, this,
OUString(), OUString(), OUString(), AttrChangeType(0) );
// the following dispatch functions use only UNO interfaces
@@ -762,8 +762,8 @@ namespace DOM
*/
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- "DOMNodeRemoved"), UNO_QUERY);
- event->initMutationEvent("DOMNodeRemoved",
+ u"DOMNodeRemoved"_ustr), UNO_QUERY);
+ event->initMutationEvent(u"DOMNodeRemoved"_ustr,
true,
false,
this,
@@ -884,9 +884,9 @@ namespace DOM
// target is _this_ node
Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
Reference< XMutationEvent > event(docevent->createEvent(
- "DOMSubtreeModified"), UNO_QUERY);
+ u"DOMSubtreeModified"_ustr), UNO_QUERY);
event->initMutationEvent(
- "DOMSubtreeModified", true,
+ u"DOMSubtreeModified"_ustr, true,
false, Reference< XNode >(),
OUString(), OUString(), OUString(), AttrChangeType(0) );
dispatchEvent(event);
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 61b7a496a5a3..2ab050820ee0 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -39,12 +39,12 @@ namespace DOM
Sequence< OUString > SAL_CALL
CSAXDocumentBuilder::getSupportedServiceNames()
{
- return { "com.sun.star.xml.dom.SAXDocumentBuilder" };
+ return { u"com.sun.star.xml.dom.SAXDocumentBuilder"_ustr };
}
OUString SAL_CALL CSAXDocumentBuilder::getImplementationName()
{
- return "com.sun.star.comp.xml.dom.SAXDocumentBuilder";
+ return u"com.sun.star.comp.xml.dom.SAXDocumentBuilder"_ustr;
}
sal_Bool SAL_CALL CSAXDocumentBuilder::supportsService(const OUString&
aServiceName)
diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx
index 08db01ba32c4..0eee36725af8 100644
--- a/unoxml/source/dom/text.cxx
+++ b/unoxml/source/dom/text.cxx
@@ -60,7 +60,7 @@ namespace DOM
OUString SAL_CALL CText::getNodeName()
{
- return "#text";
+ return u"#text"_ustr;
}
Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/)
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 6e0140cc90fa..965d837c2f60 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -63,7 +63,7 @@ CBlankNode::CBlankNode()
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL CBlankNode::getImplementationName()
{
- return "CBlankNode";
+ return u"CBlankNode"_ustr;
}
sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName)
@@ -73,7 +73,7 @@ sal_Bool SAL_CALL CBlankNode::supportsService(OUString const
& serviceName)
css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames()
{
- return { "com.sun.star.rdf.BlankNode" };
+ return { u"com.sun.star.rdf.BlankNode"_ustr };
}
// css::lang::XInitialization:
@@ -81,19 +81,19 @@ void SAL_CALL CBlankNode::initialize(const
css::uno::Sequence< css::uno::Any > &
{
if (aArguments.getLength() != 1) {
throw css::lang::IllegalArgumentException(
- "CBlankNode::initialize: must give exactly 1 argument", *this, 1);
+ u"CBlankNode::initialize: must give exactly 1 argument"_ustr,
*this, 1);
}
OUString arg;
if (!(aArguments[0] >>= arg)) {
throw css::lang::IllegalArgumentException(
- "CBlankNode::initialize: argument must be string", *this, 0);
+ u"CBlankNode::initialize: argument must be string"_ustr, *this, 0);
}
//FIXME: what is legal?
if (arg.isEmpty()) {
throw css::lang::IllegalArgumentException(
- "CBlankNode::initialize: argument is not valid blank node ID",
*this, 0);
+ u"CBlankNode::initialize: argument is not valid blank node
ID"_ustr, *this, 0);
}
m_NodeID = arg;
}
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index b1c756883e5e..bab788093f76 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -70,7 +70,7 @@ CLiteral::CLiteral()
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL CLiteral::getImplementationName()
{
- return "CLiteral";
+ return u"CLiteral"_ustr;
}
sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName)
@@ -80,7 +80,7 @@ sal_Bool SAL_CALL CLiteral::supportsService(OUString const &
serviceName)
css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames()
{
- return { "com.sun.star.rdf.Literal" };
+ return { u"com.sun.star.rdf.Literal"_ustr };
}
// css::lang::XInitialization:
@@ -89,18 +89,18 @@ void SAL_CALL CLiteral::initialize(const
css::uno::Sequence< css::uno::Any > & a
const sal_Int32 len( aArguments.getLength() );
if (len < 1 || len > 2) {
throw css::lang::IllegalArgumentException(
- "CLiteral::initialize: must give 1 or 2 argument(s)", *this,
2);
+ u"CLiteral::initialize: must give 1 or 2 argument(s)"_ustr,
*this, 2);
}
OUString arg0;
if (!(aArguments[0] >>= arg0)) {
throw css::lang::IllegalArgumentException(
- "CLiteral::initialize: argument must be string", *this, 0);
+ u"CLiteral::initialize: argument must be string"_ustr, *this, 0);
}
//FIXME: what is legal?
if (!(true)) {
throw css::lang::IllegalArgumentException(
- "CLiteral::initialize: argument is not valid literal value",
*this, 0);
+ u"CLiteral::initialize: argument is not valid literal value"_ustr,
*this, 0);
}
m_Value = arg0;
@@ -112,18 +112,18 @@ void SAL_CALL CLiteral::initialize(const
css::uno::Sequence< css::uno::Any > & a
if (aArguments[1] >>= arg1) {
if (arg1.isEmpty()) {
throw css::lang::IllegalArgumentException(
- "CLiteral::initialize: argument is not valid language", *this,
1);
+ u"CLiteral::initialize: argument is not valid language"_ustr,
*this, 1);
}
m_Language = arg1;
} else if (aArguments[1] >>= xURI) {
if (!xURI.is()) {
throw css::lang::IllegalArgumentException(
- "CLiteral::initialize: argument is null", *this, 1);
+ u"CLiteral::initialize: argument is null"_ustr, *this, 1);
}
m_xDatatype = xURI;
} else {
throw css::lang::IllegalArgumentException(
- "CLiteral::initialize: argument must be string or URI", *this, 1);
+ u"CLiteral::initialize: argument must be string or URI"_ustr,
*this, 1);
}
}
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index 5a8575b6e738..8554a9a9fd5a 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -72,7 +72,7 @@ CURI::CURI()
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL CURI::getImplementationName()
{
- return "CURI";
+ return u"CURI"_ustr;
}
sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName)
@@ -82,7 +82,7 @@ sal_Bool SAL_CALL CURI::supportsService(OUString const &
serviceName)
css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames()
{
- return { "com.sun.star.rdf.URI" };
+ return { u"com.sun.star.rdf.URI"_ustr };
}
constexpr OUString s_nsXSD =
u"http://www.w3.org/2001/XMLSchema-datatypes#"_ustr;
@@ -703,7 +703,7 @@ void CURI::initFromConstant(const sal_Int16 i_Constant)
default:
throw css::lang::IllegalArgumentException(
- "CURI::initialize: invalid URIs constant argument", *this, 0);
+ u"CURI::initialize: invalid URIs constant argument"_ustr,
*this, 0);
}
m_Namespace = ns;
m_LocalName = ln;
@@ -715,7 +715,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence<
css::uno::Any > & aArgu
sal_Int32 len = aArguments.getLength();
if ((len < 1) || (len > 2)) {
throw css::lang::IllegalArgumentException(
- "CURI::initialize: must give 1 or 2 argument(s)", *this, 2);
+ u"CURI::initialize: must give 1 or 2 argument(s)"_ustr, *this, 2);
}
sal_Int16 arg(0);
@@ -725,19 +725,19 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence<
css::uno::Any > & aArgu
// integer argument: constant from rdf::URIs
if (len != 1) {
throw css::lang::IllegalArgumentException(
- "CURI::initialize: must give 1 int argument", *this, 1);
+ u"CURI::initialize: must give 1 int argument"_ustr, *this, 1);
}
initFromConstant(arg);
return;
}
if (!(aArguments[0] >>= arg0)) {
throw css::lang::IllegalArgumentException(
- "CURI::initialize: argument must be string or short", *this, 0);
+ u"CURI::initialize: argument must be string or short"_ustr, *this,
0);
}
if (len > 1) {
if (!(aArguments[1] >>= arg1)) {
throw css::lang::IllegalArgumentException(
- "CURI::initialize: argument must be string", *this, 1);
+ u"CURI::initialize: argument must be string"_ustr, *this, 1);
}
// just append the parameters and then split them again; seems simplest
arg0 = arg0 + arg1;
@@ -753,7 +753,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence<
css::uno::Any > & aArgu
if (idx < 0)
{
throw css::lang::IllegalArgumentException(
- "CURI::initialize: argument not splittable: no separator [#/:]",
*this, 0);
+ u"CURI::initialize: argument not splittable: no separator
[#/:]"_ustr, *this, 0);
}
if (idx < arg0.getLength() - 1) {
arg1 = arg0.copy(idx+1);
@@ -763,14 +763,14 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence<
css::uno::Any > & aArgu
//FIXME: what is legal?
if (arg0.isEmpty()) {
throw css::lang::IllegalArgumentException(
- "CURI::initialize: argument is not valid namespace", *this, 0);
+ u"CURI::initialize: argument is not valid namespace"_ustr, *this,
0);
}
m_Namespace = arg0;
//FIXME: what is legal?
if ((false)) {
throw css::lang::IllegalArgumentException(
- "CURI::initialize: argument is not valid local name", *this, 1);
+ u"CURI::initialize: argument is not valid local name"_ustr, *this,
1);
}
m_LocalName = arg1;
}
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index ccf4d87ffedd..af7cab516474 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -510,11 +510,11 @@ librdf_GraphResult::nextElement()
librdf_statement *pStmt( librdf_stream_get_object(m_pStream.get()) );
if (!pStmt) {
rdf::QueryException e(
- "librdf_GraphResult::nextElement: "
- "librdf_stream_get_object failed", *this);
+ u"librdf_GraphResult::nextElement: "
+ "librdf_stream_get_object failed"_ustr, *this);
throw lang::WrappedTargetException(
- "librdf_GraphResult::nextElement: "
- "librdf_stream_get_object failed", *this,
+ u"librdf_GraphResult::nextElement: "
+ "librdf_stream_get_object failed"_ustr, *this,
uno::Any(e));
}
// NB: pCtxt may be null here if this is result of a graph query
@@ -662,11 +662,11 @@ librdf_QuerySelectResult::nextElement()
aNodes.data()))
{
rdf::QueryException e(
- "librdf_QuerySelectResult::nextElement: "
- "librdf_query_results_get_bindings failed", *this);
+ u"librdf_QuerySelectResult::nextElement: "
+ "librdf_query_results_get_bindings failed"_ustr, *this);
throw lang::WrappedTargetException(
- "librdf_QuerySelectResult::nextElement: "
- "librdf_query_results_get_bindings failed", *this,
+ u"librdf_QuerySelectResult::nextElement: "
+ "librdf_query_results_get_bindings failed"_ustr, *this,
uno::Any(e));
}
uno::Sequence< uno::Reference< rdf::XNode > > ret(count);
@@ -774,7 +774,7 @@ void SAL_CALL librdf_NamedGraph::clear()
uno::Reference< rdf::XRepository > xRep( m_wRep );
if (!xRep.is()) {
throw rdf::RepositoryException(
- "librdf_NamedGraph::clear: repository is gone", *this);
+ u"librdf_NamedGraph::clear: repository is gone"_ustr, *this);
}
const OUString contextU( m_xName->getStringValue() );
try {
@@ -796,7 +796,7 @@ void SAL_CALL librdf_NamedGraph::addStatement(
uno::Reference< rdf::XRepository > xRep( m_wRep );
if (!xRep.is()) {
throw rdf::RepositoryException(
- "librdf_NamedGraph::addStatement: repository is gone", *this);
+ u"librdf_NamedGraph::addStatement: repository is gone"_ustr,
*this);
}
{
std::unique_lock g(m_CacheMutex);
@@ -814,7 +814,7 @@ void SAL_CALL librdf_NamedGraph::removeStatements(
uno::Reference< rdf::XRepository > xRep( m_wRep );
if (!xRep.is()) {
throw rdf::RepositoryException(
- "librdf_NamedGraph::removeStatements: repository is gone", *this);
+ u"librdf_NamedGraph::removeStatements: repository is gone"_ustr,
*this);
}
{
std::unique_lock g(m_CacheMutex);
@@ -856,7 +856,7 @@ librdf_NamedGraph::getStatements(
uno::Reference< rdf::XRepository > xRep( m_wRep );
if (!xRep.is()) {
throw rdf::RepositoryException(
- "librdf_NamedGraph::getStatements: repository is gone", *this);
+ u"librdf_NamedGraph::getStatements: repository is gone"_ustr,
*this);
}
std::vector<rdf::Statement> vStatements =
m_pRep->getStatementsGraph_NoLock(
i_xSubject, i_xPredicate, i_xObject, m_xName);
@@ -911,7 +911,7 @@ librdf_Repository::~librdf_Repository()
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL librdf_Repository::getImplementationName()
{
- return "librdf_Repository";
+ return u"librdf_Repository"_ustr;
}
sal_Bool SAL_CALL librdf_Repository::supportsService(
@@ -923,7 +923,7 @@ sal_Bool SAL_CALL librdf_Repository::supportsService(
uno::Sequence< OUString > SAL_CALL
librdf_Repository::getSupportedServiceNames()
{
- return { "com.sun.star.rdf.Repository" };
+ return { u"com.sun.star.rdf.Repository"_ustr };
}
// css::rdf::XRepository:
@@ -935,14 +935,14 @@ uno::Reference< rdf::XBlankNode > SAL_CALL
librdf_Repository::createBlankNode()
safe_librdf_free_node);
if (!pNode) {
throw uno::RuntimeException(
- "librdf_Repository::createBlankNode: "
- "librdf_new_node_from_blank_identifier failed", *this);
+ u"librdf_Repository::createBlankNode: "
+ "librdf_new_node_from_blank_identifier failed"_ustr, *this);
}
const unsigned char * id (librdf_node_get_blank_identifier(pNode.get()));
if (!id) {
throw uno::RuntimeException(
- "librdf_Repository::createBlankNode: "
- "librdf_node_get_blank_identifier failed", *this);
+ u"librdf_Repository::createBlankNode: "
+ "librdf_node_get_blank_identifier failed"_ustr, *this);
}
const OUString nodeID(OUString::createFromAscii(
reinterpret_cast<const char *>(id)));
@@ -951,8 +951,8 @@ uno::Reference< rdf::XBlankNode > SAL_CALL
librdf_Repository::createBlankNode()
} catch (const lang::IllegalArgumentException &) {
css::uno::Any anyEx = cppu::getCaughtException();
throw lang::WrappedTargetRuntimeException(
- "librdf_Repository::createBlankNode: "
- "illegal blank node label", *this, anyEx);
+ u"librdf_Repository::createBlankNode: "
+ "illegal blank node label"_ustr, *this, anyEx);
}
}
@@ -965,31 +965,31 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
{
if (!i_xInStream.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::importGraph: stream is null", *this, 1);
+ u"librdf_Repository::importGraph: stream is null"_ustr, *this, 1);
}
//FIXME: other formats
if (i_Format != rdf::FileFormat::RDF_XML) {
throw datatransfer::UnsupportedFlavorException(
- "librdf_Repository::importGraph: file format not supported",
*this);
+ u"librdf_Repository::importGraph: file format not
supported"_ustr, *this);
}
if (!i_xGraphName.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::importGraph: graph name is null", *this,
2);
+ u"librdf_Repository::importGraph: graph name is null"_ustr,
*this, 2);
}
if (i_xGraphName->getStringValue().startsWith(s_nsOOo))
{
throw lang::IllegalArgumentException(
- "librdf_Repository::importGraph: URI is reserved", *this, 0);
+ u"librdf_Repository::importGraph: URI is reserved"_ustr,
*this, 0);
}
if (!i_xBaseURI.is()) { //FIXME: any i_Format that don't need a base URI?
throw lang::IllegalArgumentException(
- "librdf_Repository::importGraph: base URI is null", *this, 3);
+ u"librdf_Repository::importGraph: base URI is null"_ustr,
*this, 3);
}
OSL_ENSURE(i_xBaseURI.is(), "no base uri");
const OUString baseURIU( i_xBaseURI->getStringValue() );
if (baseURIU.indexOf('#') >= 0) {
throw lang::IllegalArgumentException(
- "librdf_Repository::importGraph: base URI is not absolute",
*this, 3);
+ u"librdf_Repository::importGraph: base URI is not
absolute"_ustr, *this, 3);
}
const OUString contextU( i_xGraphName->getStringValue() );
@@ -1005,7 +1005,7 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) {
throw container::ElementExistException(
- "librdf_Repository::importGraph: graph with given URI exists",
*this);
+ u"librdf_Repository::importGraph: graph with given URI
exists"_ustr, *this);
}
const OString context(
OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1016,7 +1016,7 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
safe_librdf_free_node);
if (!pContext) {
throw uno::RuntimeException(
- "librdf_Repository::importGraph: librdf_new_node_from_uri_string
failed", *this);
+ u"librdf_Repository::importGraph: librdf_new_node_from_uri_string
failed"_ustr, *this);
}
const OString baseURI(
@@ -1026,7 +1026,7 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
reinterpret_cast<const unsigned char*> (baseURI.getStr())),
safe_librdf_free_uri);
if (!pBaseURI) {
- throw uno::RuntimeException( "librdf_Repository::importGraph:
librdf_new_uri failed", *this);
+ throw uno::RuntimeException( u"librdf_Repository::importGraph:
librdf_new_uri failed"_ustr, *this);
}
const std::shared_ptr<librdf_parser> pParser(
@@ -1034,8 +1034,8 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
safe_librdf_free_parser);
if (!pParser) {
throw uno::RuntimeException(
- "librdf_Repository::importGraph: "
- "librdf_new_parser failed", *this);
+ u"librdf_Repository::importGraph: "
+ "librdf_new_parser failed"_ustr, *this);
}
const std::shared_ptr<librdf_stream> pStream(
@@ -1045,8 +1045,8 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
safe_librdf_free_stream);
if (!pStream) {
throw rdf::ParseException(
- "librdf_Repository::importGraph: "
- "librdf_parser_parse_counted_string_as_stream failed", *this);
+ u"librdf_Repository::importGraph: "
+ "librdf_parser_parse_counted_string_as_stream failed"_ustr, *this);
}
rtl::Reference<librdf_NamedGraph> const pGraph(
new librdf_NamedGraph(this, i_xGraphName));
@@ -1054,8 +1054,8 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
if (librdf_model_context_add_statements(m_pModel.get(),
pContext.get(), pStream.get())) {
throw rdf::RepositoryException(
- "librdf_Repository::importGraph: "
- "librdf_model_context_add_statements failed", *this);
+ u"librdf_Repository::importGraph: "
+ "librdf_model_context_add_statements failed"_ustr, *this);
}
return pGraph;
@@ -1116,30 +1116,30 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
{
if (!i_xOutStream.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::exportGraph: stream is null", *this, 1);
+ u"librdf_Repository::exportGraph: stream is null"_ustr, *this,
1);
}
// FIXME: other formats
if (i_Format != rdf::FileFormat::RDF_XML) {
throw datatransfer::UnsupportedFlavorException(
- "librdf_Repository::exportGraph: "
- "file format not supported", *this);
+ u"librdf_Repository::exportGraph: "
+ "file format not supported"_ustr, *this);
}
if (!i_xGraphName.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::exportGraph: "
- "graph name is null", *this, 2);
+ u"librdf_Repository::exportGraph: "
+ "graph name is null"_ustr, *this, 2);
}
if (!i_xBaseURI.is()) { //FIXME: any i_Format that don't need a base URI?
throw lang::IllegalArgumentException(
- "librdf_Repository::exportGraph: "
- "base URI is null", *this, 3);
+ u"librdf_Repository::exportGraph: "
+ "base URI is null"_ustr, *this, 3);
}
OSL_ENSURE(i_xBaseURI.is(), "no base uri");
const OUString baseURIU( i_xBaseURI->getStringValue() );
if (baseURIU.indexOf('#') >= 0) {
throw lang::IllegalArgumentException(
- "librdf_Repository::exportGraph: "
- "base URI is not absolute", *this, 3);
+ u"librdf_Repository::exportGraph: "
+ "base URI is not absolute"_ustr, *this, 3);
}
const OUString contextU( i_xGraphName->getStringValue() );
@@ -1148,8 +1148,8 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) {
throw container::NoSuchElementException(
- "librdf_Repository::exportGraph: "
- "no graph with given URI exists", *this);
+ u"librdf_Repository::exportGraph: "
+ "no graph with given URI exists"_ustr, *this);
}
const OString context(
OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1160,8 +1160,8 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
safe_librdf_free_node);
if (!pContext) {
throw uno::RuntimeException(
- "librdf_Repository::exportGraph: "
- "librdf_new_node_from_uri_string failed", *this);
+ u"librdf_Repository::exportGraph: "
+ "librdf_new_node_from_uri_string failed"_ustr, *this);
}
const OString baseURI(
OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) );
@@ -1171,8 +1171,8 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
safe_librdf_free_uri);
if (!pBaseURI) {
throw uno::RuntimeException(
- "librdf_Repository::exportGraph: "
- "librdf_new_uri failed", *this);
+ u"librdf_Repository::exportGraph: "
+ "librdf_new_uri failed"_ustr, *this);
}
const std::shared_ptr<librdf_stream> pStream(
@@ -1180,8 +1180,8 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
safe_librdf_free_stream);
if (!pStream) {
throw rdf::RepositoryException(
- "librdf_Repository::exportGraph: "
- "librdf_model_context_as_stream failed", *this);
+ u"librdf_Repository::exportGraph: "
+ "librdf_model_context_as_stream failed"_ustr, *this);
}
const char * const format("rdfxml");
// #i116443#: abbrev breaks when certain URIs are used as data types
@@ -1191,8 +1191,8 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
safe_librdf_free_serializer);
if (!pSerializer) {
throw uno::RuntimeException(
- "librdf_Repository::exportGraph: "
- "librdf_new_serializer failed", *this);
+ u"librdf_Repository::exportGraph: "
+ "librdf_new_serializer failed"_ustr, *this);
}
const std::shared_ptr<librdf_uri> pRelativeURI(
@@ -1213,8 +1213,8 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
safe_librdf_free_node);
if (!pWriteBaseURI || !pRelativeURI || !p0 || !p1) {
throw uno::RuntimeException(
- "librdf_Repository::exportGraph: "
- "librdf_new_uri or librdf_new_node_from_literal failed", *this);
+ u"librdf_Repository::exportGraph: "
+ "librdf_new_uri or librdf_new_node_from_literal failed"_ustr,
*this);
}
// make URIs relative to base URI
@@ -1222,16 +1222,16 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
pRelativeURI.get(), p1.get()))
{
throw uno::RuntimeException(
- "librdf_Repository::exportGraph: "
- "librdf_serializer_set_feature relativeURIs failed", *this);
+ u"librdf_Repository::exportGraph: "
+ "librdf_serializer_set_feature relativeURIs failed"_ustr, *this);
}
// but do not write the base URI to the file!
if (librdf_serializer_set_feature(pSerializer.get(),
pWriteBaseURI.get(), p0.get()))
{
throw uno::RuntimeException(
- "librdf_Repository::exportGraph: "
- "librdf_serializer_set_feature writeBaseURI failed", *this);
+ u"librdf_Repository::exportGraph: "
+ "librdf_serializer_set_feature writeBaseURI failed"_ustr, *this);
}
size_t length;
@@ -1240,8 +1240,8 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
pSerializer.get(), pBaseURI.get(), pStream.get(), &length), free);
if (!pBuf) {
throw rdf::RepositoryException(
- "librdf_Repository::exportGraph: "
- "librdf_serializer_serialize_stream_to_counted_string failed",
+ u"librdf_Repository::exportGraph: "
+ "librdf_serializer_serialize_stream_to_counted_string failed"_ustr,
*this);
}
@@ -1267,7 +1267,7 @@ librdf_Repository::getGraph(const uno::Reference<
rdf::XURI > & i_xGraphName)
{
if (!i_xGraphName.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::getGraph: URI is null", *this, 0);
+ u"librdf_Repository::getGraph: URI is null"_ustr, *this, 0);
}
const OUString contextU( i_xGraphName->getStringValue() );
@@ -1285,14 +1285,14 @@ librdf_Repository::createGraph(const uno::Reference<
rdf::XURI > & i_xGraphName)
{
if (!i_xGraphName.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::createGraph: URI is null", *this, 0);
+ u"librdf_Repository::createGraph: URI is null"_ustr, *this, 0);
}
const OUString contextU( i_xGraphName->getStringValue() );
if (contextU.startsWith(s_nsOOo))
{
throw lang::IllegalArgumentException(
- "librdf_Repository::createGraph: URI is reserved", *this, 0);
+ u"librdf_Repository::createGraph: URI is reserved"_ustr,
*this, 0);
}
std::scoped_lock g(m_aMutex); // don't call i_x* with mutex locked
@@ -1303,7 +1303,7 @@ librdf_Repository::createGraph(const uno::Reference<
rdf::XURI > & i_xGraphName)
if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) {
throw container::ElementExistException(
- "librdf_Repository::createGraph: graph with given URI exists",
*this);
+ u"librdf_Repository::createGraph: graph with given URI
exists"_ustr, *this);
}
m_NamedGraphs.insert(std::make_pair(contextU,
new librdf_NamedGraph(this, i_xGraphName)));
@@ -1316,7 +1316,7 @@ librdf_Repository::destroyGraph(
{
if (!i_xGraphName.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::destroyGraph: URI is null", *this, 0);
+ u"librdf_Repository::destroyGraph: URI is null"_ustr, *this,
0);
}
const OUString contextU( i_xGraphName->getStringValue() );
@@ -1364,8 +1364,8 @@ librdf_Repository::getStatements(
safe_librdf_free_stream);
if (!pStream) {
throw rdf::RepositoryException(
- "librdf_Repository::getStatements: "
- "librdf_model_find_statements failed", *this);
+ u"librdf_Repository::getStatements: "
+ "librdf_model_find_statements failed"_ustr, *this);
}
return new librdf_GraphResult(this, m_aMutex, pStream,
@@ -1385,23 +1385,23 @@ librdf_Repository::querySelect(const OUString &
i_rQuery)
safe_librdf_free_query);
if (!pQuery) {
throw rdf::QueryException(
- "librdf_Repository::querySelect: "
- "librdf_new_query failed", *this);
+ u"librdf_Repository::querySelect: "
+ "librdf_new_query failed"_ustr, *this);
}
const std::shared_ptr<librdf_query_results> pResults(
librdf_model_query_execute(m_pModel.get(), pQuery.get()),
safe_librdf_free_query_results);
if (!pResults || !librdf_query_results_is_bindings(pResults.get())) {
throw rdf::QueryException(
- "librdf_Repository::querySelect: "
- "query result is null or not bindings", *this);
+ u"librdf_Repository::querySelect: "
+ "query result is null or not bindings"_ustr, *this);
}
const int count( librdf_query_results_get_bindings_count(pResults.get()) );
if (count < 0) {
throw rdf::QueryException(
- "librdf_Repository::querySelect: "
- "librdf_query_results_get_bindings_count failed", *this);
+ u"librdf_Repository::querySelect: "
+ "librdf_query_results_get_bindings_count failed"_ustr, *this);
}
uno::Sequence< OUString > names(count);
auto namesRange = asNonConstRange(names);
@@ -1410,7 +1410,7 @@ librdf_Repository::querySelect(const OUString & i_rQuery)
pResults.get(), i) );
if (!name) {
throw rdf::QueryException(
- "librdf_Repository::querySelect: binding is null", *this);
+ u"librdf_Repository::querySelect: binding is null"_ustr,
*this);
}
namesRange[i] = OUString::createFromAscii(name);
@@ -1432,24 +1432,24 @@ librdf_Repository::queryConstruct(const OUString &
i_rQuery)
safe_librdf_free_query);
if (!pQuery) {
throw rdf::QueryException(
- "librdf_Repository::queryConstruct: "
- "librdf_new_query failed", *this);
+ u"librdf_Repository::queryConstruct: "
+ "librdf_new_query failed"_ustr, *this);
}
const std::shared_ptr<librdf_query_results> pResults(
librdf_model_query_execute(m_pModel.get(), pQuery.get()),
safe_librdf_free_query_results);
if (!pResults || !librdf_query_results_is_graph(pResults.get())) {
throw rdf::QueryException(
- "librdf_Repository::queryConstruct: "
- "query result is null or not graph", *this);
+ u"librdf_Repository::queryConstruct: "
+ "query result is null or not graph"_ustr, *this);
}
const std::shared_ptr<librdf_stream> pStream(
librdf_query_results_as_stream(pResults.get()),
safe_librdf_free_stream);
if (!pStream) {
throw rdf::QueryException(
- "librdf_Repository::queryConstruct: "
- "librdf_query_results_as_stream failed", *this);
+ u"librdf_Repository::queryConstruct: "
+ "librdf_query_results_as_stream failed"_ustr, *this);
}
return new librdf_GraphResult(this, m_aMutex, pStream,
@@ -1469,16 +1469,16 @@ librdf_Repository::queryAsk(const OUString & i_rQuery)
safe_librdf_free_query);
if (!pQuery) {
throw rdf::QueryException(
- "librdf_Repository::queryAsk: "
- "librdf_new_query failed", *this);
+ u"librdf_Repository::queryAsk: "
+ "librdf_new_query failed"_ustr, *this);
}
const std::shared_ptr<librdf_query_results> pResults(
librdf_model_query_execute(m_pModel.get(), pQuery.get()),
safe_librdf_free_query_results);
if (!pResults || !librdf_query_results_is_boolean(pResults.get())) {
throw rdf::QueryException(
- "librdf_Repository::queryAsk: "
- "query result is null or not boolean", *this);
+ u"librdf_Repository::queryAsk: "
+ "query result is null or not boolean"_ustr, *this);
}
return bool(librdf_query_results_get_boolean(pResults.get()));
}
@@ -1493,33 +1493,33 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
{
if (!i_xSubject.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::setStatementRDFa: Subject is null", *this, 0);
+ u"librdf_Repository::setStatementRDFa: Subject is null"_ustr,
*this, 0);
}
if (!i_rPredicates.hasElements()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::setStatementRDFa: no Predicates",
+ u"librdf_Repository::setStatementRDFa: no Predicates"_ustr,
*this, 1);
}
if (std::any_of(i_rPredicates.begin(), i_rPredicates.end(),
[](const uno::Reference< rdf::XURI >& rPredicate) { return
!rPredicate.is(); })) {
throw lang::IllegalArgumentException(
- "librdf_Repository::setStatementRDFa: Predicate is null", *this,
1);
+ u"librdf_Repository::setStatementRDFa: Predicate is null"_ustr,
*this, 1);
}
if (!i_xObject.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::setStatementRDFa: Object is null", *this, 2);
+ u"librdf_Repository::setStatementRDFa: Object is null"_ustr,
*this, 2);
}
const uno::Reference<lang::XServiceInfo> xService(i_xObject,
uno::UNO_QUERY_THROW);
uno::Reference<text::XTextRange> xTextRange;
- if (xService->supportsService("com.sun.star.table.Cell") ||
- xService->supportsService("com.sun.star.text.CellProperties") || //
for writer
- xService->supportsService("com.sun.star.text.Paragraph"))
+ if (xService->supportsService(u"com.sun.star.table.Cell"_ustr) ||
+ xService->supportsService(u"com.sun.star.text.CellProperties"_ustr) ||
// for writer
+ xService->supportsService(u"com.sun.star.text.Paragraph"_ustr))
{
xTextRange.set(i_xObject, uno::UNO_QUERY_THROW);
}
- else if (xService->supportsService("com.sun.star.text.Bookmark") ||
- xService->supportsService("com.sun.star.text.InContentMetadata"))
+ else if (xService->supportsService(u"com.sun.star.text.Bookmark"_ustr) ||
+
xService->supportsService(u"com.sun.star.text.InContentMetadata"_ustr))
{
const uno::Reference<text::XTextContent> xTextContent(i_xObject,
uno::UNO_QUERY_THROW);
@@ -1527,16 +1527,16 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
}
if (!xTextRange.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::setStatementRDFa: "
- "Object does not support RDFa", *this, 2);
+ u"librdf_Repository::setStatementRDFa: "
+ "Object does not support RDFa"_ustr, *this, 2);
}
// ensure that the metadatable has an XML ID
i_xObject->ensureMetadataReference();
const beans::StringPair mdref( i_xObject->getMetadataReference() );
if ((mdref.First.isEmpty()) || (mdref.Second.isEmpty())) {
throw uno::RuntimeException(
- "librdf_Repository::setStatementRDFa: "
- "ensureMetadataReference did not", *this);
+ u"librdf_Repository::setStatementRDFa: "
+ "ensureMetadataReference did not"_ustr, *this);
}
OUString const sXmlId(mdref.First + "#" + mdref.Second);
OUString const sContext(s_nsOOo + sXmlId);
@@ -1556,8 +1556,8 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
} catch (const lang::IllegalArgumentException &) {
css::uno::Any anyEx = cppu::getCaughtException();
throw lang::WrappedTargetRuntimeException(
- "librdf_Repository::setStatementRDFa: "
- "cannot create literal", *this, anyEx);
+ u"librdf_Repository::setStatementRDFa: "
+ "cannot create literal"_ustr, *this, anyEx);
}
std::shared_ptr<librdf_TypeConverter::Resource> const pSubject(
@@ -1595,8 +1595,8 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
{
css::uno::Any anyEx = cppu::getCaughtException();
throw lang::WrappedTargetRuntimeException(
- "librdf_Repository::setStatementRDFa: "
- "cannot addStatementGraph", *this, anyEx);
+ u"librdf_Repository::setStatementRDFa: "
+ "cannot addStatementGraph"_ustr, *this, anyEx);
}
}
@@ -1605,7 +1605,7 @@ void SAL_CALL librdf_Repository::removeStatementRDFa(
{
if (!i_xElement.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::removeStatementRDFa: Element is null",
+ u"librdf_Repository::removeStatementRDFa: Element is null"_ustr,
*this, 0);
}
@@ -1625,7 +1625,7 @@ librdf_Repository::getStatementRDFa(
{
if (!i_xElement.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::getStatementRDFa: Element is null", *this, 0);
+ u"librdf_Repository::getStatementRDFa: Element is null"_ustr,
*this, 0);
}
const beans::StringPair mdref( i_xElement->getMetadataReference() );
if ((mdref.First.isEmpty()) || (mdref.Second.isEmpty())) {
@@ -1639,8 +1639,8 @@ librdf_Repository::getStatementRDFa(
} catch (const lang::IllegalArgumentException &) {
css::uno::Any anyEx = cppu::getCaughtException();
throw lang::WrappedTargetRuntimeException(
- "librdf_Repository::getStatementRDFa: "
- "cannot create URI for XML ID", *this, anyEx);
+ u"librdf_Repository::getStatementRDFa: "
+ "cannot create URI for XML ID"_ustr, *this, anyEx);
}
::std::vector< rdf::Statement > ret;
@@ -1652,8 +1652,8 @@ librdf_Repository::getStatementRDFa(
{
css::uno::Any anyEx = cppu::getCaughtException();
throw lang::WrappedTargetRuntimeException(
- "librdf_Repository::getStatementRDFa: "
- "cannot getStatementsGraph", *this, anyEx);
+ u"librdf_Repository::getStatementRDFa: "
+ "cannot getStatementsGraph"_ustr, *this, anyEx);
}
std::scoped_lock g(m_aMutex); // don't call i_x* with mutex locked
@@ -1713,15 +1713,15 @@ librdf_Repository::getStatementsRDFa(
safe_librdf_free_stream);
if (!pStream) {
throw rdf::RepositoryException(
- "librdf_Repository::getStatementsRDFa: "
- "librdf_model_find_statements failed", *this);
+ u"librdf_Repository::getStatementsRDFa: "
+ "librdf_model_find_statements failed"_ustr, *this);
}
if (librdf_stream_add_map(pStream.get(), rdfa_context_stream_map_handler,
nullptr, nullptr)) {
throw rdf::RepositoryException(
- "librdf_Repository::getStatementsRDFa: "
- "librdf_stream_add_map failed", *this);
+ u"librdf_Repository::getStatementsRDFa: "
+ "librdf_stream_add_map failed"_ustr, *this);
}
return new librdf_GraphResult(this, m_aMutex, pStream,
@@ -1758,8 +1758,8 @@ NamedGraphMap_t::iterator
librdf_Repository::clearGraph_Lock(
const NamedGraphMap_t::iterator iter( m_NamedGraphs.find(i_rGraphName) );
if (!i_Internal && iter == m_NamedGraphs.end()) {
throw container::NoSuchElementException(
- "librdf_Repository::clearGraph: "
- "no graph with given URI exists", *this);
+ u"librdf_Repository::clearGraph: "
+ "no graph with given URI exists"_ustr, *this);
}
const OString context(
OUStringToOString(i_rGraphName, RTL_TEXTENCODING_UTF8) );
@@ -1770,14 +1770,14 @@ NamedGraphMap_t::iterator
librdf_Repository::clearGraph_Lock(
safe_librdf_free_node);
if (!pContext) {
throw uno::RuntimeException(
- "librdf_Repository::clearGraph: "
- "librdf_new_node_from_uri_string failed", *this);
+ u"librdf_Repository::clearGraph: "
+ "librdf_new_node_from_uri_string failed"_ustr, *this);
}
if (librdf_model_context_remove_statements(m_pModel.get(), pContext.get()))
{
throw rdf::RepositoryException(
- "librdf_Repository::clearGraph: "
- "librdf_model_context_remove_statements failed", *this);
+ u"librdf_Repository::clearGraph: "
+ "librdf_model_context_remove_statements failed"_ustr, *this);
}
return iter;
}
@@ -1792,16 +1792,16 @@ void librdf_Repository::addStatementGraph_NoLock(
{
if (!i_xSubject.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::addStatement: Subject is null", *this, 0);
+ u"librdf_Repository::addStatement: Subject is null"_ustr, *this,
0);
}
if (!i_xPredicate.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::addStatement: Predicate is null",
+ u"librdf_Repository::addStatement: Predicate is null"_ustr,
*this, 1);
}
if (!i_xObject.is()) {
throw lang::IllegalArgumentException(
- "librdf_Repository::addStatement: Object is null", *this, 2);
+ u"librdf_Repository::addStatement: Object is null"_ustr, *this, 2);
}
librdf_TypeConverter::Statement const stmt(
@@ -1824,8 +1824,8 @@ void librdf_Repository::addStatementGraph_Lock(
&& (m_NamedGraphs.find(i_rGraphName) == m_NamedGraphs.end()))
{
throw container::NoSuchElementException(
- "librdf_Repository::addStatement: "
- "no graph with given URI exists", *this);
+ u"librdf_Repository::addStatement: "
+ "no graph with given URI exists"_ustr, *this);
}
const OString context(
OUStringToOString(i_rGraphName, RTL_TEXTENCODING_UTF8) );
@@ -1836,8 +1836,8 @@ void librdf_Repository::addStatementGraph_Lock(
safe_librdf_free_node);
if (!pContext) {
throw uno::RuntimeException(
- "librdf_Repository::addStatement: "
- "librdf_new_node_from_uri_string failed", *this);
+ u"librdf_Repository::addStatement: "
+ "librdf_new_node_from_uri_string failed"_ustr, *this);
}
const std::shared_ptr<librdf_statement> pStatement(
librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), i_rStatement),
@@ -1859,8 +1859,8 @@ void librdf_Repository::addStatementGraph_Lock(
if (librdf_model_context_add_statement(m_pModel.get(),
pContext.get(), pStatement.get())) {
throw rdf::RepositoryException(
- "librdf_Repository::addStatement: "
- "librdf_model_context_add_statement failed", *this);
+ u"librdf_Repository::addStatement: "
+ "librdf_model_context_add_statement failed"_ustr, *this);
}
}
@@ -1888,8 +1888,8 @@ void librdf_Repository::removeStatementsGraph_NoLock(
if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) {
throw container::NoSuchElementException(
- "librdf_Repository::removeStatements: "
- "no graph with given URI exists", *this);
+ u"librdf_Repository::removeStatements: "
+ "no graph with given URI exists"_ustr, *this);
}
const OString context(
OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1900,8 +1900,8 @@ void librdf_Repository::removeStatementsGraph_NoLock(
safe_librdf_free_node);
if (!pContext) {
throw uno::RuntimeException(
- "librdf_Repository::removeStatements: "
- "librdf_new_node_from_uri_string failed", *this);
+ u"librdf_Repository::removeStatements: "
+ "librdf_new_node_from_uri_string failed"_ustr, *this);
}
const std::shared_ptr<librdf_statement> pStatement(
librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), stmt),
@@ -1914,8 +1914,8 @@ void librdf_Repository::removeStatementsGraph_NoLock(
safe_librdf_free_stream);
if (!pStream) {
throw rdf::RepositoryException(
- "librdf_Repository::removeStatements: "
- "librdf_model_find_statements_in_context failed", *this);
+ u"librdf_Repository::removeStatements: "
+ "librdf_model_find_statements_in_context failed"_ustr, *this);
}
if (librdf_stream_end(pStream.get()))
@@ -1925,14 +1925,14 @@ void librdf_Repository::removeStatementsGraph_NoLock(
librdf_statement *pStmt( librdf_stream_get_object(pStream.get()) );
if (!pStmt) {
throw rdf::RepositoryException(
- "librdf_Repository::removeStatements: "
- "librdf_stream_get_object failed", *this);
+ u"librdf_Repository::removeStatements: "
+ "librdf_stream_get_object failed"_ustr, *this);
}
if (librdf_model_context_remove_statement(m_pModel.get(),
pContext.get(), pStmt)) {
throw rdf::RepositoryException(
- "librdf_Repository::removeStatements: "
- "librdf_model_context_remove_statement failed", *this);
+ u"librdf_Repository::removeStatements: "
+ "librdf_model_context_remove_statement failed"_ustr, *this);
}
} while (!librdf_stream_next(pStream.get()));
}
@@ -1969,8 +1969,8 @@ librdf_Repository::getStatementsGraph_NoLock(
if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) {
throw container::NoSuchElementException(
- "librdf_Repository::getStatements: "
- "no graph with given URI exists", *this);
+ u"librdf_Repository::getStatements: "
+ "no graph with given URI exists"_ustr, *this);
}
const OString context(
OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1981,8 +1981,8 @@ librdf_Repository::getStatementsGraph_NoLock(
safe_librdf_free_node);
if (!pContext) {
throw uno::RuntimeException(
- "librdf_Repository::getStatements: "
- "librdf_new_node_from_uri_string failed", *this);
+ u"librdf_Repository::getStatements: "
+ "librdf_new_node_from_uri_string failed"_ustr, *this);
}
const std::shared_ptr<librdf_statement> pStatement(
librdf_TypeConverter::mkStatement_Lock(m_pWorld.get(), stmt),
@@ -1995,8 +1995,8 @@ librdf_Repository::getStatementsGraph_NoLock(
safe_librdf_free_stream);
if (!pStream) {
throw rdf::RepositoryException(
- "librdf_Repository::getStatements: "
- "librdf_model_find_statements_in_context failed", *this);
+ u"librdf_Repository::getStatements: "
+ "librdf_model_find_statements_in_context failed"_ustr, *this);
}
librdf_node *pCtxt1(
@@ -2011,11 +2011,11 @@ librdf_Repository::getStatementsGraph_NoLock(
librdf_statement *pStmt( librdf_stream_get_object(pStream.get()) );
if (!pStmt) {
rdf::QueryException e(
- "librdf_GraphResult::nextElement: "
- "librdf_stream_get_object failed", *this);
+ u"librdf_GraphResult::nextElement: "
+ "librdf_stream_get_object failed"_ustr, *this);
throw lang::WrappedTargetException(
- "librdf_GraphResult::nextElement: "
- "librdf_stream_get_object failed", *this,
+ u"librdf_GraphResult::nextElement: "
+ "librdf_stream_get_object failed"_ustr, *this,
uno::Any(e));
}
// NB: pCtxt may be null here if this is result of a graph query
@@ -2049,7 +2049,7 @@ librdf_world *librdf_TypeConverter::createWorld_Lock()
const
librdf_world *pWorld( librdf_new_world() );
if (!pWorld) {
throw uno::RuntimeException(
- "librdf_TypeConverter::createWorld: librdf_new_world failed",
+ u"librdf_TypeConverter::createWorld: librdf_new_world failed"_ustr,
m_rRep);
}
librdf_world_set_raptor_init_handler(pWorld, nullptr, &librdf_raptor_init);
@@ -2075,7 +2075,7 @@ librdf_TypeConverter::createStorage_Lock(librdf_world
*i_pWorld) const
"contexts='yes',hash-type='memory'") );
if (!pStorage) {
throw uno::RuntimeException(
- "librdf_TypeConverter::createStorage: librdf_new_storage failed",
+ u"librdf_TypeConverter::createStorage: librdf_new_storage
failed"_ustr,
m_rRep);
}
return pStorage;
@@ -2087,7 +2087,7 @@ librdf_model *librdf_TypeConverter::createModel_Lock(
librdf_model *pRepository( librdf_new_model(i_pWorld, i_pStorage, nullptr)
);
if (!pRepository) {
throw uno::RuntimeException(
- "librdf_TypeConverter::createModel: librdf_new_model failed",
+ u"librdf_TypeConverter::createModel: librdf_new_model failed"_ustr,
m_rRep);
}
//FIXME
@@ -2116,7 +2116,7 @@ librdf_uri* librdf_TypeConverter::mkURI_Lock(
librdf_world* i_pWorld,
reinterpret_cast<const unsigned char *>(i_rURI.getStr())));
if (!pURI) {
throw uno::RuntimeException(
- "librdf_TypeConverter::mkURI: librdf_new_uri failed", nullptr);
+ u"librdf_TypeConverter::mkURI: librdf_new_uri failed"_ustr,
nullptr);
}
return pURI;
}
@@ -2172,8 +2172,8 @@ librdf_node* librdf_TypeConverter::mkResource_Lock(
librdf_world* i_pWorld,
pBlankNode->value.getStr())));
if (!pNode) {
throw uno::RuntimeException(
- "librdf_TypeConverter::mkResource: "
- "librdf_new_node_from_blank_identifier failed", nullptr);
+ u"librdf_TypeConverter::mkResource: "
+ "librdf_new_node_from_blank_identifier failed"_ustr, nullptr);
}
return pNode;
} else { // assumption: everything else is URI
@@ -2184,8 +2184,8 @@ librdf_node* librdf_TypeConverter::mkResource_Lock(
librdf_world* i_pWorld,
reinterpret_cast<const unsigned char*>(pURI->value.getStr())));
if (!pNode) {
throw uno::RuntimeException(
- "librdf_TypeConverter::mkResource: "
- "librdf_new_node_from_uri_string failed", nullptr);
+ u"librdf_TypeConverter::mkResource: "
+ "librdf_new_node_from_uri_string failed"_ustr, nullptr);
}
return pNode;
}
@@ -2288,7 +2288,7 @@ librdf_node* librdf_TypeConverter::mkNode_Lock(
librdf_world* i_pWorld,
}
if (!ret) {
throw uno::RuntimeException(
- "librdf_TypeConverter::mkNode: librdf_new_node_from_literal
failed", nullptr);
+ u"librdf_TypeConverter::mkNode: librdf_new_node_from_literal
failed"_ustr, nullptr);
}
return ret;
}
@@ -2331,8 +2331,8 @@ librdf_statement*
librdf_TypeConverter::mkStatement_Lock(librdf_world* i_pWorld,
pSubject, pPredicate, pObject) );
if (!pStatement) {
throw uno::RuntimeException(
- "librdf_TypeConverter::mkStatement: "
- "librdf_new_statement_from_nodes failed", nullptr);
+ u"librdf_TypeConverter::mkStatement: "
+ "librdf_new_statement_from_nodes failed"_ustr, nullptr);
}
return pStatement;
}
@@ -2344,8 +2344,8 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI)
const
const unsigned char* uri( librdf_uri_as_string(i_pURI) );
if (!uri) {
throw uno::RuntimeException(
- "librdf_TypeConverter::convertToXURI: "
- "librdf_uri_as_string failed", m_rRep);
+ u"librdf_TypeConverter::convertToXURI: "
+ "librdf_uri_as_string failed"_ustr, m_rRep);
}
OUString uriU( OStringToOUString(
std::string_view(reinterpret_cast<const char*>(uri)),
@@ -2355,8 +2355,8 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI)
const
} catch (const lang::IllegalArgumentException &) {
css::uno::Any anyEx = cppu::getCaughtException();
throw lang::WrappedTargetRuntimeException(
- "librdf_TypeConverter::convertToXURI: "
- "illegal uri", m_rRep, anyEx);
+ u"librdf_TypeConverter::convertToXURI: "
+ "illegal uri"_ustr, m_rRep, anyEx);
}
}
@@ -2368,8 +2368,8 @@ librdf_TypeConverter::convertToXURI(librdf_node* i_pNode)
const
librdf_uri* pURI( librdf_node_get_uri(i_pNode) );
if (!pURI) {
throw uno::RuntimeException(
- "librdf_TypeConverter::convertToXURI: "
- "resource has no uri", m_rRep);
+ u"librdf_TypeConverter::convertToXURI: "
+ "resource has no uri"_ustr, m_rRep);
}
return convertToXURI(pURI);
} else {
@@ -2386,8 +2386,8 @@ librdf_TypeConverter::convertToXResource(librdf_node*
i_pNode) const
const unsigned char* label( librdf_node_get_blank_identifier(i_pNode)
);
if (!label) {
throw uno::RuntimeException(
- "librdf_TypeConverter::convertToXResource: "
- "blank node has no label", m_rRep);
+ u"librdf_TypeConverter::convertToXResource: "
+ "blank node has no label"_ustr, m_rRep);
}
OUString labelU( OStringToOUString(
std::string_view(reinterpret_cast<const char*>(label)),
@@ -2397,8 +2397,8 @@ librdf_TypeConverter::convertToXResource(librdf_node*
i_pNode) const
} catch (const lang::IllegalArgumentException &) {
css::uno::Any anyEx = cppu::getCaughtException();
throw lang::WrappedTargetRuntimeException(
- "librdf_TypeConverter::convertToXResource: "
- "illegal blank node label", m_rRep, anyEx);
+ u"librdf_TypeConverter::convertToXResource: "
+ "illegal blank node label"_ustr, m_rRep, anyEx);
}
} else {
return convertToXURI(i_pNode);
@@ -2415,8 +2415,8 @@ librdf_TypeConverter::convertToXNode(librdf_node*
i_pNode) const
const unsigned char* value( librdf_node_get_literal_value(i_pNode) );
if (!value) {
throw uno::RuntimeException(
- "librdf_TypeConverter::convertToXNode: "
- "literal has no value", m_rRep);
+ u"librdf_TypeConverter::convertToXNode: "
+ "literal has no value"_ustr, m_rRep);
}
const char * lang( librdf_node_get_literal_value_language(i_pNode) );
librdf_uri* pType(
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index e20282565644..710cd71ee0e1 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -55,12 +55,12 @@ namespace XPath
Sequence< OUString > SAL_CALL CXPathAPI::getSupportedServiceNames()
{
- return { "com.sun.star.xml.xpath.XPathAPI" };
+ return { u"com.sun.star.xml.xpath.XPathAPI"_ustr };
}
OUString SAL_CALL CXPathAPI::getImplementationName()
{
- return "com.sun.star.comp.xml.xpath.XPathAPI";
+ return u"com.sun.star.comp.xml.xpath.XPathAPI"_ustr;
}
sal_Bool SAL_CALL CXPathAPI::supportsService(const OUString& aServiceName)
@@ -110,7 +110,7 @@ namespace XPath
nsmap_t & rNamespaces, Reference< XNode > const& xNamespaceNode)
{
DOM::CNode *const
pCNode(dynamic_cast<DOM::CNode*>(xNamespaceNode.get()));
- if (!pCNode) { throw RuntimeException("Could not use the namespace
node in order to collect namespace declarations."); }
+ if (!pCNode) { throw RuntimeException(u"Could not use the namespace
node in order to collect namespace declarations."_ustr); }
::osl::MutexGuard const g(pCNode->GetOwnerDocument().GetMutex());
@@ -278,7 +278,7 @@ namespace XPath
Reference< XNode > const& xContextNode,
const OUString& expr)
{
- if (!xContextNode.is()) { throw RuntimeException("xContextNode does
not exist!"); }
+ if (!xContextNode.is()) { throw RuntimeException(u"xContextNode does
not exist!"_ustr); }
nsmap_t nsmap;
extensions_t extensions;
@@ -292,15 +292,15 @@ namespace XPath
// get the node and document
::rtl::Reference<DOM::CDocument> const pCDoc(
dynamic_cast<DOM::CDocument*>(xContextNode->getOwnerDocument().get()));
- if (!pCDoc.is()) { throw RuntimeException("Interface pointer for the
owner document of the xContextNode does not exist."); }
+ if (!pCDoc.is()) { throw RuntimeException(u"Interface pointer for the
owner document of the xContextNode does not exist."_ustr); }
DOM::CNode *const pCNode =
dynamic_cast<DOM::CNode*>(xContextNode.get());
- if (!pCNode) { throw RuntimeException("xContextNode interface pointer
does not exist."); }
+ if (!pCNode) { throw RuntimeException(u"xContextNode interface pointer
does not exist."_ustr); }
::osl::MutexGuard const g(pCDoc->GetMutex()); // lock the document!
xmlNodePtr const pNode = pCNode->GetNodePtr();
- if (!pNode) { throw RuntimeException("Node pointer for xContextNode
does not exist."); }
+ if (!pNode) { throw RuntimeException(u"Node pointer for xContextNode
does not exist."_ustr); }
xmlDocPtr pDoc = pNode->doc;
/* NB: workaround for #i87252#:
@@ -380,7 +380,7 @@ namespace XPath
Reference< XXPathExtension> const& xExtension)
{
if (!xExtension.is()) {
- throw RuntimeException("Extension instance xExtension to be used
by XPath does not exist.");
+ throw RuntimeException(u"Extension instance xExtension to be used
by XPath does not exist."_ustr);
}
std::scoped_lock const g(m_Mutex);
m_extensions.push_back( xExtension );
