summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--connectivity/source/inc/TKeyValue.hxx22
-rw-r--r--connectivity/source/inc/dbase/DIndexColumns.hxx13
-rw-r--r--connectivity/source/inc/dbase/DIndexes.hxx13
-rw-r--r--connectivity/source/inc/file/FCatalog.hxx12
-rw-r--r--connectivity/source/inc/file/FColumns.hxx13
-rw-r--r--connectivity/source/inc/file/FConnection.hxx17
-rw-r--r--connectivity/source/inc/file/FDatabaseMetaData.hxx16
-rw-r--r--connectivity/source/inc/file/FDriver.hxx12
-rw-r--r--connectivity/source/inc/file/FPreparedStatement.hxx17
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx13
-rw-r--r--connectivity/source/inc/file/FResultSetMetaData.hxx15
-rw-r--r--connectivity/source/inc/file/FStatement.hxx13
-rw-r--r--connectivity/source/inc/file/FTable.hxx13
-rw-r--r--connectivity/source/inc/file/FTables.hxx14
-rw-r--r--connectivity/source/inc/file/fcode.hxx15
15 files changed, 165 insertions, 53 deletions
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 0585d4242792..4b025e278244 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -2,9 +2,9 @@
*
* $RCS: $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2002-04-19 13:24:05 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:40 $
*
* The Contents of this are made available subject to the terms of
* either of the following licenses
@@ -73,19 +73,15 @@ namespace connectivity
::std::vector<ORowSetValueDecoratorRef> m_aKeys;
sal_Int32 m_nValue;
+ protected:
+ OKeyValue();
+ OKeyValue(sal_Int32 nVal);
public:
- OKeyValue() { }
- OKeyValue(sal_Int32 nVal) : m_nValue(nVal) {}
- ~OKeyValue(){}
- 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 (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( () )
- { }
+ ~OKeyValue();
+
+ static OKeyValue* createKeyValue(sal_Int32 nVal);
+ // static OKeyValue* createEmptyKeyValue();
inline void pushKey(const ORowSetValueDecoratorRef& _aValueRef)
{
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 44b41e436f35..08786d06a94b 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DIndexColumns.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2001-10-12 11:54:43 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -93,6 +93,15 @@ namespace connectivity
, m_pIndex(_pIndex)
{}
+ 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( () )
+ { }
+
};
}
}
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index f4c4fc5f2c0e..9953d36568ab 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DIndexes.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2001-10-12 11:54:43 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,6 +92,15 @@ namespace connectivity
const TStringVector &_rVector) : ODbaseIndexes_BASE(*_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( () )
+ { }
};
}
}
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index 012835f7b38b..d3089f1925c0 100644
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FCatalog.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-05-18 08:31:17 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -85,6 +85,14 @@ 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; }
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index c2e378ee3ed9..acfe7ebbb48a 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FColumns.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: oj $ $Date: 2001-10-12 11:53:32 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,6 +94,15 @@ namespace connectivity
,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( () )
+ { }
+
};
}
}
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 82747c9ad97e..9243446ed2ef 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FConnection.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: fs $ $Date: 2001-10-26 10:30:44 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -144,10 +144,21 @@ namespace connectivity
void throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::OUString & _rsMessage);
+
+ virtual ~OConnection();
public:
OConnection(OFileDriver* _pDriver);
- virtual ~OConnection();
+
+
+ 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);
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index 25c57550c207..95a19a342652 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FDatabaseMetaData.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-05-18 08:31:17 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,10 +82,20 @@ namespace connectivity
{
protected:
OConnection* m_pConnection; // I need the native class not only the interface
+ virtual ~ODatabaseMetaData();
public:
ODatabaseMetaData(OConnection* _pCon);
- ~ODatabaseMetaData();
+
+
+ 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);
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 1e8632b004dd..8b215f114f58 100644
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FDriver.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-05-18 08:31:17 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,6 +98,14 @@ 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
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 5c7275f99e5b..dcf9aa8f5fd9 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FPreparedStatement.hxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: fs $ $Date: 2002-01-16 08:46:01 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -124,11 +124,22 @@ namespace connectivity
virtual void parseParamterElem(const String& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem);
virtual void initializeResultSet(OResultSet* _pResult);
+
+ virtual ~OPreparedStatement();
public:
DECLARE_SERVICE_INFO();
// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OPreparedStatement( OConnection* _pConnection);
- ~OPreparedStatement();
+
+
+ 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);
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 369ed74e24f0..92dec8865fc4 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FResultSet.hxx,v $
*
- * $Revision: 1.28 $
+ * $Revision: 1.29 $
*
- * last change: $Author: oj $ $Date: 2001-11-15 15:20:06 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -257,6 +257,15 @@ 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);
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 33a3ea9f2c2d..22ef90c314da 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FResultSetMetaData.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-07-30 08:52:08 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,11 +92,20 @@ namespace connectivity
OFileTable* m_pTable;
void checkColumnIndex(sal_Int32 column) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ protected:
+ virtual ~OResultSetMetaData();
public:
// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OResultSetMetaData(const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable);
- ~OResultSetMetaData();
+ 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()
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 80b09fe5bec2..632a8da575cb 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FStatement.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: oj $ $Date: 2001-12-03 12:11:40 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -213,6 +213,15 @@ 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 >;
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index c536eaa716e8..194e7066261f 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FTable.hxx,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: fs $ $Date: 2002-01-16 08:46:20 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:40:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -119,6 +119,15 @@ namespace connectivity
);
~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);
virtual void SAL_CALL acquire() throw();
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index 483e3a55100f..26b46654785a 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FTables.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-10-12 11:53:32 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,9 +84,17 @@ namespace connectivity
OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
,m_xMetaData(_rMetaData)
- // ,m_pParent(_pParent)
{}
+ 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
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index a9fc07d24f8a..a5e9a0c22ac5 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fcode.hxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: oj $ $Date: 2001-07-24 13:17:58 $
+ * last change: $Author: oj $ $Date: 2002-07-04 06:36:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -106,6 +106,7 @@ namespace connectivity
class OCode
{
public:
+ OCode();
virtual ~OCode();
TYPEINFO();
@@ -113,7 +114,7 @@ namespace connectivity
// operands that the parsetree generate
- class SAL_NO_VTABLE OOperand : public OCode
+ class OOperand : public OCode
{
protected:
sal_Int32 m_eDBType;
@@ -157,10 +158,6 @@ namespace connectivity
public:
OOperandAttr(sal_uInt16 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn);
- ~OOperandAttr()
- {
- m_xColumn = NULL;
- }
virtual sal_Bool isIndexed() const;
virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0);
@@ -319,7 +316,7 @@ namespace connectivity
public:
TYPEINFO();
public:
- OOp_NOTLIKE(const char cEsc = '\0'):OOp_LIKE(cEsc){};
+ OOp_NOTLIKE(const sal_Unicode cEsc = L'\0'):OOp_LIKE(cEsc){};
virtual sal_Bool operate(const OOperand*, const OOperand*) const;
};
@@ -333,7 +330,7 @@ namespace connectivity
OOp_COMPARE(connectivity::OSQLPredicateType aPType)
:aPredicateType(aPType) {}
- connectivity::OSQLPredicateType getPredicateType() const {return aPredicateType;}
+ inline connectivity::OSQLPredicateType getPredicateType() const { return aPredicateType; }
virtual sal_Bool operate(const OOperand*, const OOperand*) const;
};
generated by cgit (git 2.34.1) at 2025-05-05 06:58:19 +0000