#99549# insert and remove some delete and new operators

connectivity/source/inc/file/FCatalog.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FCatalog.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:46 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,15 +85,6 @@ namespace connectivity
 
         public:
             OFileCatalog(OConnection* _pCon);
-            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( () )
-                {  }
-
             OConnection*    getConnection() { return m_pConnection; }
 
             virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);

connectivity/source/inc/file/FColumns.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FColumns.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:46 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,16 +93,6 @@ namespace connectivity
                     ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 ,m_pTable(_pTable)
             {}
-
-            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( () )
-                {  }
-
         };
     }
 }

connectivity/source/inc/file/FConnection.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FConnection.hxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:47 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -150,16 +150,6 @@ namespace connectivity
 
             OConnection(OFileDriver*    _pDriver);
 
-
-            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(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException);
 
             void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException);

connectivity/source/inc/file/FDatabaseMetaData.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FDatabaseMetaData.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:48 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,16 +86,6 @@ namespace connectivity
         public:
 
             ODatabaseMetaData(OConnection* _pCon);
-
-
-            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( () )
-                {  }
             // XDatabaseMetaData
             virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);

connectivity/source/inc/file/FDriver.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FDriver.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:48 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,14 +98,6 @@ namespace connectivity
         public:
             OFileDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
 
-            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( () )
-                {  }
             // OComponentHelper
             virtual void SAL_CALL disposing(void);
             // XInterface

connectivity/source/inc/file/FPreparedStatement.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FPreparedStatement.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:49 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,16 +131,6 @@ namespace connectivity
             // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
             OPreparedStatement( OConnection* _pConnection);
 
-
-            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(const ::rtl::OUString& sql)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
             // OComponentHelper

connectivity/source/inc/file/FResultSet.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FResultSet.hxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:49 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -257,15 +257,6 @@ namespace connectivity
             // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
             OResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator);
 
-            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( () )
-                {  }
-
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
             {
                 return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*(OResultSet_BASE*)this);

connectivity/source/inc/file/FResultSetMetaData.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FResultSetMetaData.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:49 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,15 +98,6 @@ namespace connectivity
             // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
             OResultSetMetaData(const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable*  _pTable);
 
-            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( () )
-                {  }
-
             /// Avoid ambigous cast error from the compiler.
             inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
             { return this; }

connectivity/source/inc/file/FStatement.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FStatement.hxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:50 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,15 +213,6 @@ namespace connectivity
             ::cppu::OBroadcastHelper& rBHelper;
             OStatement_Base(OConnection* _pConnection );
 
-            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( () )
-                {  }
-
             OConnection* getOwnConnection() const { return m_pConnection;}
 
             using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;

connectivity/source/inc/file/FTable.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FTable.hxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:40:21 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,6 +104,7 @@ namespace connectivity
                                                                                 // so we have to
 
             virtual void FileClose();
+            virtual ~OFileTable( );
         public:
             virtual void refreshColumns();
             virtual void refreshKeys();
@@ -117,16 +118,6 @@ namespace connectivity
                     const ::rtl::OUString& _SchemaName = ::rtl::OUString(),
                     const ::rtl::OUString& _CatalogName = ::rtl::OUString()
                 );
-            ~OFileTable( );
-
-            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( () )
-                {  }
 
             //XInterface
             virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);

connectivity/source/inc/file/FTables.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FTables.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:50 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,15 +86,6 @@ namespace connectivity
                 ,m_xMetaData(_rMetaData)
             {}
 
-            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 ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
             // only the name is identical to ::cppu::OComponentHelper

connectivity/source/inc/file/fanalyzer.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fanalyzer.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-24 06:00:38 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,6 +78,14 @@ namespace connectivity
         public:
             OSQLAnalyzer();
             virtual ~OSQLAnalyzer();
+            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,void* _pHint ) SAL_THROW( () )
+                { return _pHint; }
+            inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () )
+                { ::rtl_freeMemory( pMem ); }
+            inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW( () )
+                {  }
 
             void describeParam(::vos::ORef<OSQLColumns> rParameterColumns); // genauere Beschreibung der Parameter
             ::std::vector<sal_Int32>* bindResultRow(OValueRow _pRow);                   // Anbinden einer Ergebniszeile an die Restrictions

connectivity/source/inc/file/fcode.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcode.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-04 06:36:50 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,6 +109,15 @@ namespace connectivity
             OCode();
             virtual ~OCode();
 
+            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,void* _pHint ) SAL_THROW( () )
+                { return _pHint; }
+            inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () )
+                { ::rtl_freeMemory( pMem ); }
+            inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW( () )
+                {  }
+
             TYPEINFO();
         };
 

connectivity/source/inc/file/fcomp.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcomp.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-24 06:00:38 $
+ *  last change: $Author: oj $ $Date: 2002-07-05 08:07:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,6 +92,15 @@ namespace connectivity
             OPredicateCompiler(OSQLAnalyzer* pAnalyzer);
 
             virtual ~OPredicateCompiler();
+
+            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,void* _pHint ) SAL_THROW( () )
+                { return _pHint; }
+            inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () )
+                { ::rtl_freeMemory( pMem ); }
+            inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW( () )
+                {  }
             void dispose();
 
             void start(connectivity::OSQLParseNode* pSQLParseNode);