summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-20 17:17:25 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-20 17:17:25 +0100
commit0202b472d8a0555e1750fb0d13acf469f63f27cc (patch)
tree2080e890398c56f5b66e26a94985556ac3526b20 /sfx2
parent58966e16d8649a16fa961dbedc4f6f97693021e6 (diff)
Silence -Werror=shadow
Change-Id: Ie1fcda19141a12dfe2b965d88e16c85cc2a64cb2
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/sfxhelp.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 38ba4fd9ef5e..aea69c0af85e 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -872,8 +872,8 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
path = path.copy(0, i1) + "/runtime/org.libreoffice.LibreOffice.Help/"
+ path.copy(i2, i3 - i2) + sha + path.copy(i4);
// Turn <path> into a file URL:
- OUString url;
- err = osl::FileBase::getFileURLFromSystemPath(path, url);
+ OUString url_;
+ err = osl::FileBase::getFileURLFromSystemPath(path, url_);
if (err != osl::FileBase::E_None) {
SAL_WARN(
"sfx.appl",
@@ -881,7 +881,7 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
<< err);
throw Failure();
}
- return url;
+ return url_;
}();
*helpRootUrl = url;
return true;