User: rt Date: 2007-07-06 08:37:14+0000 Modified: dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: INTEGRATION: CWS oj14 (1.17.4); FILE MERGED 2007/06/07 11:10:38 oj 1.17.4.14: make use of new method in mimeconfighelper 2007/06/05 12:38:35 oj 1.17.4.13: merge problems fixed 2007/06/04 18:48:52 oj 1.17.4.12: RESYNC: (1.20-1.21); FILE MERGED 2007/05/21 13:34:53 lla 1.17.4.11: #i77259# don't eliminate exceptions 2007/04/05 08:06:29 lla 1.17.4.10: #146843# 2006/11/09 07:30:51 oj 1.17.4.9: remove wnt warning 2006/11/08 11:18:22 oj 1.17.4.8: merge conflict 2006/11/08 11:15:28 oj 1.17.4.7: merge conflicts resolved 2006/11/07 09:38:28 oj 1.17.4.6: RESYNC: (1.18-1.20); FILE MERGED 2006/07/11 10:57:56 oj 1.17.4.5: conflicts and warnings removed 2006/07/04 08:15:14 oj 1.17.4.4: RESYNC: (1.17-1.18); FILE MERGED 2006/04/25 13:03:20 oj 1.17.4.3: new include 2006/03/20 07:48:49 oj 1.17.4.2: use of module client helper 2006/01/03 07:49:20 oj 1.17.4.1: changed module client File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: linkeddocuments.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/linkeddocuments.cxx?r1=1.21&r2=1.22 Delta lines: +65 -16 --------------------- --- linkeddocuments.cxx 2007-05-10 10:36:27+0000 1.21 +++ linkeddocuments.cxx 2007-07-06 08:37:12+0000 1.22 @@ -42,12 +42,12 @@ #ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> #endif +#include <tools/diagnose_ex.h> + #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif -#ifndef _SO_CLSIDS_HXX -#include <so3/clsids.hxx> -#endif +#include <comphelper/classids.hxx> #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #endif @@ -90,9 +90,6 @@ #ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _DBU_MISC_HRC_ #include "dbu_misc.hrc" #endif @@ -108,6 +105,9 @@ #ifndef _SVTOOLS_TEMPLDLG_HXX #include <svtools/templdlg.hxx> #endif +#ifndef _DBAUI_MODULE_DBU_HXX_ +#include "moduledbu.hxx" +#endif // ----------------- // for calling basic #ifndef _SFXAPP_HXX @@ -138,6 +138,12 @@ #ifndef _SV_WAITOBJ_HXX #include <vcl/waitobj.hxx> #endif +#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ +#include <comphelper/mimeconfighelper.hxx> +#endif + +#include <connectivity/dbtools.hxx> +#include <toolkit/helper/vclunohelper.hxx> //...................................................................... namespace dbaui @@ -248,8 +254,10 @@ } xRet = xComponentLoader->loadComponentFromURL(_rLinkName,::rtl::OUString(),0,aArguments); } - catch(Exception& ) + catch(Exception& e) { + (void)e; + throw; } return xRet; @@ -338,6 +346,7 @@ { case ID_FORM_NEW_TEXT: aClassId = lcl_GetSequenceClassID(SO3_SW_CLASSID); + OSL_ENSURE(aClassId == comphelper::MimeConfigurationHelper::GetSequenceClassID(SO3_SW_CLASSID),"Not equal"); break; case ID_FORM_NEW_CALC: @@ -347,6 +356,12 @@ case ID_FORM_NEW_IMPRESS: aClassId = lcl_GetSequenceClassID(SO3_SIMPRESS_CLASSID); break; + case ID_REPORT_NEW_TEXT: + { + ::comphelper::MimeConfigurationHelper aConfigHelper(m_xORB); + aClassId = aConfigHelper.GetSequenceClassIDFromObjectName((::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Report")))); + } + break; case SID_DB_FORM_NEW_PILOT: default: @@ -388,9 +403,10 @@ } } } - catch(const Exception&) + catch(const Exception& ) { - OSL_ENSURE(sal_False, "OLinkedDocumentsAccess::newForm: caught an exception while loading the object!"); + DBG_UNHANDLED_EXCEPTION(); + // OSL_ENSURE(sal_False, "OLinkedDocumentsAccess::newForm: caught an exception while loading the object!"); } return xNewDocument; @@ -399,16 +415,49 @@ //------------------------------------------------------------------ Reference< XComponent > OLinkedDocumentsAccess::open(const ::rtl::OUString& _rLinkName,Reference< XComponent >& _xDefinition, EOpenMode _eOpenMode) { - Reference< XComponent > xRet = implOpen(_rLinkName,_xDefinition, _eOpenMode); + dbtools::SQLExceptionInfo aInfo; + Reference< XComponent > xRet; + try + { + xRet = implOpen(_rLinkName,_xDefinition, _eOpenMode); if ( !xRet.is() ) { String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); - ErrorBox aError(m_pDialogParent, WB_OK, sMessage); - aError.Execute(); + + com::sun::star::sdbc::SQLException aSQLException; + aSQLException.Message = sMessage; + // aSQLException.Context = e.Context; + aInfo = dbtools::SQLExceptionInfo(aSQLException); } return xRet; } + catch(Exception& e) + { + com::sun::star::sdbc::SQLException aSQLException; + aSQLException.Message = e.Message; + aSQLException.Context = e.Context; + aInfo = dbtools::SQLExceptionInfo(aSQLException); + + // more like a hack, insert an empty message + aInfo.prepend(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \n"))); + + String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); + sMessage.SearchAndReplaceAscii("$file$",_rLinkName); + aInfo.prepend(sMessage); + + // sMessage.SearchAndReplaceAscii("$file$",_rLinkName); + // ErrorBox aError(m_pDialogParent, WB_OK, sMessage); + // aError.Execute(); + } + if (aInfo.isValid()) + { + showError(aInfo, VCLUnoHelper::GetInterface(m_pDialogParent), m_xORB ); + } + return xRet; + } + + //...................................................................... } // namespace dbaui //...................................................................... --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
