[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 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 881331a2792b63d026f81293966060355d4b334d
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:34:33 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.
    
    Reviewed-on: https://gerrit.libreoffice.org/64447
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit d1138d72ed4f5c2ada2dd53f4b091964d8a284e6)
    
    Conflicts:
            sw/source/core/access/acccell.cxx
            sw/source/core/access/accframebase.cxx
    
    Change-Id: Id724fd52060bfae45f9eeb16163ddfc94e53af03

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index d448a7f281b7..ad019cf31a3e 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -93,7 +93,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
     if( IsSelected() )
     {
         rStateSet.AddState( AccessibleStateType::SELECTED );
-        assert(bIsSelected && "bSelected out of sync");
+        SAL_WARN_IF(!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 9cf0253601ca..b1ea7cf60655 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(bIsSelected && "bSelected out of sync");
+        SAL_WARN_IF(!bIsSelected, "sw.a11y", "bSelected out of sync");
         ::rtl::Reference < SwAccessibleContext > xThis( this );
         GetMap()->SetCursorContext( xThis );