Tag: cws_src680_warnings01 User: fs Date: 06/06/14 03:56:28 Modified: /dba/connectivity/source/drivers/hsqldb/ HColumns.cxx, HTable.cxx /dba/connectivity/source/drivers/mysql/ YColumns.cxx, YTable.cxx /dba/connectivity/source/inc/hsqldb/ HColumns.hxx, HTable.hxx /dba/connectivity/source/inc/mysql/ YColumns.hxx, YTable.hxx /dba/connectivity/source/parse/ PColumn.cxx /dba/connectivity/source/sdbcx/ VColumn.cxx, VDescriptor.cxx, VIndex.cxx, VIndexColumn.cxx, VKey.cxx, VKeyColumn.cxx, VTable.cxx, VView.cxx
Log: #i66367# reverted previous changes related to replacing IdPropertyArrayHelper with PropertyArrayHelper - there's a subtle difference between both ids ... File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HColumns.cxx?r1=1.4.30.1&r2=1.4.30.2 Delta lines: +9 -12 -------------------- --- HColumns.cxx 16 Nov 2005 12:59:05 -0000 1.4.30.1 +++ HColumns.cxx 14 Jun 2006 10:56:21 -0000 1.4.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: HColumns.cxx,v $ * - * $Revision: 1.4.30.1 $ + * $Revision: 1.4.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:05 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,17 +77,14 @@ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OHSQLColumn::createArrayHelper() const +::cppu::IPropertyArrayHelper* OHSQLColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL OHSQLColumn::getInfoHelper() { - return *OHSQLColumn_PROP::getArrayHelper(); + return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException) File [changed]: HTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HTable.cxx?r1=1.6.10.3&r2=1.6.10.4 Delta lines: +5 -8 ------------------- --- HTable.cxx 16 Nov 2005 12:59:06 -0000 1.6.10.3 +++ HTable.cxx 14 Jun 2006 10:56:21 -0000 1.6.10.4 @@ -4,9 +4,9 @@ * * $RCSfile: HTable.cxx,v $ * - * $Revision: 1.6.10.3 $ + * $Revision: 1.6.10.4 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:06 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -152,17 +152,14 @@ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OHSQLTable::createArrayHelper() const +::cppu::IPropertyArrayHelper* OHSQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & OHSQLTable::getInfoHelper() { - return *static_cast<OHSQLTable_PROP*>(const_cast<OHSQLTable*>(this))->getArrayHelper(); + return *static_cast<OHSQLTable_PROP*>(const_cast<OHSQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames) Directory: /dba/connectivity/source/drivers/mysql/ ================================================== File [changed]: YColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mysql/YColumns.cxx?r1=1.3.30.1&r2=1.3.30.2 Delta lines: +5 -8 ------------------- --- YColumns.cxx 16 Nov 2005 12:59:17 -0000 1.3.30.1 +++ YColumns.cxx 14 Jun 2006 10:56:22 -0000 1.3.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: YColumns.cxx,v $ * - * $Revision: 1.3.30.1 $ + * $Revision: 1.3.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:17 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,17 +77,14 @@ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OMySQLColumn::createArrayHelper() const +::cppu::IPropertyArrayHelper* OMySQLColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL OMySQLColumn::getInfoHelper() { - return *OMySQLColumn_PROP::getArrayHelper(); + return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException) File [changed]: YTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mysql/YTable.cxx?r1=1.6.30.2&r2=1.6.30.3 Delta lines: +5 -8 ------------------- --- YTable.cxx 16 Nov 2005 12:59:18 -0000 1.6.30.2 +++ YTable.cxx 14 Jun 2006 10:56:22 -0000 1.6.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: YTable.cxx,v $ * - * $Revision: 1.6.30.2 $ + * $Revision: 1.6.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:18 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -152,17 +152,14 @@ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OMySQLTable::createArrayHelper() const +::cppu::IPropertyArrayHelper* OMySQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & OMySQLTable::getInfoHelper() { - return *static_cast<OMySQLTable_PROP*>(const_cast<OMySQLTable*>(this))->getArrayHelper(); + return *static_cast<OMySQLTable_PROP*>(const_cast<OMySQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- sdbcx::OCollection* OMySQLTable::createColumns(const TStringVector& _rNames) Directory: /dba/connectivity/source/inc/hsqldb/ =============================================== File [changed]: HColumns.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/hsqldb/HColumns.hxx?r1=1.3.30.1&r2=1.3.30.2 Delta lines: +6 -7 ------------------- --- HColumns.hxx 16 Nov 2005 12:59:26 -0000 1.3.30.1 +++ HColumns.hxx 14 Jun 2006 10:56:22 -0000 1.3.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: HColumns.hxx,v $ * - * $Revision: 1.3.30.1 $ + * $Revision: 1.3.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:26 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,7 +34,6 @@ ************************************************************************/ #ifndef CONNECTIVITY_HSQLDB_COLUMN_HXX #define CONNECTIVITY_HSQLDB_COLUMN_HXX - #ifndef CONNECTIVITY_COLUMNSHELPER_HXX #include "connectivity/TColumnsHelper.hxx" #endif @@ -61,14 +60,14 @@ class OHSQLColumn; typedef sdbcx::OColumn OHSQLColumn_BASE; - typedef ::comphelper::OPropertyArrayUsageHelper<OHSQLColumn> OHSQLColumn_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OHSQLColumn> OHSQLColumn_PROP; - class OHSQLColumn :public OHSQLColumn_BASE - ,public OHSQLColumn_PROP + class OHSQLColumn : public OHSQLColumn_BASE, + public OHSQLColumn_PROP { ::rtl::OUString m_sAutoIncrement; protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: File [changed]: HTable.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/hsqldb/HTable.hxx?r1=1.5.20.1&r2=1.5.20.2 Delta lines: +6 -6 ------------------- --- HTable.hxx 16 Nov 2005 12:59:26 -0000 1.5.20.1 +++ HTable.hxx 14 Jun 2006 10:56:22 -0000 1.5.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: HTable.hxx,v $ * - * $Revision: 1.5.20.1 $ + * $Revision: 1.5.20.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:26 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,8 +42,8 @@ #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ -#include <comphelper/proparrhlp.hxx> +#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX +#include <comphelper/IdPropArrayHelper.hxx> #endif namespace connectivity @@ -54,7 +54,7 @@ ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OHSQLTable; - typedef ::comphelper::OPropertyArrayUsageHelper< OHSQLTable > OHSQLTable_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper< OHSQLTable > OHSQLTable_PROP; class OHSQLTable : public OTableHelper ,public OHSQLTable_PROP { @@ -94,7 +94,7 @@ assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. @return an pointer to the newly created array helper. Must not be NULL. */ - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: Directory: /dba/connectivity/source/inc/mysql/ ============================================== File [changed]: YColumns.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/mysql/YColumns.hxx?r1=1.3.30.1&r2=1.3.30.2 Delta lines: +4 -4 ------------------- --- YColumns.hxx 16 Nov 2005 12:59:26 -0000 1.3.30.1 +++ YColumns.hxx 14 Jun 2006 10:56:23 -0000 1.3.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: YColumns.hxx,v $ * - * $Revision: 1.3.30.1 $ + * $Revision: 1.3.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:26 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,14 +60,14 @@ class OMySQLColumn; typedef sdbcx::OColumn OMySQLColumn_BASE; - typedef ::comphelper::OPropertyArrayUsageHelper<OMySQLColumn> OMySQLColumn_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OMySQLColumn> OMySQLColumn_PROP; class OMySQLColumn : public OMySQLColumn_BASE, public OMySQLColumn_PROP { ::rtl::OUString m_sAutoIncrement; protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: File [changed]: YTable.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/mysql/YTable.hxx?r1=1.3.30.1&r2=1.3.30.2 Delta lines: +6 -6 ------------------- --- YTable.hxx 16 Nov 2005 12:59:27 -0000 1.3.30.1 +++ YTable.hxx 14 Jun 2006 10:56:23 -0000 1.3.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: YTable.hxx,v $ * - * $Revision: 1.3.30.1 $ + * $Revision: 1.3.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:27 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,8 +42,8 @@ #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ -#include <comphelper/proparrhlp.hxx> +#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX +#include <comphelper/IdPropArrayHelper.hxx> #endif namespace connectivity @@ -54,7 +54,7 @@ ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OMySQLTable; - typedef ::comphelper::OPropertyArrayUsageHelper< OMySQLTable > OMySQLTable_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper< OMySQLTable > OMySQLTable_PROP; class OMySQLTable : public OTableHelper ,public OMySQLTable_PROP { @@ -94,7 +94,7 @@ assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. @return an pointer to the newly created array helper. Must not be NULL. */ - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: PColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/PColumn.cxx?r1=1.11.30.1&r2=1.11.30.2 Delta lines: +7 -11 -------------------- --- PColumn.cxx 16 Nov 2005 12:59:28 -0000 1.11.30.1 +++ PColumn.cxx 14 Jun 2006 10:56:23 -0000 1.11.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: PColumn.cxx,v $ * - * $Revision: 1.11.30.1 $ + * $Revision: 1.11.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:28 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,14 +116,12 @@ // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL OParseColumn::getInfoHelper() { + OSL_ENSURE( !isNew(), "OParseColumn::OOrderColumn: a *new* OrderColumn?" ); return *OParseColumn_PROP::getArrayHelper(); } // ----------------------------------------------------------------------------- @@ -185,14 +183,12 @@ // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL OOrderColumn::getInfoHelper() { + OSL_ENSURE( !isNew(), "OOrderColumn::OOrderColumn: a *new* OrderColumn?" ); return *OOrderColumn_PROP::getArrayHelper(); } // ----------------------------------------------------------------------------- Directory: /dba/connectivity/source/sdbcx/ ========================================== File [changed]: VColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VColumn.cxx?r1=1.15.30.2&r2=1.15.30.3 Delta lines: +5 -8 ------------------- --- VColumn.cxx 16 Nov 2005 12:59:31 -0000 1.15.30.2 +++ VColumn.cxx 14 Jun 2006 10:56:24 -0000 1.15.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: VColumn.cxx,v $ * - * $Revision: 1.15.30.2 $ + * $Revision: 1.15.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:31 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -133,17 +133,14 @@ { } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OColumn::createArrayHelper() const +::cppu::IPropertyArrayHelper* OColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& SAL_CALL OColumn::getInfoHelper() { - return *OColumn_PROP::getArrayHelper(); + return *OColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- void SAL_CALL OColumn::acquire() throw() File [changed]: VDescriptor.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VDescriptor.cxx?r1=1.4.30.1&r2=1.4.30.2 Delta lines: +38 -2 -------------------- --- VDescriptor.cxx 7 Nov 2005 14:44:16 -0000 1.4.30.1 +++ VDescriptor.cxx 14 Jun 2006 10:56:24 -0000 1.4.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VDescriptor.cxx,v $ * - * $Revision: 1.4.30.1 $ + * $Revision: 1.4.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/07 14:44:16 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,9 @@ #include <cppuhelper/queryinterface.hxx> #endif +#include <functional> +#include <algorithm> + namespace connectivity { namespace sdbcx @@ -75,6 +78,39 @@ if ( xTunnel.is() ) return reinterpret_cast< ODescriptor* >( xTunnel->getSomething( getUnoTunnelImplementationId() ) ); return NULL; + } + + // ----------------------------------------------------------------------------- + namespace + { + struct ResetROAttribute : public ::std::unary_function< Property, void > + { + void operator ()( Property& _rProperty ) const + { + _rProperty.Attributes &= ~PropertyAttribute::READONLY; + } + }; + struct SetROAttribute : public ::std::unary_function< Property, void > + { + void operator ()( Property& _rProperty ) const + { + _rProperty.Attributes |= PropertyAttribute::READONLY; + } + }; + } + + // ----------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* ODescriptor::doCreateArrayHelper() const + { + Sequence< Property > aProperties; + describeProperties( aProperties ); + + if ( isNew() ) + ::std::for_each( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), ResetROAttribute() ); + else + ::std::for_each( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), SetROAttribute() ); + + return new ::cppu::OPropertyArrayHelper( aProperties ); } // ----------------------------------------------------------------------------- File [changed]: VIndex.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VIndex.cxx?r1=1.15.30.2&r2=1.15.30.3 Delta lines: +5 -8 ------------------- --- VIndex.cxx 16 Nov 2005 12:59:32 -0000 1.15.30.2 +++ VIndex.cxx 14 Jun 2006 10:56:24 -0000 1.15.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: VIndex.cxx,v $ * - * $Revision: 1.15.30.2 $ + * $Revision: 1.15.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:32 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,17 +127,14 @@ delete m_pColumns; } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OIndex::createArrayHelper() const +::cppu::IPropertyArrayHelper* OIndex::createArrayHelper( sal_Int32 /*_nId*/ ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& SAL_CALL OIndex::getInfoHelper() { - return *OIndex_PROP::getArrayHelper(); + return *OIndex_PROP::getArrayHelper(isNew() ? 1 : 0); } // ------------------------------------------------------------------------- Any SAL_CALL OIndex::queryInterface( const Type & rType ) throw(RuntimeException) File [changed]: VIndexColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VIndexColumn.cxx?r1=1.9.30.1&r2=1.9.30.2 Delta lines: +5 -8 ------------------- --- VIndexColumn.cxx 16 Nov 2005 12:59:32 -0000 1.9.30.1 +++ VIndexColumn.cxx 14 Jun 2006 10:56:24 -0000 1.9.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VIndexColumn.cxx,v $ * - * $Revision: 1.9.30.1 $ + * $Revision: 1.9.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:32 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,17 +107,14 @@ construct(); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OIndexColumn::createArrayHelper() const +::cppu::IPropertyArrayHelper* OIndexColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& SAL_CALL OIndexColumn::getInfoHelper() { - return *OIndexColumn_PROP::getArrayHelper(); + return *OIndexColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ------------------------------------------------------------------------- void OIndexColumn::construct() File [changed]: VKey.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VKey.cxx?r1=1.14.30.2&r2=1.14.30.3 Delta lines: +5 -8 ------------------- --- VKey.cxx 16 Nov 2005 12:59:32 -0000 1.14.30.2 +++ VKey.cxx 14 Jun 2006 10:56:24 -0000 1.14.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: VKey.cxx,v $ * - * $Revision: 1.14.30.2 $ + * $Revision: 1.14.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:32 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -168,17 +168,14 @@ ODescriptor_BASE::disposing(); } // ------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OKey::createArrayHelper() const +::cppu::IPropertyArrayHelper* OKey::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & OKey::getInfoHelper() { - return *const_cast<OKey*>(this)->getArrayHelper(); + return *const_cast<OKey*>(this)->getArrayHelper(isNew() ? 1 : 0); } // ------------------------------------------------------------------------- Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OKey::getColumns( ) throw(RuntimeException) File [changed]: VKeyColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VKeyColumn.cxx?r1=1.10.30.1&r2=1.10.30.2 Delta lines: +5 -8 ------------------- --- VKeyColumn.cxx 16 Nov 2005 12:59:33 -0000 1.10.30.1 +++ VKeyColumn.cxx 14 Jun 2006 10:56:24 -0000 1.10.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VKeyColumn.cxx,v $ * - * $Revision: 1.10.30.1 $ + * $Revision: 1.10.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:33 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,17 +112,14 @@ { } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OKeyColumn::createArrayHelper() const +::cppu::IPropertyArrayHelper* OKeyColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& SAL_CALL OKeyColumn::getInfoHelper() { - return *OKeyColumn_PROP::getArrayHelper(); + return *OKeyColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ------------------------------------------------------------------------- void OKeyColumn::construct() File [changed]: VTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VTable.cxx?r1=1.18.30.2&r2=1.18.30.3 Delta lines: +5 -8 ------------------- --- VTable.cxx 16 Nov 2005 12:59:33 -0000 1.18.30.2 +++ VTable.cxx 14 Jun 2006 10:56:25 -0000 1.18.30.3 @@ -4,9 +4,9 @@ * * $RCSfile: VTable.cxx,v $ * - * $Revision: 1.18.30.2 $ + * $Revision: 1.18.30.3 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:33 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -252,17 +252,14 @@ return m_pKeys; } // ----------------------------------------------------------------------------- -cppu::IPropertyArrayHelper* OTable::createArrayHelper() const +cppu::IPropertyArrayHelper* OTable::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ------------------------------------------------------------------------- cppu::IPropertyArrayHelper & OTable::getInfoHelper() { - return *const_cast<OTable*>(this)->getArrayHelper(); + return *const_cast<OTable*>(this)->getArrayHelper(isNew() ? 1 : 0); } // ------------------------------------------------------------------------- Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor( ) throw(RuntimeException) File [changed]: VView.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VView.cxx?r1=1.13.30.1&r2=1.13.30.2 Delta lines: +5 -8 ------------------- --- VView.cxx 16 Nov 2005 12:59:33 -0000 1.13.30.1 +++ VView.cxx 14 Jun 2006 10:56:25 -0000 1.13.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VView.cxx,v $ * - * $Revision: 1.13.30.1 $ + * $Revision: 1.13.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:59:33 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:56:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -125,17 +125,14 @@ return aRet.hasValue() ? aRet : ODescriptor::queryInterface( rType); } // ------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OView::createArrayHelper() const +::cppu::IPropertyArrayHelper* OView::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & OView::getInfoHelper() { - return *const_cast<OView*>(this)->getArrayHelper(); + return *const_cast<OView*>(this)->getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
