User: ihi     
Date: 2006/08/04 06:50:29

Modified:
   dba/connectivity/source/parse/sqlnode.cxx

Log:
 INTEGRATION: CWS dba204c (1.41.4); FILE MERGED
 2006/08/04 10:03:09 fs 1.41.4.2: #i68137# insert: really insert the given 
node, not NULL
 2006/08/01 14:05:41 fs 1.41.4.1: #i68034#

File Changes:

Directory: /dba/connectivity/source/parse/
==========================================

File [changed]: sqlnode.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.41&r2=1.42
Delta lines:  +6 -2
-------------------
--- sqlnode.cxx 13 Jul 2006 15:14:51 -0000      1.41
+++ sqlnode.cxx 4 Aug 2006 13:50:26 -0000       1.42
@@ -563,7 +563,11 @@
                {
                        const OSQLParseNode* pSubTree = *i;
                        if ( !pSubTree )
+            {
+                ++i;
                 continue;
+            }
+
                        SQLParseNodeParameter aNewParam(rParam);
 
                        // don't replace the field for subqueries
@@ -2330,7 +2334,7 @@
 
     // stelle Verbindung zum getParent her:
     pNewSubTree->setParent( this );
-    m_aChilds.insert(m_aChilds.begin() + nPos, 0);
+    m_aChilds.insert(m_aChilds.begin() + nPos, pNewSubTree);
 }
 
 // removeAt-Methoden




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

Reply via email to