User: kz Date: 2008-05-05 15:52:54+0000 Modified: dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx
Log: INTEGRATION: CWS dba30b (1.78.126); FILE MERGED 2008/04/15 22:12:45 fs 1.78.126.2: RESYNC: (1.78-1.79); FILE MERGED 2008/03/16 14:05:17 fs 1.78.126.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dsbrowserDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx?r1=1.79&r2=1.80 Delta lines: +21 -45 --------------------- --- dsbrowserDnD.cxx 2008-04-10 14:07:07+0000 1.79 +++ dsbrowserDnD.cxx 2008-05-05 15:52:51+0000 1.80 @@ -31,52 +31,28 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef _SBA_UNODATBR_HXX_ +#include "dbexchange.hxx" +#include "dbtreelistbox.hxx" +#include "dbtreemodel.hxx" +#include "dbtreeview.hxx" +#include "dbu_brw.hrc" +#include "dbustrings.hrc" +#include "QEnumTypes.hxx" +#include "UITools.hxx" #include "unodatbr.hxx" -#endif -#ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_ +/** === begin UNO includes === **/ +#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef DBAUI_DBTREEMODEL_HXX -#include "dbtreemodel.hxx" -#endif -#ifndef DBACCESS_UI_DBTREEVIEW_HXX -#include "dbtreeview.hxx" -#endif -#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC -#include "dbustrings.hrc" -#endif -#ifndef _DBU_BRW_HRC_ -#include "dbu_brw.hrc" -#endif -#ifndef _DBHELPER_DBEXCEPTION_HXX_ +/** === end UNO includes === **/ + #include <connectivity/dbexception.hxx> -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> -#endif -#ifndef DBAUI_DBEXCHANGE_HXX -#include "dbexchange.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX -#include "QEnumTypes.hxx" -#endif -#ifndef DBAUI_TOOLS_HXX -#include "UITools.hxx" -#endif -#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ +#include <cppuhelper/exc_hlp.hxx> #include <svx/dataaccessdescriptor.hxx> -#endif -#ifndef DBAUI_DBTREELISTBOX_HXX -#include "dbtreelistbox.hxx" -#endif -#ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_ -#include <com/sun/star/frame/XStorable.hpp> -#endif +#include <tools/diagnose_ex.h> + #include <functional> // ......................................................................... namespace dbaui @@ -124,13 +100,13 @@ // the owner ship goes to ODataClipboards return pData; } - catch(SQLException& e) + catch(const SQLException& ) { - showError(SQLExceptionInfo(e)); + showError( SQLExceptionInfo( ::cppu::getCaughtException() ) ); } - catch(Exception&) + catch( const Exception& ) { - DBG_ERROR("SbaTableQueryBrowser::implCopyObject: caught a generic exception!"); + DBG_UNHANDLED_EXCEPTION(); } return NULL; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
