Tag: cws_src680_warnings01 User: fs Date: 06/06/14 03:54:21 Modified: /dba/connectivity/inc/connectivity/sdbcx/ VColumn.hxx, VIndex.hxx, VIndexColumn.hxx, VKey.hxx, VKeyColumn.hxx, VTable.hxx, VView.hxx
Log: #i66367# reverted previous changes related to replacing IdPropertyArrayHelper with PropertyArrayHelper - there's a subtle difference between both ids ... File Changes: Directory: /dba/connectivity/inc/connectivity/sdbcx/ ==================================================== File [changed]: VColumn.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VColumn.hxx?r1=1.12.30.1&r2=1.12.30.2 Delta lines: +4 -7 ------------------- --- VColumn.hxx 16 Nov 2005 12:58:41 -0000 1.12.30.1 +++ VColumn.hxx 14 Jun 2006 10:54:17 -0000 1.12.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VColumn.hxx,v $ * - * $Revision: 1.12.30.1 $ + * $Revision: 1.12.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:41 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:54:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,16 +62,13 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ -#include <comphelper/proparrhlp.hxx> -#endif namespace connectivity { namespace sdbcx { class OColumn; - typedef ::comphelper::OPropertyArrayUsageHelper<OColumn> OColumn_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OColumn> OColumn_PROP; typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo> OColumnDescriptor_BASE; @@ -99,7 +96,7 @@ sal_Bool m_IsCurrency; using OColumnDescriptor_BASE::rBHelper; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); virtual ~OColumn(); File [changed]: VIndex.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VIndex.hxx?r1=1.10.30.1&r2=1.10.30.2 Delta lines: +6 -6 ------------------- --- VIndex.hxx 16 Nov 2005 12:58:42 -0000 1.10.30.1 +++ VIndex.hxx 14 Jun 2006 10:54:17 -0000 1.10.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VIndex.hxx,v $ * - * $Revision: 1.10.30.1 $ + * $Revision: 1.10.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:42 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:54:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,8 +48,8 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> #endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ -#include <comphelper/proparrhlp.hxx> +#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX +#include <comphelper/IdPropArrayHelper.hxx> #endif #ifndef _CPPUHELPER_COMPBASE2_HXX_ #include <cppuhelper/compbase2.hxx> @@ -86,7 +86,7 @@ class OCollection; class OIndex; typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OIndex_BASE; - typedef ::comphelper::OPropertyArrayUsageHelper<OIndex> OIndex_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndex> OIndex_PROP; class OIndex : public comphelper::OBaseMutex, public ODescriptor_BASE, @@ -106,7 +106,7 @@ using ODescriptor_BASE::rBHelper; virtual void refreshColumns(); // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OIndex(sal_Bool _bCase); File [changed]: VIndexColumn.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx?r1=1.6.30.1&r2=1.6.30.2 Delta lines: +4 -5 ------------------- --- VIndexColumn.hxx 16 Nov 2005 12:58:42 -0000 1.6.30.1 +++ VIndexColumn.hxx 14 Jun 2006 10:54:18 -0000 1.6.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VIndexColumn.hxx,v $ * - * $Revision: 1.6.30.1 $ + * $Revision: 1.6.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:42 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:54:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,21 +39,20 @@ #ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ #include "connectivity/sdbcx/VColumn.hxx" #endif -#include <comphelper/proparrhlp.hxx> namespace connectivity { namespace sdbcx { class OIndexColumn; - typedef ::comphelper::OPropertyArrayUsageHelper<OIndexColumn> OIndexColumn_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndexColumn> OIndexColumn_PROP; class OIndexColumn : public OColumn, public OIndexColumn_PROP { protected: sal_Bool m_IsAscending; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OIndexColumn( sal_Bool _bCase); File [changed]: VKey.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VKey.hxx?r1=1.10.30.1&r2=1.10.30.2 Delta lines: +7 -5 ------------------- --- VKey.hxx 16 Nov 2005 12:58:42 -0000 1.10.30.1 +++ VKey.hxx 14 Jun 2006 10:54:18 -0000 1.10.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VKey.hxx,v $ * - * $Revision: 1.10.30.1 $ + * $Revision: 1.10.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:42 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:54:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,9 @@ #define _CONNECTIVITY_SDBCX_KEY_HXX_ -#include <comphelper/proparrhlp.hxx> +#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX +#include <comphelper/IdPropArrayHelper.hxx> +#endif #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" #endif @@ -74,7 +76,7 @@ class OKey : public comphelper::OBaseMutex, public ODescriptor_BASE, public IRefreshableColumns, - public ::comphelper::OPropertyArrayUsageHelper<OKey>, + public ::comphelper::OIdPropertyArrayUsageHelper<OKey>, public ODescriptor, public OKey_BASE { @@ -88,7 +90,7 @@ using ODescriptor_BASE::rBHelper; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: File [changed]: VKeyColumn.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx?r1=1.7.30.1&r2=1.7.30.2 Delta lines: +4 -4 ------------------- --- VKeyColumn.hxx 16 Nov 2005 12:58:42 -0000 1.7.30.1 +++ VKeyColumn.hxx 14 Jun 2006 10:54:18 -0000 1.7.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VKeyColumn.hxx,v $ * - * $Revision: 1.7.30.1 $ + * $Revision: 1.7.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:42 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:54:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,14 +45,14 @@ namespace sdbcx { class OKeyColumn; - typedef ::comphelper::OPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP; class OKeyColumn : public OColumn, public OKeyColumn_PROP { protected: ::rtl::OUString m_ReferencedColumn; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OKeyColumn(sal_Bool _bCase); File [changed]: VTable.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VTable.hxx?r1=1.12.30.1&r2=1.12.30.2 Delta lines: +7 -7 ------------------- --- VTable.hxx 16 Nov 2005 12:58:42 -0000 1.12.30.1 +++ VTable.hxx 14 Jun 2006 10:54:18 -0000 1.12.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VTable.hxx,v $ * - * $Revision: 1.12.30.1 $ + * $Revision: 1.12.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:42 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:54:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,8 +54,8 @@ #ifndef _COM_SUN_STAR_SDBCX_XKEYSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ -#include <comphelper/proparrhlp.hxx> +#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX +#include <comphelper/IdPropArrayHelper.hxx> #endif #ifndef _CPPUHELPER_COMPBASE4_HXX_ #include <cppuhelper/compbase4.hxx> @@ -100,7 +100,7 @@ ::com::sun::star::sdbcx::XRename, ::com::sun::star::sdbcx::XAlterTable > OTable_BASE; - typedef ::comphelper::OPropertyArrayUsageHelper<OTable> OTable_PROP; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OTable> OTable_PROP; class OTable : public comphelper::OBaseMutex, @@ -124,7 +124,7 @@ using OTableDescriptor_BASE::rBHelper; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 _nId ) const; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: File [changed]: VView.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VView.hxx?r1=1.8.30.1&r2=1.8.30.2 Delta lines: +6 -6 ------------------- --- VView.hxx 16 Nov 2005 12:58:42 -0000 1.8.30.1 +++ VView.hxx 14 Jun 2006 10:54:18 -0000 1.8.30.2 @@ -4,9 +4,9 @@ * * $RCSfile: VView.hxx,v $ * - * $Revision: 1.8.30.1 $ + * $Revision: 1.8.30.2 $ * - * last change: $Author: fs $ $Date: 2005/11/16 12:58:42 $ + * last change: $Author: fs $ $Date: 2006/06/14 10:54:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,8 +64,8 @@ #ifndef _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_ #include "connectivity/sdbcx/VDescriptor.hxx" #endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ -#include <comphelper/proparrhlp.hxx> +#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX +#include <comphelper/IdPropArrayHelper.hxx> #endif namespace connectivity @@ -90,7 +90,7 @@ public OView_BASE, public ::com::sun::star::container::XNamed, public ::com::sun::star::lang::XServiceInfo, - public ::comphelper::OPropertyArrayUsageHelper<OView>, + public ::comphelper::OIdPropertyArrayUsageHelper<OView>, public ODescriptor { protected: @@ -102,7 +102,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
