summaryrefslogtreecommitdiff
path: root/unoxml/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-09 12:32:59 +0100
committerMichael Stahl <mstahl@redhat.com>2014-01-09 12:34:13 +0100
commitd3aad81268298c05163136e2e953e1dfe0728d9e (patch)
treebd9cbd8d947962f4b5e6e19efa85641aa6d21f08 /unoxml/source
parent347d83d1cc87222719c50ebe9ed1c61944e8914e (diff)
librdf_Repository: make older compilers happy
Change-Id: Ide4df8f621f810b20be811db06d46edd5a9dc5f8
Diffstat (limited to 'unoxml/source')
-rw-r--r--unoxml/source/rdf/librdf_repository.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 6d7df634e0b7..d56cfad6db9e 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -2119,7 +2119,9 @@ librdf_uri* librdf_TypeConverter::mkURI_Lock( librdf_world* i_pWorld,
librdf_TypeConverter::extractResource_NoLock(
const uno::Reference< rdf::XResource > & i_xResource) const
{
- if (!i_xResource.is()) return 0;
+ if (!i_xResource.is()) {
+ return ::boost::shared_ptr<Resource>();
+ }
uno::Reference< rdf::XBlankNode > xBlankNode(i_xResource, uno::UNO_QUERY);
if (xBlankNode.is()) {
const OString label(
@@ -2172,7 +2174,9 @@ librdf_node* librdf_TypeConverter::mkResource_Lock( librdf_world* i_pWorld,
librdf_TypeConverter::extractNode_NoLock(
const uno::Reference< rdf::XNode > & i_xNode) const
{
- if (!i_xNode.is()) return 0;
+ if (!i_xNode.is()) {
+ return ::boost::shared_ptr<Node>();
+ }
uno::Reference< rdf::XResource > xResource(i_xNode, uno::UNO_QUERY);
if (xResource.is()) {
return extractResource_NoLock(xResource);
@@ -2180,7 +2184,9 @@ librdf_TypeConverter::extractNode_NoLock(
uno::Reference< rdf::XLiteral> xLiteral(i_xNode, uno::UNO_QUERY);
OSL_ENSURE(xLiteral.is(),
"mkNode: someone invented a new rdf.XNode and did not tell me");
- if (!xLiteral.is()) return 0;
+ if (!xLiteral.is()) {
+ return ::boost::shared_ptr<Node>();
+ }
const OString val(
OUStringToOString(xLiteral->getValue(),
RTL_TEXTENCODING_UTF8) );