Tag: cws_oog680_rpt23fix06 User: oj Date: 2007-08-29 11:21:48+0000 Modified: dba/dbaccess/source/ui/inc/ExtensionNotPresent.hxx dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: #i81105# fix for absent extension File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: ExtensionNotPresent.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/ExtensionNotPresent.hxx?r1=1.2&r2=1.2.36.1 Delta lines: +4 -2 ------------------- --- ExtensionNotPresent.hxx 2007-07-06 08:22:13+0000 1.2 +++ ExtensionNotPresent.hxx 2007-08-29 11:21:45+0000 1.2.36.1 @@ -6,9 +6,9 @@ * * $RCSfile: ExtensionNotPresent.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.36.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:22:13 $ + * last change: $Author: oj $ $Date: 2007/08/29 11:21:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -98,6 +98,8 @@ OExtensionNotPresentDialog( Window* pParent, com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > ); virtual ~OExtensionNotPresentDialog(); virtual short Execute(); + + inline String getText() const { return m_aFT_TEXT.GetText(); } }; // ============================================================================= } // namespace rptui 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.23.16.1 Delta lines: +23 -8 -------------------- --- linkeddocuments.cxx 2007-08-03 10:23:25+0000 1.23 +++ linkeddocuments.cxx 2007-08-29 11:21:45+0000 1.23.16.1 @@ -4,9 +4,9 @@ * * $RCSfile: linkeddocuments.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.23.16.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 10:23:25 $ + * last change: $Author: oj $ $Date: 2007/08/29 11:21:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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]
