Tag: cws_src680_oj14 User: oj Date: 06/03/20 06:00:14 Modified: /dba/dbaccess/source/ui/misc/ HtmlReader.cxx
Log: RESYNC: (1.20-1.22); FILE MERGED 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.4.2&r2=1.20.4.3 Delta lines: +25 -24 --------------------- --- HtmlReader.cxx 20 Mar 2006 07:48:41 -0000 1.20.4.2 +++ HtmlReader.cxx 20 Mar 2006 14:00:11 -0000 1.20.4.3 @@ -98,12 +98,6 @@ #ifndef _HTMLKYWD_HXX #include <svtools/htmlkywd.hxx> #endif -#ifndef _DBAUI_SQLMESSAGE_HXX_ -#include "sqlmessage.hxx" -#endif -#ifndef _SV_MSGBOX_HXX -#include <vcl/msgbox.hxx> -#endif #ifndef _TOOLS_COLOR_HXX #include <tools/color.hxx> #endif @@ -246,6 +240,7 @@ rInput.Seek(STREAM_SEEK_TO_BEGIN); rInput.ResetError(); SvParserState eParseState = HTMLParser::CallParser(); + SetColumnTypes(m_pColumnList,m_pInfoMap); return m_bFoundTable ? eParseState : SVPAR_ERROR; } // ----------------------------------------------------------------------------- @@ -313,7 +308,17 @@ break; case HTML_TABLEROW_ON: if ( m_xResultSetUpdate.is() ) + { + try + { m_xResultSetUpdate->moveToInsertRow(); // sonst neue Zeile anh"angen + } + catch(SQLException& e) + // UpdateFehlerbehandlung + { + showErrorDialog(e); + } + } else m_bError = sal_True; break; @@ -350,7 +355,15 @@ break; case HTML_TABLEDATA_OFF: { + try + { insertValueIntoColumn(); + } + catch(SQLException& e) + // UpdateFehlerbehandlung + { + showErrorDialog(e); + } m_nColumnPos++; m_sTextToken.Erase(); m_bSDNum = m_bInTbl = sal_False; @@ -373,19 +386,7 @@ ////////////////////////////////////////////////////////////////////// // 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; - } + showErrorDialog(e); } m_nColumnPos = 0; break; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
