INTEGRATION: CWS dba30b (1.32.4); FILE MERGED

2008/04/15 22:12:48 fs 1.32.4.2: RESYNC: (1.32-1.33); FILE MERGED
2008/03/16 14:05:17 fs 1.32.4.1: some exception handling re-factoring
This commit is contained in:
Kurt Zenker 2008-05-05 14:53:05 +00:00
parent 09bd32f4d7
commit bd7a2b4507

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: exsrcbrw.cxx,v $ * $RCSfile: exsrcbrw.cxx,v $
* $Revision: 1.33 $ * $Revision: 1.34 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -64,6 +64,9 @@
#ifndef _DBU_REGHELPER_HXX_ #ifndef _DBU_REGHELPER_HXX_
#include "dbu_reghelper.hxx" #include "dbu_reghelper.hxx"
#endif #endif
#ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
#endif
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdb;
@ -412,9 +415,9 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster)
if (xMasterProps.is()) if (xMasterProps.is())
xMasterProps->getPropertyValue(PROPERTY_ISNEW) >>= bWasInsertRow; xMasterProps->getPropertyValue(PROPERTY_ISNEW) >>= bWasInsertRow;
} }
catch(Exception&) catch( const Exception& )
{ {
OSL_ENSURE(sal_False, "SbaExternalSourceBrowser::Attach: caught an exception in part 1 (analyzing)!"); DBG_UNHANDLED_EXCEPTION();
} }
stopListening(); stopListening();