Tag: cws_src680_reportdesign01 User: lla Date: 2007-09-25 05:31:03+0000 Modified: dba/dbaccess/source/ui/misc/linkeddocuments.cxx
Log: #i78099# no error window if user pressed cancel 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.1&r2=1.23.10.2 Delta lines: +24 -17 --------------------- --- linkeddocuments.cxx 2007-09-21 10:51:39+0000 1.23.10.1 +++ linkeddocuments.cxx 2007-09-25 05:31:01+0000 1.23.10.2 @@ -4,9 +4,9 @@ * * $RCSfile: linkeddocuments.cxx,v $ * - * $Revision: 1.23.10.1 $ + * $Revision: 1.23.10.2 $ * - * last change: $Author: oj $ $Date: 2007/09/21 10:51:39 $ + * last change: $Author: lla $ $Date: 2007/09/25 05:31:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -146,6 +146,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/io/WrongFormatException.hpp> #include "ExtensionNotPresent.hxx" +#include "com/sun/star/sdb/RowSetVetoException.hpp" //...................................................................... namespace dbaui @@ -444,6 +445,11 @@ //} catch(Exception& e) { + Any aAny = cppu::getCaughtException(); + com::sun::star::sdb::RowSetVetoException a; + if ((aAny >>= a) && + (a.ErrorCode != dbtools::ParameterInteractionCancelled)) + { com::sun::star::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; aSQLException.Context = e.Context; @@ -460,6 +466,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]
