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

[Tor Lillqvist]

 sfx2/source/control/objface.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5732b24b599b8bd8ff804643232a8df920af8b47
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 18 16:07:49 2014 +0200

    assert() is too harsh here I think, use SAL_WARN_IF() instead
    
    I run into the assertion now in TiledLibreOffice, but if I drop the
    assert(), it still works. So let's just print a warning (that
    everybody will cheerfully ignore, ha ha) instead. I have no idea what
    this code actually is doing...
    
    (Originally the code had DBG_ASSERT(), which despite its name also
    just prints a warning, which I changed to a real assert() in
    8293b29304716d6bd117ab233b1238e1385ae592 for some reason.)
    
    Change-Id: I928078aaf3648c8d04c59f271504c7d3b02e1bb5

diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 308b2ff..c519678 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -628,7 +628,7 @@ sal_Bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) const
 
 const SfxInterface* SfxInterface::GetRealInterfaceForSlot( const SfxSlot *pRealSlot ) const
 {
-    assert( pImpData->bRegistered );
+    SAL_WARN_IF( !pImpData->bRegistered, "sfx2.control", "Interface not registered" );
 
     const SfxInterface* pInterface = this;