diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /tools/source/inet | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (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 'tools/source/inet')
| -rw-r--r-- | tools/source/inet/inetmsg.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 01b753cf9f8a..3a527124587d 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -224,7 +224,7 @@ INetRFC822Message::~INetRFC822Message() /* ParseDateField and local helper functions. * - * Parses a String in (implied) GMT format into class Date and Time objects. + * Parses a String in (implied) GMT format into class Date and tools::Time objects. * Four formats are accepted: * * [Wkd,] 1*2DIGIT Mon 2*4DIGIT 00:00:00 [GMT] (rfc1123) @@ -335,7 +335,7 @@ bool INetRFC822Message::ParseDateField ( sal_uInt16 nOffset = ParseNumber (aDateField, nIndex); if (nOffset > 0) { - Time aDiff( Time::EMPTY ); + tools::Time aDiff( tools::Time::EMPTY ); aDiff.SetHour (nOffset / 100); aDiff.SetMin (nOffset % 100); aDiff.SetSec (0); @@ -352,7 +352,7 @@ bool INetRFC822Message::ParseDateField ( else if (comphelper::string::isdigitAsciiString(aDateField)) { // Format: delta seconds. - Time aDelta (0); + tools::Time aDelta (0); aDelta.SetTime (aDateField.toInt32() * 100); DateTime aNow( DateTime::SYSTEM ); @@ -977,7 +977,7 @@ bool INetMIMEMessage::EnableAttachChild (INetMessageContainerType eType) { // Generate a unique boundary from current time. sal_Char sTail[16 + 1]; - Time aCurTime( Time::SYSTEM ); + tools::Time aCurTime( tools::Time::SYSTEM ); sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32; sprintf (sTail, "%08X%08X", |