User: obo     
Date: 06/01/16 07:29:10

Modified:
 /dba/dbaccess/source/ui/misc/
  RtfReader.cxx

Log:
 INTEGRATION: CWS dba202b (1.16.46); FILE MERGED
 2005/12/27 06:13:18 oj 1.16.46.1: #129316# ctach exception

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&r2=1.17
Delta lines:  +22 -1
--------------------
--- RtfReader.cxx       23 Sep 2005 12:37:18 -0000      1.16
+++ RtfReader.cxx       16 Jan 2006 15:29:07 -0000      1.17
@@ -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)




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to