Tag: cws_src680_dba202b User: oj Date: 05/12/26 22:13:22 Modified: /dba/dbaccess/source/ui/misc/ HtmlReader.cxx, RtfReader.cxx, TableCopyHelper.cxx
Log: #129316# ctach exception File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: HtmlReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/HtmlReader.cxx?r1=1.20&r2=1.20.46.1 Delta lines: +26 -4 -------------------- --- HtmlReader.cxx 23 Sep 2005 12:36:45 -0000 1.20 +++ HtmlReader.cxx 27 Dec 2005 06:13:16 -0000 1.20.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: HtmlReader.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.46.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:36:45 $ + * last change: $Author: oj $ $Date: 2005/12/27 06:13:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -313,7 +313,29 @@ break; case HTML_TABLEROW_ON: if ( m_xResultSetUpdate.is() ) + { + 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; + } + } + } else m_bError = sal_True; break; File [changed]: RtfReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/RtfReader.cxx?r1=1.16&r2=1.16.46.1 Delta lines: +25 -4 -------------------- --- RtfReader.cxx 23 Sep 2005 12:37:18 -0000 1.16 +++ RtfReader.cxx 27 Dec 2005 06:13:18 -0000 1.16.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: RtfReader.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.46.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:37:18 $ + * last change: $Author: oj $ $Date: 2005/12/27 06:13:18 $ * * 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 @@ if(!m_xTable.is()) // erste Zeile als Header verwenden m_bError = !CreateTable(nToken); else + 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) File [changed]: TableCopyHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TableCopyHelper.cxx?r1=1.4&r2=1.4.46.1 Delta lines: +5 -5 ------------------- --- TableCopyHelper.cxx 23 Sep 2005 12:37:33 -0000 1.4 +++ TableCopyHelper.cxx 27 Dec 2005 06:13:19 -0000 1.4.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableCopyHelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.46.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:37:33 $ + * last change: $Author: oj $ $Date: 2005/12/27 06:13:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -311,10 +311,10 @@ case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: - FILL_PARAM( ::rtl::OUString, etString) - break; case DataType::DECIMAL: case DataType::NUMERIC: + FILL_PARAM( ::rtl::OUString, etString) + break; case DataType::DOUBLE: case DataType::REAL: FILL_PARAM( double, etDouble) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
