[Libreoffice-commits] online.git: wsd/Storage.hpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 7 12:40:14 UTC 2018
wsd/Storage.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 26db5646edc3f9b0fcba4e2bb624561fd49ba926
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Dec 7 13:39:10 2018 +0100
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Dec 7 13:39:10 2018 +0100
Some compilers do not like this and complain about shadowing the methods.
Change-Id: Iabdc790a9c2c37eccbcb4245a48d564c69ea5d19
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 6d56c64b0..77a2f675b 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -159,7 +159,7 @@ public:
_jailedFilePathAnonym = newPath;
}
- void setLoaded(bool isLoaded) { _isLoaded = isLoaded; }
+ void setLoaded(bool loaded) { _isLoaded = loaded; }
bool isLoaded() const { return _isLoaded; }
@@ -170,14 +170,14 @@ public:
bool getForceSave() const { return _forceSave; }
/// To be able to set the WOPI extension header appropriately.
- void setUserModified(bool isUserModified) { _isUserModified = isUserModified; }
+ void setUserModified(bool userModified) { _isUserModified = userModified; }
bool isUserModified() const { return _isUserModified; }
/// To be able to set the WOPI 'is autosave/is exitsave?' headers appropriately.
void setIsAutosave(bool isAutosave) { _isAutosave = isAutosave; }
bool getIsAutosave() const { return _isAutosave; }
- void setIsExitSave(bool isExitSave) { _isExitSave = isExitSave; }
+ void setIsExitSave(bool exitSave) { _isExitSave = exitSave; }
bool isExitSave() const { return _isExitSave; }
void setFileInfo(const FileInfo& fileInfo) { _fileInfo = fileInfo; }
More information about the Libreoffice-commits
mailing list