User: obo     
Date: 2007/01/25 03:59:15

Modified:
   dba/dbaccess/source/core/api/column.cxx

Log:
 INTEGRATION: CWS dba22c (1.53.50); FILE MERGED
 2007/01/18 09:59:44 fs 1.53.50.1: #i71830# corrected appendObject

File Changes:

Directory: /dba/dbaccess/source/core/api/
=========================================

File [changed]: column.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/column.cxx?r1=1.53&r2=1.54
Delta lines:  +5 -2
-------------------
--- column.cxx  18 Oct 2006 13:26:47 -0000      1.53
+++ column.cxx  25 Jan 2007 11:59:12 -0000      1.54
@@ -758,6 +758,7 @@
        if ( xAppend.is() )
        {
                xAppend->appendByDescriptor(descriptor);
+        xReturn = createObject( _rForName );
        }
        else if ( m_pTable && !m_pTable->isNew() )
     {
@@ -766,13 +767,15 @@
         else
             ::dbtools::throwGenericSQLException( DBA_RES( 
RID_STR_NO_COLUMN_ADD ), static_cast<XChild*>(static_cast<TXChild*>(this)) );
     }
+    else
+        xReturn = cloneDescriptor( descriptor );
 
     if ( m_pColFactoryImpl )
                m_pColFactoryImpl->columnAppended( descriptor );
 
     ::dbaccess::notifyDataSourceModified(m_xParent,sal_True);
 
-    return xReturn.is() ? xReturn : createObject( _rForName );
+    return xReturn;
 }
 // -------------------------------------------------------------------------
 // XDrop




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

Reply via email to