Tag: cws_src680_reportdesign01 User: oj Date: 2007-10-15 08:52:16+0000 Modified: dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: RESYNC: (1.23-1.24); FILE MERGED 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.23.10.4&r2=1.23.10.5 Delta lines: +37 -28 --------------------- --- linkeddocuments.cxx 2007-10-11 06:28:04+0000 1.23.10.4 +++ linkeddocuments.cxx 2007-10-15 08:52:14+0000 1.23.10.5 @@ -43,7 +43,7 @@ #include <osl/diagnose.h> #endif #include <tools/diagnose_ex.h> - +#include <unotools/confignode.hxx> #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif @@ -439,18 +439,28 @@ } return xRet; } - //catch (com::sun::star::io::WrongFormatException e) - //{ + catch (com::sun::star::io::WrongFormatException 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 + OExtensionNotPresentDialog aDlg(m_pDialogParent, m_xORB); + + String sText = aDlg.getText(); + sText = sText.GetToken(0,'\n'); + aInfo.prepend(sText); + + String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); + sMessage.SearchAndReplaceAscii("$file$",_rLinkName); + aInfo.prepend(sMessage); // OExtensionNotPresentDialog aDlg(m_pDialogParent, m_xORB); // aDlg.Execute(); - //} + } catch(Exception& e) { - Any aAny = ::cppu::getCaughtException(); - com::sun::star::sdbc::SQLException a; - if ((aAny >>= a) && - (a.ErrorCode != dbtools::ParameterInteractionCancelled)) - { com::sun::star::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; aSQLException.Context = e.Context; @@ -467,7 +477,6 @@ // ErrorBox aError(m_pDialogParent, WB_OK, sMessage); // aError.Execute(); } - } if (aInfo.isValid()) { showError(aInfo, VCLUnoHelper::GetInterface(m_pDialogParent), m_xORB ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
