[Libreoffice-commits] core.git: mysqlc/source

[Stephan Bergmann]

 mysqlc/source/mysqlc_preparedstatement.cxx |    2 +-
 mysqlc/source/mysqlc_resultset.cxx         |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2bb99ca189358065104e99fa4933d6b28ab10025
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 1 10:35:19 2014 +0200

    mysqlc: These shall be plain "Time" not "tools::Time" apparently
    
    Change-Id: Id96a75bb8a07ea3b9701b9fe4692dfc81dbd8295

diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index b3e0bbd..6ec219d 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -374,7 +374,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData
 
 
 /* {{{ OPreparedStatement::setTime() -I- */
-void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const tools::Time& aVal)
+void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal)
     throw(SQLException, RuntimeException, std::exception)
 {
     OSL_TRACE("OPreparedStatement::setTime");
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index 3291600..3541ec2 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -524,7 +524,7 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column)
     MutexGuard aGuard(m_aMutex);
 
     checkColumnIndex(column);
-    tools::Time t;
+    Time t;
     OUString timeString = getString(column);
     OUString token;
     sal_Int32 nIndex, i=0;
@@ -562,7 +562,7 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column)
     checkColumnIndex(column);
     DateTime dt;
     Date d = getDate(column);
-    tools::Time t = getTime(column);
+    Time t = getTime(column);
 
     dt.Year = d.Year;
     dt.Month = d.Month;
@@ -1088,7 +1088,7 @@ void SAL_CALL OResultSet::updateDate(sal_Int32 column, const Date& /* x */)
 /* }}} */
 
 /* {{{ OResultSet::updateTime() -U- */
-void SAL_CALL OResultSet::updateTime(sal_Int32 column, const tools::Time& /* x */)
+void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time& /* x */)
     throw(SQLException, RuntimeException, std::exception)
 {
     OSL_TRACE("OResultSet::updateTime");