Tag: cws_src680_oj14 User: oj Date: 06/03/20 06:00:38 Modified: /dba/dbaccess/source/ui/misc/ RtfReader.cxx
Log: RESYNC: (1.16-1.18); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: RtfReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/RtfReader.cxx?r1=1.16.4.2&r2=1.16.4.3 Delta lines: +25 -21 --------------------- --- RtfReader.cxx 20 Mar 2006 07:48:43 -0000 1.16.4.2 +++ RtfReader.cxx 20 Mar 2006 14:00:35 -0000 1.16.4.3 @@ -77,9 +77,6 @@ #ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTYPES_HPP_ #include <com/sun/star/util/XNumberFormatTypes.hpp> #endif -#ifndef _DBAUI_SQLMESSAGE_HXX_ -#include "sqlmessage.hxx" -#endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif @@ -169,6 +166,7 @@ rInput.Seek(STREAM_SEEK_TO_BEGIN); rInput.ResetError(); SvParserState eParseState = SvRTFParser::CallParser(); + SetColumnTypes(m_pColumnList,m_pInfoMap); return m_bFoundTable ? eParseState : SVPAR_ERROR; } // --------------------------------------------------------------------------- @@ -219,7 +217,17 @@ 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 + { + showErrorDialog(e); + } + } break; case RTF_INTBL: if(m_bInTbl) @@ -233,7 +241,15 @@ break; case RTF_CELL: { + try + { insertValueIntoColumn(); + } + catch(SQLException& e) + // UpdateFehlerbehandlung + { + showErrorDialog(e); + } m_nColumnPos++; m_sTextToken.Erase(); } @@ -252,19 +268,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]
