From fc04f76336fdf8c96e35382cdeb497e2f939705c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 28 Sep 2014 15:49:26 +0200 Subject: 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 Tested-by: Noel Grandin --- svtools/source/table/cellvalueconversion.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svtools/source/table') diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index c3dfd593c6ad..b18b05043d4d 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -76,7 +76,7 @@ namespace svt double lcl_convertTimeToDays( long const i_hours, long const i_minutes, long const i_seconds, long const i_100thSeconds ) { - return Time( i_hours, i_minutes, i_seconds, i_100thSeconds ).GetTimeInDays(); + return tools::Time( i_hours, i_minutes, i_seconds, i_100thSeconds ).GetTimeInDays(); } } @@ -296,7 +296,7 @@ namespace svt // extract UnoTime aTimeValue; - ENSURE_OR_RETURN( i_value >>= aTimeValue, "allowed for Time values only", returnValue ); + ENSURE_OR_RETURN( i_value >>= aTimeValue, "allowed for tools::Time values only", returnValue ); // convert returnValue += lcl_convertTimeToDays( -- cgit