User: ihi     
Date: 2006/08/22 05:52:13

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

Log:
 INTEGRATION: CWS dba204d_SRC680 (1.15.30); FILE MERGED
 2006/08/15 10:37:43 fs 1.15.30.1: find cases like #i68601# easier in 
non-product versions

File Changes:

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

File [changed]: SingleSelectQueryComposer.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.16&r2=1.17
Delta lines:  +2 -1
-------------------
--- SingleSelectQueryComposer.cxx       15 Aug 2006 10:42:50 -0000      1.16
+++ SingleSelectQueryComposer.cxx       22 Aug 2006 12:52:10 -0000      1.17
@@ -791,7 +791,8 @@
         typedef ::std::set< size_t > SizeTSet;
         SizeTSet aUsedSelectColumns;
 
-               sal_Int32 nCount = xResultSetMeta.is() ? 
xResultSetMeta->getColumnCount() : sal_Int32(0);
+               sal_Int32 nCount = xResultSetMeta->getColumnCount();
+        OSL_ENSURE( nCount == aSelectColumns->size(), 
"OSingleSelectQueryComposer::getColumns: inconsistent column counts, this might 
result in wrong columns!" );
                for(sal_Int32 i=1;i<=nCount;++i)
                {
                        ::rtl::OUString sName = 
xResultSetMeta->getColumnName(i);




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

Reply via email to