From 81cf58f191f57b3cfad08f5c7d622b30f7fc72d9 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Fri, 19 Apr 2013 07:14:23 +0200 Subject: date/time IDL datatypes incompatible change: fixup Change-Id: Ib750a009e49e19d63f8b6df85947a7b5c9b75bcf --- connectivity/source/drivers/kab/KResultSet.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index c4eae77bd227..043fce1f8b74 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 KabResultSet::updateTime(sal_Int32, const cssu::Time&) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- -void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -- cgit