[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source

[Caolán McNamara (via logerrit)]

 connectivity/source/inc/odbc/OResultSetMetaData.hxx |2 +-
 sc/source/ui/Accessibility/AccessibleDocument.cxx   |7 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit dc3d27c53e5c8149571025a031857973783a9248
Author: Caolán McNamara 
AuthorDate: Sat Feb 26 15:17:27 2022 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 26 20:04:29 2022 +0100

cid#1500706 Uninitialized scalar field

Change-Id: I2546ea6880ad1cdb4312ca1c1251dbf6758ff5ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130593
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 1d58af05fe2a..21e3d1813a77 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -258,7 +258,6 @@ private:
 
 mutable ::accessibility::AccessibleShapeTreeInfo maShapeTreeInfo;
 mutable css::uno::Reference 
xSelectionSupplier;
-mutable size_t mnSdrObjCount;
 mutable sal_uInt32 mnShapesSelected;
 ScTabViewShell* mpViewShell;
 ScAccessibleDocument* mpAccessibleDocument;
@@ -499,9 +498,9 @@ sal_Int32 ScChildrenShapes::GetCount() const
 SdrPage* pDrawPage = GetDrawPage();
 if (pDrawPage && (maZOrderedShapes.size() == 1)) // the table is always in
 {
-mnSdrObjCount = pDrawPage->GetObjCount();
-maZOrderedShapes.reserve(mnSdrObjCount + 1); // the table is always in
-for (size_t i = 0; i < mnSdrObjCount; ++i)
+size_t nSdrObjCount = pDrawPage->GetObjCount();
+maZOrderedShapes.reserve(nSdrObjCount + 1); // the table is always in
+for (size_t i = 0; i < nSdrObjCount; ++i)
 {
 SdrObject* pObj = pDrawPage->GetObj(i);
 if (pObj/* && (pObj->GetLayer() != SC_LAYER_INTERN)*/)
commit 10d8ba5fa6fac708c960278454ba403a95e355c3
Author: Caolán McNamara 
AuthorDate: Sat Feb 26 15:12:37 2022 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 26 20:04:16 2022 +0100

cid#1500433 Using a moved object

Change-Id: I150cd0f021aeb1aefe411f19dfcac111ac35b295
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130592
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx 
b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 6c1acc13bfb9..ea32a453e99a 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -62,7 +62,7 @@ namespace connectivity::odbc
 :m_vMapping(std::move(_vMapping))
 ,m_aStatementHandle( _pStmt )
 ,m_pConnection(_pConnection)
-,m_nColCount(_vMapping.size()-1)
+,m_nColCount(m_vMapping.size()-1)
 ,m_bUseODBC2Types(false)
 {}
 virtual ~OResultSetMetaData() override;

[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source

[Lionel Elie Mamane (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |5 
 connectivity/source/drivers/mysqlc/mysqlc_statement.cxx |   25 +-
 connectivity/source/drivers/mysqlc/mysqlc_statement.hxx |   51 ++--
 sc/source/ui/app/inputhdl.cxx   |   77 +-
 sc/source/ui/view/cellsh3.cxx   |  121 
+-
 sc/source/ui/view/tabvwshc.cxx  |7 
 6 files changed, 227 insertions(+), 59 deletions(-)

New commits:
commit 244e1823c41221d53b0dc7b6d9595514930f8cca
Author: Lionel Elie Mamane 
AuthorDate: Sat May 9 16:01:12 2020 +0200
Commit: Lionel Elie Mamane 
CommitDate: Sun May 10 07:38:17 2020 +0200

mysql-sdbc: better separate what resultset provides what interface

PreparedStatement should not provide XStatement (!!)
since MySQL does not support multiple results for prepared statements,
PreparedStatement should not expose a XMultipleResults interface

Move those out of the common base to Statement itself.

Change-Id: Ice7478089441e1def6fd65ff117eb31d04ec46ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93864
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
index 3c4edaf411ac..0177b15dbd03 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
@@ -93,11 +93,6 @@ public:
 sal_Bool SAL_CALL execute() override;
 Reference SAL_CALL getConnection() override;
 
-// XStatement
-using OCommonStatement::execute;
-using OCommonStatement::executeQuery;
-using OCommonStatement::executeUpdate;
-
 // XParameters
 void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) override;
 
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
index b7073be5e6ec..0082f96b61d1 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
@@ -88,6 +88,11 @@ Sequence SAL_CALL OCommonStatement::getTypes()
 return concatSequences(aTypes.getTypes(), 
OCommonStatement_IBase::getTypes());
 }
 
+Sequence SAL_CALL OStatement::getTypes()
+{
+return concatSequences(OStatement_BASE::getTypes(), 
OCommonStatement::getTypes());
+}
+
 void SAL_CALL OCommonStatement::cancel()
 {
 MutexGuard aGuard(m_aMutex);
@@ -114,7 +119,7 @@ void SAL_CALL OCommonStatement::close()
 // 
mysqlc_sdbc_driver::throwFeatureNotImplementedException("com:sun:star:sdbc:XBatchExecution");
 // }
 
-sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql)
+sal_Bool SAL_CALL OStatement::execute(const OUString& sql)
 {
 MutexGuard aGuard(m_aMutex);
 checkDisposed(rBHelper.bDisposed);
@@ -139,7 +144,7 @@ sal_Bool SAL_CALL OCommonStatement::execute(const OUString& 
sql)
 return getResult();
 }
 
-Reference SAL_CALL OCommonStatement::executeQuery(const OUString& 
sql)
+Reference SAL_CALL OStatement::executeQuery(const OUString& sql)
 {
 bool isRS(execute(sql));
 // if a MySQL error occurred, it was already thrown and the below is not 
executed
@@ -156,7 +161,7 @@ Reference SAL_CALL 
OCommonStatement::executeQuery(const OUString& sq
 return m_xResultSet;
 }
 
-Reference SAL_CALL OCommonStatement::getConnection()
+Reference SAL_CALL OStatement::getConnection()
 {
 MutexGuard aGuard(m_aMutex);
 checkDisposed(rBHelper.bDisposed);
@@ -165,14 +170,14 @@ Reference SAL_CALL 
OCommonStatement::getConnection()
 return m_xConnection.get();
 }
 
-sal_Int32 SAL_CALL OCommonStatement::getUpdateCount() { return 
m_nAffectedRows; }
+sal_Int32 SAL_CALL OStatement::getUpdateCount() { return m_nAffectedRows; }
 
 Any SAL_CALL OStatement::queryInterface(const Type& rType)
 {
-Any aRet = ::cppu::queryInterface(rType, static_cast(this));
+Any aRet = OCommonStatement::queryInterface(rType);
 if (!aRet.hasValue())
 {
-aRet = OCommonStatement::queryInterface(rType);
+aRet = OStatement_BASE::queryInterface(rType);
 }
 return aRet;
 }
@@ -193,7 +198,7 @@ Any SAL_CALL OStatement::queryInterface(const Type& rType)
 // 
mysqlc_sdbc_driver::throwFeatureNotImplementedException("com:sun:star:sdbc:XBatchExecution");
 // }
 
-sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql)
+sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql)
 {
 MutexGuard aGuard(m_aMutex);
 checkDisposed(rBHelper.bDisposed);
@@ -202,7 +207,7 @@ sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const 
OUString& sql)
 return m_nAffectedRows;
 }
 
-Reference SAL_CALL OCommonStatement::getResultSet()
+Reference SAL_CALL OStatement::getResultSet()
 {
 MutexGuard aGuard(m_aMutex);
 

[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source

[Caolán McNamara (via logerrit)]

 connectivity/source/drivers/firebird/Catalog.cxx |1 -
 sc/source/ui/dataprovider/datatransformation.cxx |6 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0413a3e3f662f4a12823b62d93f8887a055b1179
Author: Caolán McNamara 
AuthorDate: Sun Mar 15 16:33:20 2020 +
Commit: Caolán McNamara 
CommitDate: Sun Mar 15 22:16:39 2020 +0100

cid#1460665 Division or modulo by float zero

Change-Id: Iea166a3d152b5b38665691bfa16f3022d684771c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90532
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/dataprovider/datatransformation.cxx 
b/sc/source/ui/dataprovider/datatransformation.cxx
index 93b84cf0869a..8aceefe57f4f 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -123,6 +123,7 @@ void MergeColumnTransformation::Transform(ScDocument& rDoc) 
const
 {
 nMaxRow = getLastRow(rDoc, itr);
 }
+assert(nMaxRow != -1);
 
 SCCOL nTargetCol = *maColumns.begin();
 
@@ -197,6 +198,8 @@ void TextTransformation::Transform(ScDocument& rDoc) const
 {
 nEndRow = getLastRow(rDoc, rCol);
 }
+assert(nEndRow != -1);
+
 for(auto& rCol : mnCol)
 {
 switch (maType)
@@ -307,6 +310,7 @@ void AggregateFunction::Transform(ScDocument& rDoc) const
 {
 nEndRow = getLastRow(rDoc, itr);
 }
+assert(nEndRow != -1);
 
 for (auto& rCol : maColumns)
 {
@@ -424,6 +428,7 @@ void NumberTransformation::Transform(ScDocument& rDoc) const
 {
 nEndRow = getLastRow(rDoc, rCol);
 }
+assert(nEndRow != -1);
 
 for(auto& rCol : mnCol)
 {
@@ -718,6 +723,7 @@ void DateTimeTransformation::Transform(ScDocument& rDoc) 
const
 {
 nEndRow = getLastRow(rDoc, rCol);
 }
+assert(nEndRow != -1);
 
 for(auto& rCol : mnCol)
 {
commit 3905eda231ec3006965539f49af3f8bb048a9df9
Author: Julien Nabet 
AuthorDate: Sun Mar 15 22:10:25 2020 +0100
Commit: Julien Nabet 
CommitDate: Sun Mar 15 22:16:31 2020 +0100

Firebird: TODO already fixed (SYSTEM TABLES filtered)

TODO added with:
commit ec365165ba7f332df479422174899808e1ff4152
Author: Andrzej J.R. Hunt 
Date:   Mon Aug 12 17:15:46 2013 +0100

Implement refreshTables. (firebird-sdbc)

then fixed with:
commit c73286f83c64b5216ee430c72a412a2903eee16b
Author: Andrzej J.R. Hunt 
Date:   Wed Aug 14 09:30:52 2013 +0100

Use table type in getTables. (firebird-sdbc)

+

commit 0506b35c50eddb010097b1359295da2ba6fd3ee1
Author: Andrzej J.R. Hunt 
Date:   Wed Aug 14 08:49:54 2013 +0100

Avoid selecting system tables for viewing. (firebird-sdbc)

Change-Id: I1882f92a63d23a7cfad4a0e1930b57eec0365e9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90540
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/connectivity/source/drivers/firebird/Catalog.cxx 
b/connectivity/source/drivers/firebird/Catalog.cxx
index 6207625296f6..f5969f31ce63 100644
--- a/connectivity/source/drivers/firebird/Catalog.cxx
+++ b/connectivity/source/drivers/firebird/Catalog.cxx
@@ -27,7 +27,6 @@ Catalog::Catalog(const uno::Reference< XConnection >& 
rConnection):
 //- OCatalog -
 void Catalog::refreshTables()
 {
-// TODO: set type -- currently we also get system tables...
 Sequence< OUString > aTypes(2);
 aTypes[0] = "TABLE";
 aTypes[1] = "VIEW";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source

[Stephan Bergmann]

 connectivity/source/drivers/evoab2/NStatement.cxx |2 +-
 sc/source/filter/oox/pagesettings.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1c154c84d25866cf8c5ab1a55973548e52268504
Author: Stephan Bergmann 
Date:   Tue Nov 15 14:42:44 2016 +0100

Spurious whitespace at end of line

Change-Id: I684f8ad46527ce13b8c19a52265af3a581dca6cb

diff --git a/sc/source/filter/oox/pagesettings.cxx 
b/sc/source/filter/oox/pagesettings.cxx
index 1cfe945..5af216a 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -425,7 +425,7 @@ private:
 
 private:
 typedef ::std::vector< HFPortionInfo >  HFPortionInfoVec;
- 
+
 const OUString  maPageNumberService;
 const OUString  maPageCountService;
 const OUString  maSheetNameService;
commit 7ab84fab539fd3619894536815e19fd24af87a6b
Author: Noel Grandin 
Date:   Tue Nov 15 15:41:23 2016 +0200

fix build

after commit 0d051730156f633150fa9e3107fe97cf7be6d8f9
Author: Noel Grandin 
Date:   Tue Nov 15 09:13:33 2016 +0200
loplugin:constantparam

Change-Id: Ia3e761168043e5a8d22793689e9f224a85a6b7ca

diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx 
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 98dd28a..4cad191 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -75,7 +75,7 @@ OCommonStatement::OCommonStatement(OEvoabConnection* 
_pConnection)
 , m_xResultSet(nullptr)
 , m_pConnection(_pConnection)
 , m_aParser(_pConnection->getDriver().getComponentContext())
-, m_aSQLIterator( _pConnection, 
_pConnection->createCatalog()->getTables(), m_aParser, nullptr )
+, m_aSQLIterator( _pConnection, 
_pConnection->createCatalog()->getTables(), m_aParser )
 , m_pParseTree(nullptr)
 , m_nMaxFieldSize(0)
 , m_nMaxRows(0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source

[Julien Nabet]

 connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx |2 +-
 sc/source/ui/app/scmod.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d67684f62fc99dd25fb46ddb547e8ff4345d0970
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Dec 14 00:01:59 2013 +0100

cppcheck: fix same expression, no need to cast twice

Change-Id: I08a68071db45ee79491558dd88e723dcdf0d24d5

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index dfeeba9..f31cc57 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1123,7 +1123,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
 
 if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,pItem) )
 {
-ScGridOptions aNewGridOpt( (const SvxOptionsGrid)((const 
SvxGridItem)*pItem) );
+ScGridOptions aNewGridOpt( (const SvxGridItem)*pItem) );
 
 if ( pViewSh )
 {
commit ffbde4e6a6ead7efdd65aa6bd31e9ea55f9c637e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Dec 13 23:53:29 2013 +0100

cppcheck: fix same expression

!pSchemaPat-isEmpty() checked twice where line before we test if aPKQ is 
empty
so it seemed quite logical to test aPKO here

Change-Id: I79d7ec89f7ae67520492bbd4121a4a86918f2fbf

diff --git 
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx 
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 2e772fc..f7af806 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -999,7 +999,7 @@ void ODatabaseMetaDataResultSet::openColumns(   const Any 
catalog,
 aCOL = OUStringToOString(columnNamePattern,m_nTextEncoding);
 
 const char  *pPKQ = catalog.hasValue()  !aPKQ.isEmpty() ? aPKQ.getStr()  
: NULL,
-*pPKO = pSchemaPat  !pSchemaPat-isEmpty()  
!pSchemaPat-isEmpty() ? aPKO.getStr() : NULL,
+*pPKO = pSchemaPat  !pSchemaPat-isEmpty()  
!aPKO.isEmpty() ? aPKO.getStr() : NULL,
 *pPKN = aPKN.getStr(),
 *pCOL = aCOL.getStr();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source

[Lionel Elie Mamane]

 connectivity/source/drivers/kab/KResultSet.cxx |   20 ++--
 sc/source/filter/orcus/interface.cxx   |   12 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 202d45cff25492bb4d7f550df5c368af097d2e0c
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Apr 19 07:14:48 2013 +0200

date/time IDL datatypes incompatible change: fixup

Change-Id: I3733deac232d0075bdd889ce52d7e6f67746d4f8

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index e67c915..a32842c 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -224,17 +224,17 @@ void ScOrcusSheet::set_date_time(
 SvNumberFormatter* pFormatter = mrDoc.getDoc().GetFormatTable();
 
 Date aDate(day, month, year);
-sal_uIntPtr nSec = floor(second);
-sal_uIntPtr nSec100 = (second - nSec) * 100;
-Time aTime(hour, minute, nSec, nSec100);
+sal_uInt32 nSec = floor(second);
+sal_uInt32 nNanoSec = (second - nSec) * ::Time::nanoSecPerSec;
+Time aTime(hour, minute, nSec, nNanoSec);
 Date aNullDate(*pFormatter-GetNullDate());
 long nDateDiff = aDate - aNullDate;
 
 double fTime =
-static_castdouble(aTime.GetNanoSec()) / 1e9 +
+static_castdouble(aTime.GetNanoSec()) / ::Time::nanoSecPerSec +
 aTime.GetSec() +
-aTime.GetMin() * 60.0 +
-aTime.GetHour() * 3600.0;
+aTime.GetMin() * ::Time::secondPerMinute +
+aTime.GetHour() * ::Time::secondPerHour;
 
 fTime /= DATE_TIME_FACTOR;
 
commit 81cf58f191f57b3cfad08f5c7d622b30f7fc72d9
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Apr 19 07:14:23 2013 +0200

date/time IDL datatypes incompatible change: fixup

Change-Id: Ib750a009e49e19d63f8b6df85947a7b5c9b75bcf

diff --git a/connectivity/source/drivers/kab/KResultSet.cxx 
b/connectivity/source/drivers/kab/KResultSet.cxx
index c4eae77..043fce1 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::io;
-using namespace com::sun::star::util;
+namespace cssu = com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(KabResultSet, com.sun.star.sdbc.drivers.KabResultSet, 
com.sun.star.sdbc.ResultSet);
 // -
@@ -298,34 +298,34 @@ Sequence sal_Int8  SAL_CALL 
KabResultSet::getBytes(sal_Int32) throw(SQLExcepti
 return Sequence sal_Int8 ();
 }
 // -
-Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, 
RuntimeException)
+cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, 
RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
 ::dbtools::throwFunctionNotSupportedException(getDate, NULL);
 
-Date aRet;
+cssu::Date aRet;
 return aRet;
 }
 // -
-Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, 
RuntimeException)
+cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, 
RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
 ::dbtools::throwFunctionNotSupportedException(getTime, NULL);
 
-Time nRet;
+cssu::Time nRet;
 return nRet;
 }
 // -
-DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) 
throw(SQLException, RuntimeException)
+cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) 
throw(SQLException, RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
-DateTime nRet;
+cssu::DateTime nRet;
 sal_Int32 nAddressees = m_aKabAddressees.size();
 
 if (m_nRowPos != -1  m_nRowPos != nAddressees  m_xMetaData.is())
@@ -745,19 +745,19 @@ void SAL_CALL KabResultSet::updateBytes(sal_Int32, const 
Sequence sal_Int8 )
 checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 // -
-void SAL_CALL KabResultSet::updateDate(sal_Int32, const Date) 
throw(SQLException, RuntimeException)
+void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date) 
throw(SQLException, RuntimeException)
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 // -
-void SAL_CALL KabResultSet::updateTime(sal_Int32, const Time) 
throw(SQLException, RuntimeException)
+void SAL_CALL