[Libreoffice-commits] core.git: Branch 'feature/vclref' - 2 commits - include/vcl sw/source

[Michael Meeks]

 include/vcl/outdev.hxx                       |    1 -
 sw/source/core/doc/DocumentDeviceManager.cxx |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 19fe3b4a5e7f299d85244eb1e62852ca64a22fcf
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Mar 24 12:01:07 2015 +0000

    correct debugging assertions.
    
    Change-Id: I2437b4d3c532be6cbb31dccfa9e267498111c183

diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index 3e8f6c9..e901934 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -65,7 +65,7 @@ SfxPrinter* DocumentDeviceManager::getPrinter(/*[in]*/ bool bCreate ) const
 
 void DocumentDeviceManager::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged )
 {
-    assert ( !pP->isDisposed() );
+    assert ( !!pP && !pP->isDisposed() );
     if ( pP != mpPrt )
     {
         if ( bDeleteOld )
@@ -101,7 +101,7 @@ VirtualDevice* DocumentDeviceManager::getVirtualDevice(/*[in]*/ bool bCreate ) c
     else
         pRet = &CreateVirtualDevice_();
 
-    assert ( !pRet->isDisposed() );
+    assert ( !pRet || !pRet->isDisposed() );
 
     return pRet;
 }
@@ -138,7 +138,7 @@ OutputDevice* DocumentDeviceManager::getReferenceDevice(/*[in]*/ bool bCreate )
         pRet = getVirtualDevice( bCreate );
     }
 
-    assert ( !pRet->isDisposed() );
+    assert ( !pRet || !pRet->isDisposed() );
 
     return pRet;
 }
commit 8062fea475b33800e680e15bfe8f66d316b40077
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Mar 24 12:00:07 2015 +0000

    Nothing really that wrong with acquiring a disposed reference, for now.
    
    Emitting events acquires and passes references conservatively, and the
    VCLEVENT_OBJECT_DYING event hit this hard.
    
    Change-Id: If86991ead63b05425a237bf213583c020ba4e582

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0662dbc..47369ed 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -270,7 +270,6 @@ private:
 
     inline void acquire() const
     {
-        assert(!mbDisposed);
         mnRefCnt++;
     }