User: vg Date: 2007-08-31 09:15:35+0000 Modified: dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: INTEGRATION: CWS rpt23fix06_SRC680 (1.23.16); FILE MERGED 2007/08/29 11:21:45 oj 1.23.16.1: #i81105# fix for absent extension 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&r2=1.24 Delta lines: +20 -5 -------------------- --- linkeddocuments.cxx 2007-08-03 10:23:25+0000 1.23 +++ linkeddocuments.cxx 2007-08-31 09:15:32+0000 1.24 @@ -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 @@ -431,11 +431,26 @@ } 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) { com::sun::star::sdbc::SQLException aSQLException; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
