#99549# insert c and dtor

4 files changed, 31 insertions, 43 deletions

diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index a26d6ac837d3e..7f9d789ba7ee6 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FCatalog.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2001-10-18 13:17:59 $
+ *  last change: $Author: oj $ $Date: 2002-07-04 06:37:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,7 +143,6 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes(  ) throw(RuntimeException)
     aOwnTypes.reserve(aTypes.getLength());
     const Type* pBegin = aTypes.getConstArray();
     const Type* pEnd = pBegin + aTypes.getLength();
-    sal_Int32 i=0;
     for(;pBegin != pEnd;++pBegin)
     {
         if(!(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0) ||
@@ -153,7 +152,15 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes(  ) throw(RuntimeException)
             aOwnTypes.push_back(*pBegin);
         }
     }
-    return Sequence< Type >(aOwnTypes.begin(),aOwnTypes.size());
+    //  return Sequence< Type >(aOwnTypes.begin(),aOwnTypes.size());
+    Sequence< Type > aRet(aOwnTypes.size());
+    sal_Int32 i=0;
+    for (::std::vector<Type>::iterator aIter = aOwnTypes.begin(); aOwnTypes.end(); ++aIter,++i)
+    {
+        aRet[i] = *aIter;
+    }
+
+    return aRet;//Sequence< Type >(aOwnTypes.begin(),aOwnTypes.size());
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 843ce25f54c19..146cc86faea78 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FNoException.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-29 12:15:31 $
+ *  last change: $Author: oj $ $Date: 2002-07-04 06:39:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -164,7 +164,7 @@ OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRow _rRow)
 {
     UINT32 nBookmarkValue = Abs((sal_Int32)(*_rRow)[0]);
 
-    OKeyValue* pKeyValue = new OKeyValue((UINT32)nBookmarkValue);
+    OKeyValue* pKeyValue = OKeyValue::createKeyValue((UINT32)nBookmarkValue);
 
     ::std::vector<sal_Int32>::iterator aIter = m_aOrderbyColumnNumber.begin();
     for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter)
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 1ede34390eb6c..086e305f9284c 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcode.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-23 09:13:11 $
+ *  last change: $Author: oj $ $Date: 2002-07-04 06:37:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,7 +129,16 @@ sal_Int32 compareIgnoreCase(const rtl::OUString& rStr1, const rtl::OUString& rSt
 #endif
 
 //------------------------------------------------------------------
-OCode::~OCode(){}
+DBG_NAME(OCode )
+OCode::OCode()
+{
+    DBG_CTOR(OCode ,NULL);
+}
+// -----------------------------------------------------------------------------
+OCode::~OCode()
+{
+    DBG_DTOR(OCode,NULL);
+}
 
 //------------------------------------------------------------------
 OEvaluateSet* OOperand::preProcess(OBoolOperator* pOp, OOperand* pRight)
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 6307b8914a7f5..2c6a65f77aef5 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcomp.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: oj $ $Date: 2001-08-24 06:08:38 $
+ *  last change: $Author: oj $ $Date: 2002-07-04 06:37:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -508,43 +508,15 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
             pOperand = new OOperandConst(*pODBCNode->getChild(1), sDateTime);
             if(SQL_ISTOKEN(pODBCNodeChild,D))
             {
-                ::rtl::OUString sDate = sDateTime.copy(0,4);
-                sal_uInt16 nYear    = sDate.toInt32();
-                sDate = sDateTime.copy(5,2);
-                sal_uInt16 nMonth   = sDate.toInt32();
-                sDate = sDateTime.copy(8,2);
-                sal_uInt16 nDay     = sDate.toInt32();
-
-                pOperand->setValue(::dbtools::DBTypeConversion::toDouble(Date(nDay,nMonth,nYear)));
+                pOperand->setValue(::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(sDateTime)));
             }
             else if(SQL_ISTOKEN(pODBCNodeChild,T))
             {
-                ::rtl::OUString sDate = sDateTime.copy(0,2);
-                sal_uInt16 nHour    = sDate.toInt32();
-                sDate = sDateTime.copy(3,2);
-                sal_uInt16 nMin = sDate.toInt32();
-                sDate = sDateTime.copy(6,2);
-                sal_uInt16 nSec     = sDate.toInt32();
-
-                pOperand->setValue(::dbtools::DBTypeConversion::toDouble(Time(0,nSec,nMin,nHour)));
+                pOperand->setValue(::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(sDateTime)));
             }
             else if(SQL_ISTOKEN(pODBCNodeChild,TS))
             {
-                ::rtl::OUString sDate = sDateTime.copy(0,4);
-                sal_uInt16 nYear    = sDate.toInt32();
-                sDate = sDateTime.copy(5,2);
-                sal_uInt16 nMonth   = sDate.toInt32();
-                sDate = sDateTime.copy(8,2);
-                sal_uInt16 nDay     = sDate.toInt32();
-
-                sDate = sDateTime.copy(11,2);
-                sal_uInt16 nHour    = sDate.toInt32();
-                sDate = sDateTime.copy(14,2);
-                sal_uInt16 nMin = sDate.toInt32();
-                sDate = sDateTime.copy(17,2);
-                sal_uInt16 nSec     = sDate.toInt32();
-
-                pOperand->setValue(::dbtools::DBTypeConversion::toDouble(DateTime(0,nSec,nMin,nHour,nDay,nMonth,nYear)));
+                pOperand->setValue(::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(sDateTime)));
             }