diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-16 14:29:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-16 14:29:07 +0000 |
| commit | 14ccf2a97abe106c16e2ab19e931d6929ade2d53 (patch) | |
| tree | 94ea3c83a8e4016541d74c23d9fe7f8e9147fb5d /dbaccess/source/ui/misc/RtfReader.cxx | |
| parent | c7ab5974e97ce409c1a2713ba849f623ac9b4c61 (diff) | |
INTEGRATION: CWS dba202b (1.16.46); FILE MERGED
2005/12/27 06:13:18 oj 1.16.46.1: #129316# ctach exception
Diffstat (limited to 'dbaccess/source/ui/misc/RtfReader.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 493b6e3fdab4..0b197a0d696c 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -4,9 +4,9 @@ * * $RCSfile: RtfReader.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2005-09-23 12:37:18 $ + * last change: $Author: obo $ $Date: 2006-01-16 15:29:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -219,7 +219,28 @@ void ORTFReader::NextToken( int nToken ) if(!m_xTable.is()) // erste Zeile als Header verwenden m_bError = !CreateTable(nToken); else - m_xResultSetUpdate->moveToInsertRow(); // sonst neue Zeile anh"angen + try + { + m_xResultSetUpdate->moveToInsertRow(); // sonst neue Zeile anh"angen + } + catch(SQLException& e) + ////////////////////////////////////////////////////////////////////// + // UpdateFehlerbehandlung + { + if(!m_bDontAskAgain) + { + String aMsg(e.Message); + aMsg += '\n'; + aMsg += String(ModuleRes(STR_QRY_CONTINUE)); + OSQLMessageBox aBox(NULL, String(ModuleRes(STR_STAT_WARNING)), + aMsg, WB_YES_NO | WB_DEF_NO, OSQLMessageBox::Warning); + + if (aBox.Execute() == RET_YES) + m_bDontAskAgain = TRUE; + else + m_bError = TRUE; + } + } break; case RTF_INTBL: if(m_bInTbl) |