Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:12:45+0000 Log: RESYNC: (1.7-1.9); FILE MERGED
File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: CollectionView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/CollectionView.cxx?r1=1.4.8.4&r2=1.4.8.5 Delta lines: +25 -11 --------------------- --- CollectionView.cxx 2006-11-07 09:18:46+0000 1.4.8.4 +++ CollectionView.cxx 2007-06-04 18:12:42+0000 1.4.8.5 @@ -53,6 +53,9 @@ #ifndef _COMPHELPER_INTERACTION_HXX_ #include <comphelper/interaction.hxx> #endif +#ifndef _CPPUHELPER_EXC_HLP_HXX_ +#include <cppuhelper/exc_hlp.hxx> +#endif #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> #endif @@ -98,6 +101,9 @@ #ifndef _COM_SUN_STAR_TASK_INTERACTIONCLASSIFICATION_HPP_ #include <com/sun/star/task/InteractionClassification.hpp> #endif +#ifndef _COM_SUN_STAR_SDBC_SQLEXCEPTION_HPP_ +#include <com/sun/star/sdbc/SQLException.hpp> +#endif #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> #endif @@ -107,6 +113,9 @@ #ifndef _OSL_THREAD_H_ #include <osl/thread.h> #endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include <connectivity/dbexception.hxx> +#endif #define FILEDIALOG_DEF_IMAGEBORDER 10 //......................................................................... @@ -121,6 +130,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::task; +using namespace ::com::sun::star::sdbc; using namespace comphelper; // ----------------------------------------------------------------------------- DBG_NAME(OCollectionView) @@ -129,17 +139,17 @@ ,const ::rtl::OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) - , m_aFTCurrentPath( this, ResId( FT_EXPLORERFILE_CURRENTPATH ) ) - , m_aNewFolder( this, ResId( BTN_EXPLORERFILE_NEWFOLDER ) ) - , m_aUp( this, ResId( BTN_EXPLORERFILE_UP ) ) - , m_aView( this, ResId( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) - , m_aFTName( this, ResId( FT_EXPLORERFILE_FILENAME ) ) - , m_aName( this, ResId( ED_EXPLORERFILE_FILENAME ) ) - , m_aFL( this, ResId( FL_1 ) ) - , m_aPB_OK( this, ResId( BTN_EXPLORERFILE_SAVE ) ) - , m_aPB_CANCEL( this, ResId( PB_CANCEL ) ) - , m_aPB_HELP( this, ResId( PB_HELP ) ) - , m_sPath( ResId( STR_PATHNAME ) ) + , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) + , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) + , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) ) + , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) + , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) ) + , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) ) + , m_aFL( this, ModuleRes( FL_1 ) ) + , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) ) + , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) + , m_aPB_HELP( this, ModuleRes( PB_HELP ) ) + , m_sPath( ModuleRes( STR_PATHNAME ) ) , m_xContent(_xContent) , m_xORB(_xORB) , m_bCreateForm(sal_True) @@ -284,6 +294,10 @@ if ( dbaui::insertHierachyElement(this,m_xORB,xNameContainer,String(),m_bCreateForm) ) m_aView.Initialize(m_xContent,String()); } + catch( const SQLException& ) + { + showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), this, m_xORB ); + } catch(Exception) { OSL_ENSURE(0,"Exception caught!"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
