Tag: cws_src680_reportdesign01 User: lla Date: 2007-10-25 08:56:28+0000 Modified: dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: #i78099# merge problem fixed 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.5&r2=1.23.10.6 Delta lines: +28 -22 --------------------- --- linkeddocuments.cxx 2007-10-15 08:52:14+0000 1.23.10.5 +++ linkeddocuments.cxx 2007-10-25 08:56:26+0000 1.23.10.6 @@ -4,9 +4,9 @@ * * $RCSfile: linkeddocuments.cxx,v $ * - * $Revision: 1.23.10.5 $ + * $Revision: 1.23.10.6 $ * - * last change: $Author: oj $ $Date: 2007/10/15 08:52:14 $ + * last change: $Author: lla $ $Date: 2007/10/25 08:56:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -461,6 +461,11 @@ } 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; @@ -477,6 +482,7 @@ // 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]
