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 --- uui/source/iahndl-ssl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'uui/source') diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 4925d34064dc..17eef02621ea 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -111,10 +111,10 @@ getLocalizedDatTimeStr( { OUString aDateTimeStr; Date aDate( Date::EMPTY ); - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); aDate = Date( rDateTime.Day, rDateTime.Month, rDateTime.Year ); - aTime = Time( rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds ); + aTime = tools::Time( rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds ); LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType(); SvNumberFormatter *pNumberFormatter = new SvNumberFormatter( xContext, eUILang ); -- cgit