[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 2 23:50:28 UTC 2018
sfx2/source/doc/docfile.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit b7311a04807932a164ac891715e39314fa00fe81
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Sat Dec 1 11:26:03 2018 +0100
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Dec 3 00:49:07 2018 +0100
sfx2: fix Android build, check HAVE_FEATURE_MULTIUSER_ENVIRONMENT
Change-Id: I2d78f35898cc514b20500018a7d360e3c78127aa
(cherry picked from commit 2452c3f008fa8cb4f4a88dace1c7d204f775d3f1)
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 89ccdfcecbab..0473f61397ee 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -166,10 +166,12 @@ bool IsLockingUsed()
#endif
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
bool IsWebDAVLockingUsed()
{
return officecfg::Office::Common::Misc::UseWebDAVFileLocking::get();
}
+#endif
} // anonymous namespace
More information about the Libreoffice-commits
mailing list