diff options
author | Ocke Janssen <oj@openoffice.org> | 2002-07-04 05:30:10 +0000 |
---|---|---|
committer | Ocke Janssen <oj@openoffice.org> | 2002-07-04 05:30:10 +0000 |
commit | 1621d54fb263c8ad493d069c450f974100af4e93 (patch) | |
tree | 7b878bcc08f3b54d0fb29554779a9846d5c48820 | |
parent | abd99a885a4aebc5726666bba97bcc922098b121 (diff) |
#99549# insert new and delete operator
-rw-r--r-- | connectivity/inc/connectivity/PColumn.hxx | 15 | ||||
-rw-r--r-- | connectivity/inc/connectivity/sdbcx/VCollection.hxx | 13 | ||||
-rw-r--r-- | connectivity/inc/connectivity/sdbcx/VColumn.hxx | 17 |
3 files changed, 37 insertions, 8 deletions
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx index 2b5c31e20dd6..567110d46c13 100644 --- a/connectivity/inc/connectivity/PColumn.hxx +++ b/connectivity/inc/connectivity/PColumn.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PColumn.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: oj $ $Date: 2001-09-27 06:12:33 $ + * last change: $Author: oj $ $Date: 2002-07-04 06:30:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,8 @@ namespace connectivity protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + + virtual ~OParseColumn(); public: OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase); OParseColumn(const ::rtl::OUString& _Name, @@ -97,7 +99,14 @@ namespace connectivity sal_Bool _IsCurrency, sal_Bool _bCase); - ~OParseColumn(); + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + { return ::rtl_allocateMemory( nSize ); } + inline static void * SAL_CALL operator new( size_t nSize,const void* _pHint ) SAL_THROW( () ) + { return const_cast<void*>(_pHint); } + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + { ::rtl_freeMemory( pMem ); } + inline static void SAL_CALL operator delete( void * pMem,const void* _pHint ) SAL_THROW( () ) + { } virtual void construct(); diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx index 14d341e1b12e..5ea0f6eba9a5 100644 --- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCollection.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: oj $ $Date: 2002-05-10 06:34:26 $ + * last change: $Author: oj $ $Date: 2002-07-04 06:30:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -207,6 +207,15 @@ namespace connectivity DECLARE_SERVICE_INFO(); + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + { return ::rtl_allocateMemory( nSize ); } + inline static void * SAL_CALL operator new( size_t nSize,const void* _pHint ) SAL_THROW( () ) + { return const_cast<void*>(_pHint); } + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + { ::rtl_freeMemory( pMem ); } + inline static void SAL_CALL operator delete( void * pMem,const void* _pHint ) SAL_THROW( () ) + { } + void reFill(const TStringVector &_rVector); sal_Bool isCaseSensitive() const { return m_aNameMap.key_comp().isCaseSensitive(); } void renameObject(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName); diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx index df516fbc5c91..7117d61f13cc 100644 --- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VColumn.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2001-10-16 18:04:55 $ + * last change: $Author: oj $ $Date: 2002-07-04 06:30:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,6 +127,8 @@ namespace connectivity using OColumnDescriptor_BASE::rBHelper; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + + virtual ~OColumn(); public: virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); @@ -144,7 +146,16 @@ namespace connectivity sal_Bool _IsCurrency, sal_Bool _bCase); - virtual ~OColumn(); + + + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + { return ::rtl_allocateMemory( nSize ); } + inline static void * SAL_CALL operator new( size_t nSize,const void* _pHint ) SAL_THROW( () ) + { return const_cast<void*>(_pHint); } + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + { ::rtl_freeMemory( pMem ); } + inline static void SAL_CALL operator delete( void * pMem,const void* _pHint ) SAL_THROW( () ) + { } DECLARE_SERVICE_INFO(); //XInterface |