diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-02-18 16:07:49 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-02-18 16:18:09 +0200 |
| commit | 5732b24b599b8bd8ff804643232a8df920af8b47 (patch) | |
| tree | 17a76030bb5b147ae0f349baeb9761f95c98c760 /sfx2 | |
| parent | 85163440eb11164dc87d8b1816d240e7635737e6 (diff) | |
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
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/objface.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 308b2ff76a60..c519678b35aa 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; |