[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - sfx2/source sw/source

[Libreoffice Gerrit user]

 sfx2/source/doc/docfile.cxx            |    2 ++
 sw/source/core/access/acccell.cxx      |    2 +-
 sw/source/core/access/accframebase.cxx |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bc799c84a7e78bbaa449f4684e8c260d528cdd3f
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Dec 3 12:18:57 2018 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Dec 3 14:31:31 2018 +0100

    sw: convert assert(bSelected out of sync) to SAL_WARN for now
    
    This evidently happens sometimes, but when it does it it's
    impossible to reproduce... Let's use SAL_WARN for now.
    
    Change-Id: Id724fd52060bfae45f9eeb16163ddfc94e53af03
    Reviewed-on: https://gerrit.libreoffice.org/64447
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit d1138d72ed4f5c2ada2dd53f4b091964d8a284e6)

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index f75a6fda8cdd..9196f1d3e8da 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -91,7 +91,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
     if( IsSelected() )
     {
         rStateSet.AddState( AccessibleStateType::SELECTED );
-        assert(m_bIsSelected && "bSelected out of sync");
+        SAL_WARN_IF(!m_bIsSelected, "sw.a11y", "bSelected out of sync");
         ::rtl::Reference < SwAccessibleContext > xThis( this );
         GetMap()->SetCursorContext( xThis );
     }
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index d173c1166ecb..87b2246bb64a 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -82,7 +82,7 @@ void SwAccessibleFrameBase::GetStates(
     if( IsSelected() )
     {
         rStateSet.AddState( AccessibleStateType::SELECTED );
-        assert(m_bIsSelected && "bSelected out of sync");
+        SAL_WARN_IF(!m_bIsSelected, "sw.a11y", "bSelected out of sync");
         ::rtl::Reference < SwAccessibleContext > xThis( this );
         GetMap()->SetCursorContext( xThis );
 
commit a49dc3390539c2a2d6afb4fdc660c52f44e18b3a
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:54:31 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 9212fabfeb6b..ee07b1f6276e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -171,10 +171,12 @@ bool IsLockingUsed()
 
 #endif
 
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
 bool IsWebDAVLockingUsed()
 {
     return officecfg::Office::Common::Misc::UseWebDAVFileLocking::get();
 }
+#endif
 
 /// Gets default attributes of a file:// URL.
 sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)