[Libreoffice-commits] core.git: sfx2/source
Stephan Bergmann
sbergman at redhat.com
Mon Oct 17 09:56:16 UTC 2016
sfx2/source/control/bindings.cxx | 16 ----------------
1 file changed, 16 deletions(-)
New commits:
commit 3c4f17b571ba041cb03d5c7e27968ee11edfb97d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 17 11:54:15 2016 +0200
Don't swallow exceptions in DBG_UTIL mode
Besides, the original "on Windows..." comment from
600163882703c64103784ff66c4bedfbe83809eb "INTEGRATION: CWS fwkfinal1: #i43920#:
catch hidden exceptions" looks bogus, anyway.
Change-Id: I1a31b63ca5aa818db3730b2006d2381b749e4dd3
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index c418d07..04d625a 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1443,12 +1443,6 @@ IMPL_LINK( SfxBindings, NextJob, Timer *, pTimer, void )
bool SfxBindings::NextJob_Impl(Timer * pTimer)
{
-#ifdef DBG_UTIL
- // on Windows very often C++ Exceptions (GPF etc.) are caught by MSVCRT
- // or another MS library try to get them here
- try
- {
-#endif
const unsigned MAX_INPUT_DELAY = 200;
DBG_ASSERT( pImpl->pCaches != nullptr, "SfxBindings not initialized" );
@@ -1539,16 +1533,6 @@ bool SfxBindings::NextJob_Impl(Timer * pTimer)
pImpl->bInNextJob = false;
Broadcast(SfxHint(SFX_HINT_UPDATEDONE));
return true;
-#ifdef DBG_UTIL
- }
- catch (...)
- {
- OSL_FAIL("C++ exception caught!");
- pImpl->bInNextJob = false;
- }
-
- return false;
-#endif
}
More information about the Libreoffice-commits
mailing list