summaryrefslogtreecommitdiffstats
path: root/sal/rtl/bootstrap.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sal/rtl/bootstrap.cxx')
-rw-r--r--sal/rtl/bootstrap.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 6455c35b2aaa..4a5fabfb6836 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -76,10 +76,9 @@ bool resolvePathnameUrl(rtl::OUString * url) {
osl::FileBase::E_None))
{
return true;
- } else {
- *url = rtl::OUString();
- return false;
}
+ *url = rtl::OUString();
+ return false;
}
enum LookupMode {
@@ -537,9 +536,8 @@ bool Bootstrap_Impl::getDirectValue(
if (find(_nameValueList, key, &v)) {
expandValue(value, v, mode, this, key, requestStack);
return true;
- } else {
- return false;
}
+ return false;
}
bool Bootstrap_Impl::getAmbienceValue(
@@ -557,9 +555,8 @@ bool Bootstrap_Impl::getAmbienceValue(
{
expandValue(value, v, mode, nullptr, key, requestStack);
return true;
- } else {
- return false;
}
+ return false;
}
void Bootstrap_Impl::expandValue(
@@ -838,7 +835,8 @@ sal_Unicode read(rtl::OUString const & text, sal_Int32 * pos, bool * escaped) {
*escaped = true;
return static_cast< sal_Unicode >(
(n1 << 12) | (n2 << 8) | (n3 << 4) | n4);
- } else if (*pos < text.getLength()) {
+ }
+ if (*pos < text.getLength()) {
*escaped = true;
return text[(*pos)++];
}