User: kz Date: 2008-05-05 16:10:17+0000 Modified: dba/dbaccess/source/ui/uno/composerdialogs.cxx
Log: INTEGRATION: CWS dba30b (1.9.24); FILE MERGED 2008/04/15 22:14:41 fs 1.9.24.2: RESYNC: (1.9-1.10); FILE MERGED 2008/03/16 14:08:19 fs 1.9.24.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: composerdialogs.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/composerdialogs.cxx?r1=1.10&r2=1.11 Delta lines: +7 -4 ------------------- --- composerdialogs.cxx 2008-04-10 16:51:17+0000 1.10 +++ composerdialogs.cxx 2008-05-05 16:10:15+0000 1.11 @@ -58,6 +58,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif extern "C" void SAL_CALL createRegistryInfo_ComposerDialogs() { @@ -151,7 +154,7 @@ } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ComposerDialog::createDialog: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } if ( !xConnection.is() || !xColumns.is() || !m_xComposer.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
