summaryrefslogtreecommitdiff
path: root/stoc/source/uriproc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:24:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:43 +0100
commitda95f17cb69fe9eb18be44aaac9f71a68445e91c (patch)
tree6e46ab7b819efc6107b8acaf33e86f881992c2c9 /stoc/source/uriproc
parent374b4f349f1d1cb3b33004580ebc903d206f28ff (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I162b47199e959f97c3bed1f307225db944017e4f
Diffstat (limited to 'stoc/source/uriproc')
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.cxx8
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx2
2 files changed, 5 insertions, 5 deletions
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 021a80651e58..2c5a34a415fc 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -218,7 +218,7 @@ css::uno::Reference< css::uri::XUriReference > parseGeneric(
} else {
if (schemeSpecificPart.isEmpty()) {
// The scheme-specific part of an opaque URI must not be empty:
- return 0;
+ return nullptr;
}
path = schemeSpecificPart;
}
@@ -404,7 +404,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
{
if (!baseUriReference.is() || !baseUriReference->isAbsolute()
|| !baseUriReference->isHierarchical() || !uriReference.is()) {
- return 0;
+ return nullptr;
} else if (uriReference->isAbsolute()) {
return clone(uriReference);
} else if (!uriReference->hasAuthority()
@@ -473,7 +473,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
} else {
switch (excessParentSegments) {
case css::uri::RelativeUriExcessParentSegments_ERROR:
- return 0;
+ return nullptr;
case css::uri::RelativeUriExcessParentSegments_RETAIN:
if (!slash) {
@@ -520,7 +520,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative(
{
if (!baseUriReference.is() || !baseUriReference->isAbsolute()
|| !baseUriReference->isHierarchical() || !uriReference.is()) {
- return 0;
+ return nullptr;
} else if (!uriReference->isAbsolute() || !uriReference->isHierarchical()
|| !baseUriReference->getScheme().equalsIgnoreAsciiCase(
uriReference->getScheme())) {
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 66e5644849c9..b6811f8a27c0 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -424,7 +424,7 @@ Parser::parse(
throw (css::uno::RuntimeException, std::exception)
{
if (!parseSchemeSpecificPart(schemeSpecificPart)) {
- return 0;
+ return nullptr;
}
return new UrlReference(scheme, schemeSpecificPart);
}