User: vg Date: 2008-08-19 09:56:21+0000 Modified: dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: INTEGRATION: CWS dba31a (1.31.6); FILE MERGED 2008/07/07 12:24:25 oj 1.31.6.1: #i85664# show error when opening a doc 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.31&r2=1.32 Delta lines: +1 -6 ------------------- --- linkeddocuments.cxx 2008-06-25 14:52:32+0000 1.31 +++ linkeddocuments.cxx 2008-08-19 09:56:19+0000 1.32 @@ -474,8 +474,7 @@ { Any aAny = ::cppu::getCaughtException(); com::sun::star::sdbc::SQLException a; - if ((aAny >>= a) && - (a.ErrorCode != dbtools::ParameterInteractionCancelled)) + if ( !(aAny >>= a) || (a.ErrorCode != dbtools::ParameterInteractionCancelled) ) { com::sun::star::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; @@ -488,10 +487,6 @@ 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()) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
