[Libreoffice-commits] core.git: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/appl/sfxhelp.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0202b472d8a0555e1750fb0d13acf469f63f27cc
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Dec 20 17:17:25 2018 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Dec 20 17:17:25 2018 +0100

    Silence -Werror=shadow
    
    Change-Id: Ie1fcda19141a12dfe2b965d88e16c85cc2a64cb2

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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits