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

Tor Lillqvist tml at collabora.com
Mon Jan 4 03:33:39 PST 2016


 sfx2/source/appl/appdde.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit a188bd6ad109c7696f29509c1db72b802a4bd435
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 4 13:30:08 2016 +0200

    Remove two pointless DBG_ASSERTs "There is no Dde-Service"
    
    Avoid hundreds of presumably pointless warning messages in some unit
    tests at least. The code explicitly checks and handles the asserted
    condition not being true right after the DBG_ASSERTs.
    
    Change-Id: I5482c56aeeadb8f85dfdd03e12960abd7e769c56

diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 62b81f4..b901227 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -462,7 +462,6 @@ void SfxAppData_Impl::DeInitDDE()
 #if defined( WNT )
 void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
 {
-    DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" );
     //OV: DDE is disconnected in server mode!
     if( !pAppData_Impl->pDocTopics )
         return;
@@ -495,7 +494,6 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
 void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
 {
 #if defined WNT
-    DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" );
     //OV: DDE is disconnected in server mode!
     if( !pAppData_Impl->pDocTopics )
         return;


More information about the Libreoffice-commits mailing list