diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:56:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:56:19 +0000 |
| commit | c4dabd8e701c15dda8824f6472afb4e062387301 (patch) | |
| tree | f6f654f4b03907a6f4893e46521faf72a6849016 /dbaccess | |
| parent | 2a45576598c63a71d2d66c387f6e305ca35449be (diff) | |
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
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/linkeddocuments.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 2aa2bb2dd17c..c91ffb0df93a 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: linkeddocuments.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.32 $ * * This file is part of OpenOffice.org. * @@ -474,8 +474,7 @@ namespace dbaui { 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 @@ namespace dbaui 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()) |