[Libreoffice-commits] .: dbaccess/source

[David Tardon]

 dbaccess/source/core/api/CRowSetColumn.cxx     |    3 ++-
 dbaccess/source/core/api/CRowSetDataColumn.cxx |    5 +++--
 dbaccess/source/core/api/definitioncolumn.cxx  |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 2701c05e85fde40433a089662ba0574c433e5a37
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 10 12:39:01 2011 +0100

    fix debug build breakage

diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index e464648..444169c 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -78,7 +78,8 @@ ORowSetColumn::ORowSetColumn(	const Reference < XResultSetMetaData >& _xMetaData
     DECL_PROP1( TYPE,                       sal_Int32,          READONLY );
     DECL_PROP1( TYPENAME,                   ::rtl::OUString,    READONLY );
     DECL_PROP2( VALUE,                      Any,                READONLY, BOUND );
-    OSL_ENSURE( nPos == nDerivedProperties, "ORowSetColumn::createArrayHelper: inconsistency!" );
+
+    END_PROPERTY_SEQUENCE()
 
     Sequence< Property > aRegisteredProperties;
     describeProperties( aRegisteredProperties );
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 333a8f4..9e6bfe8 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -77,7 +77,7 @@ ORowSetDataColumn::~ORowSetDataColumn()
 // comphelper::OPropertyArrayUsageHelper
 ::cppu::IPropertyArrayHelper* ORowSetDataColumn::createArrayHelper( ) const
 {
-    BEGIN_PROPERTY_HELPER(21)
+    BEGIN_PROPERTY_SEQUENCE(21)
 
     DECL_PROP1( CATALOGNAME,                ::rtl::OUString,    READONLY );
     DECL_PROP1( DISPLAYSIZE,                sal_Int32,          READONLY );
@@ -100,7 +100,8 @@ ORowSetDataColumn::~ORowSetDataColumn()
     DECL_PROP1( TYPE,                       sal_Int32,          READONLY );
     DECL_PROP1( TYPENAME,                   ::rtl::OUString,    READONLY );
     DECL_PROP1( VALUE,                      Any,                BOUND );
-    OSL_ENSURE( nPos == nDerivedProperties, "ORowSetDataColumn::createArrayHelper: inconsistency!" );
+
+    END_PROPERTY_SEQUENCE()
 
     Sequence< Property > aRegisteredProperties;
     describeProperties( aRegisteredProperties );
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index bf7c39d..c0db663 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -496,7 +496,7 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa
         DECL_PROP0_BOOL( ISROWVERSION );
     }
 
-    OSL_ENSURE( nPos == nPropertyCount, "OTableColumnDescriptorWrapper::createArrayHelper: something went wrong!" );
+    END_PROPERTY_SEQUENCE()
 
     if ( !m_bIsDescriptor )
     {