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

[Michael Stahl]

 sw/source/core/access/accmap.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2934f6bcc75c781cdf9e614b9d7d8533eb680b3f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 12 13:23:00 2016 +0200

    sw: partially revert commit d0b09f41efe938e94a84e783c9ff5742edcbfba8
    
    These still trigger sometimes in JunitTest_toolkit_unoapi_1
    and i haven't had time to track that down, so back to SAL_WARN for
    now...
    
    Change-Id: I4d9f653ffddc7c704d33950d847345f4895d3f87

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 385c077..24a7149 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1697,7 +1697,7 @@ SwAccessibleMap::~SwAccessibleMap()
     {
         osl::MutexGuard aGuard( maMutex );
 #if OSL_DEBUG_LEVEL > 0
-        assert((!mpFrameMap || mpFrameMap->empty()) &&
+        SAL_WARN_IF(!(!mpFrameMap || mpFrameMap->empty()), "sw.a11y",
                 "Frame map should be empty after disposing the root frame");
         if( mpFrameMap )
         {
@@ -1714,7 +1714,7 @@ SwAccessibleMap::~SwAccessibleMap()
                 ++aIter;
             }
         }
-        assert((!mpShapeMap || mpShapeMap->empty()) &&
+        SAL_WARN_IF(!(!mpShapeMap || mpShapeMap->empty()), "sw.a11y",
                 "Object map should be empty after disposing the root frame");
         if( mpShapeMap )
         {