[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

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

New commits:
commit a9d6f0e078e5e6653bd620ddbdbc24de93c7ae51
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Dec 3 12:18:57 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Dec 4 16:40:19 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)
    Reviewed-on: https://gerrit.libreoffice.org/64451
    (cherry picked from commit 8f85d3db0b8b1dcfc399be4afbbc68a04c558a64)
    Reviewed-on: https://gerrit.libreoffice.org/64514
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 );