User: kz Date: 2008-05-05 15:57:36+0000 Modified: dba/dbaccess/source/ui/dlg/dbwizsetup.cxx
Log: INTEGRATION: CWS dba30b (1.32.4); FILE MERGED 2008/04/15 22:13:26 fs 1.32.4.3: RESYNC: (1.32-1.33); FILE MERGED 2008/03/17 10:24:25 fs 1.32.4.2: do not assert unsuccessful loads 2008/03/16 14:09:02 fs 1.32.4.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.33&r2=1.34 Delta lines: +5 -4 ------------------- --- dbwizsetup.cxx 2008-04-10 14:47:20+0000 1.33 +++ dbwizsetup.cxx 2008-05-05 15:57:33+0000 1.34 @@ -162,9 +162,6 @@ #endif /** === end UNO includes === **/ -#ifndef _DBAUI_LINKEDDOCUMENTS_HXX_ -#include "linkeddocuments.hxx" -#endif #ifndef SVTOOLS_FILENOTATION_HXX_ #include <svtools/filenotation.hxx> #endif @@ -1253,7 +1250,11 @@ ); } } - catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } + catch( const Exception& ) + { + // do not assert. + // Such an exception happens for instance of the to-be-loaded document does not exist anymore. + } try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
