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

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 5 19:04:58 UTC 2019


 sfx2/source/doc/docfile.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3f009ab4e767000da299fe222184efea29942173
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jul 5 20:13:22 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Fri Jul 5 21:03:57 2019 +0200

    Fix !HAVE_FEATURE_MULTIUSER_ENVIRONMENT build
    
    The Android-ARM_24-Bytemark-Hosting build currentl< fails with:
    error: unused parameter ´pLockData´ [-Werror,-Wunused-parameter]
    
    Regression from commit 0f9599b687c1 ("Show who has locked the
    document when reopening a read-only document").
    
    Change-Id: I6d8f900957d79a9c5bf70645e2021995e8a28d43
    Reviewed-on: https://gerrit.libreoffice.org/75145
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index efb874b67f2a..8570d9921d56 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1136,6 +1136,7 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
     (void) bLoading;
     (void) bNoUI;
     (void) bTryIgnoreLockFile;
+    (void) pLockData;
     return LockFileResult::Succeeded;
 #else
     LockFileResult eResult = LockFileResult::Failed;


More information about the Libreoffice-commits mailing list