Skip to content

C
core
Kaydet (Commit) 0202b472 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Silence -Werror=shadow 

Change-Id: Ie1fcda19141a12dfe2b965d88e16c85cc2a64cb2
üst 58966e16
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sfx2/source/appl/sfxhelp.cxx
Dosyayı görüntüle @ 0202b472
...@@ -872,8 +872,8 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) { ...@@ -872,8 +872,8 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
path = path.copy(0, i1) + "/runtime/org.libreoffice.LibreOffice.Help/" path = path.copy(0, i1) + "/runtime/org.libreoffice.LibreOffice.Help/"
+ path.copy(i2, i3 - i2) + sha + path.copy(i4); + path.copy(i2, i3 - i2) + sha + path.copy(i4);
// Turn <path> into a file URL: // Turn <path> into a file URL:
OUString url; OUString url_;
err = osl::FileBase::getFileURLFromSystemPath(path, url); err = osl::FileBase::getFileURLFromSystemPath(path, url_);
if (err != osl::FileBase::E_None) { if (err != osl::FileBase::E_None) {
SAL_WARN( SAL_WARN(
"sfx.appl", "sfx.appl",
...@@ -881,7 +881,7 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) { ...@@ -881,7 +881,7 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
<< err); << err);
throw Failure(); throw Failure();
} }
return url; return url_;
}(); }();
*helpRootUrl = url; *helpRootUrl = url;
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment