summaryrefslogtreecommitdiff
path: root/mysqlc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-28 15:49:26 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-10-01 07:34:23 +0000
commitfc04f76336fdf8c96e35382cdeb497e2f939705c (patch)
tree70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /mysqlc
parenteb4811590c85895ce531674596bdd6afb3397725 (diff)
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11 Time typedef. Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866 Reviewed-on: https://gerrit.libreoffice.org/11684 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'mysqlc')
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.cxx2
-rw-r--r--mysqlc/source/mysqlc_resultset.cxx6
2 files changed, 4 insertions, 4 deletions
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index 6ec219d45959..b3e0bbdb4752 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 Time& aVal)
+void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const tools::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 3541ec2b83e2..32916005a402 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);
- Time t;
+ tools::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);
- Time t = getTime(column);
+ tools::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 Time& /* x */)
+void SAL_CALL OResultSet::updateTime(sal_Int32 column, const tools::Time& /* x */)
throw(SQLException, RuntimeException, std::exception)
{
OSL_TRACE("OResultSet::updateTime");