diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 10:19:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 10:19:21 +0100 |
| commit | 3c262bacf2bff175014ac56d11fd3d209bec8a43 (patch) | |
| tree | 965735a05bfcf4fd0dc9918d95736306a0b594df /unoxml/source/rdf | |
| parent | 9ce073bc170f6956938cfb25fd5e5b1ad118df83 (diff) | |
unoxml: Use appropriate OUString functions on string constants
Change-Id: If4467034e026409dc9d6f0b5ffcafcf98ff8778e
Diffstat (limited to 'unoxml/source/rdf')
| -rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index fdd5d8a29782..f768f7944471 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -969,7 +969,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw lang::IllegalArgumentException( "librdf_Repository::importGraph: graph name is null", *this, 2); } - if (i_xGraphName->getStringValue().matchAsciiL(s_nsOOo, sizeof(s_nsOOo)-1)) + if (i_xGraphName->getStringValue().startsWith(s_nsOOo)) { throw lang::IllegalArgumentException( "librdf_Repository::importGraph: URI is reserved", *this, 0); @@ -1291,7 +1291,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } const OUString contextU( i_xGraphName->getStringValue() ); - if (contextU.matchAsciiL(s_nsOOo, sizeof(s_nsOOo)-1)) + if (contextU.startsWith(s_nsOOo)) { throw lang::IllegalArgumentException( "librdf_Repository::createGraph: URI is reserved", *this, 0); @@ -1560,7 +1560,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "ensureMetadataReference did not", *this); } OUString const sXmlId(mdref.First + "#" + mdref.Second); - OUString const sContext(OUString::createFromAscii(s_nsOOo) + sXmlId); + OUString const sContext(s_nsOOo + sXmlId); OUString const content( (i_rRDFaContent.isEmpty()) ? xTextRange->getString() : i_rRDFaContent ); @@ -1637,8 +1637,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, return; // nothing to do... } - OUString const sXmlId( - OUString::createFromAscii(s_nsOOo) + mdref.First + "#" + mdref.Second); + OUString const sXmlId(s_nsOOo + mdref.First + "#" + mdref.Second); clearGraph_NoLock(sXmlId, true); } @@ -1660,8 +1659,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, OUString const sXmlId(mdref.First + "#" + mdref.Second); uno::Reference<rdf::XURI> xXmlId; try { - xXmlId.set( rdf::URI::create(m_xContext, - OUString::createFromAscii(s_nsOOo) + sXmlId), + xXmlId.set( rdf::URI::create(m_xContext, s_nsOOo + sXmlId), uno::UNO_QUERY_THROW); } catch (const lang::IllegalArgumentException & iae) { throw lang::WrappedTargetRuntimeException( |