diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-23 20:59:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-26 13:09:41 +0100 |
| commit | d0b09f41efe938e94a84e783c9ff5742edcbfba8 (patch) | |
| tree | 7c5efe900bad5b2e1f0e79cc005c7345386f2a61 | |
| parent | b299aa7c64adc2de86c367888e6ccb73c4b31bc2 (diff) | |
sw: related: tdf#58624 convert to assert() in ~SwAccessibleMap()
With the restored Dispose() calls from previous commit these don't
trigger on every scrolled document now.
Change-Id: I93694352adadc2c3a034be949d4930de51ec80e9
| -rw-r--r-- | sw/source/core/access/accmap.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 7ea16d4c0c60..aa00caadbd83 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1700,8 +1700,8 @@ SwAccessibleMap::~SwAccessibleMap() { osl::MutexGuard aGuard( maMutex ); #if OSL_DEBUG_LEVEL > 0 - OSL_ENSURE( !mpFrameMap || mpFrameMap->empty(), - "Frame map should be empty after disposing the root frame" ); + assert((!mpFrameMap || mpFrameMap->empty()) && + "Frame map should be empty after disposing the root frame"); if( mpFrameMap ) { SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin(); @@ -1717,8 +1717,8 @@ SwAccessibleMap::~SwAccessibleMap() ++aIter; } } - OSL_ENSURE( !mpShapeMap || mpShapeMap->empty(), - "Object map should be empty after disposing the root frame" ); + assert((!mpShapeMap || mpShapeMap->empty()) && + "Object map should be empty after disposing the root frame"); if( mpShapeMap ) { SwAccessibleShapeMap_Impl::iterator aIter = mpShapeMap->begin(); @@ -1751,7 +1751,7 @@ SwAccessibleMap::~SwAccessibleMap() { osl::MutexGuard aGuard( maEventMutex ); #if OSL_DEBUG_LEVEL > 0 - OSL_ENSURE( !(mpEvents || mpEventMap), "pending events" ); + assert(!(mpEvents || mpEventMap)); if( mpEvents ) { SwAccessibleEventList_Impl::iterator aIter = mpEvents->begin(); |