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>

6 files changed, 9 insertions, 9 deletions

diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index c8f25e7b047e..acf89b5f4fb4 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -156,7 +156,7 @@ void ODocumentInfoPreview::insertDateTime(
 {
     DateTime aToolsDT(
         Date(value.Day, value.Month, value.Year),
-        Time(
+        tools::Time(
             value.Hours, value.Minutes, value.Seconds, value.NanoSeconds));
     if (aToolsDT.IsValidAndGregorian()) {
         const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 40f63fc282de..db9b9c8de25a 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -52,7 +52,7 @@ namespace svt
 
 #define CONVERT_DATETIME( aUnoDT, aToolsDT ) \
     aToolsDT = ::DateTime( Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year ), \
-                           Time( aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds, aUnoDT.NanoSeconds ) );
+                           tools::Time( aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds, aUnoDT.NanoSeconds ) );
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::Sequence;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 7360ccf3b8cd..9c4fc546657c 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2653,14 +2653,14 @@ bool TabBar::SwitchPage( const Point& rPos )
         if ( nSwitchId != mnSwitchId )
         {
             mnSwitchId = nSwitchId;
-            mnSwitchTime = Time::GetSystemTicks();
+            mnSwitchTime = tools::Time::GetSystemTicks();
         }
         else
         {
             // change only after 500 ms
             if ( mnSwitchId != GetCurPageId() )
             {
-                if ( Time::GetSystemTicks() > mnSwitchTime+500 )
+                if ( tools::Time::GetSystemTicks() > mnSwitchTime+500 )
                 {
                     mbInSwitching = true;
                     if ( ImplDeactivatePage() )
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 09c7c8fcf3a3..9a561267149b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -58,7 +58,7 @@ namespace svt
 
     SvStream& WriteDateTime( SvStream& _rStorage, const util::DateTime& _rDate )
     {
-        sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / Time::nanoPerCenti );
+        sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / tools::Time::nanoPerCenti );
         _rStorage.WriteUInt16( hundredthSeconds );
 
         _rStorage.WriteUInt16( _rDate.Seconds );
@@ -76,7 +76,7 @@ namespace svt
     {
         sal_uInt16 hundredthSeconds;
         _rStorage.ReadUInt16( hundredthSeconds );
-        _rDate.NanoSeconds = static_cast< sal_uInt32 >( hundredthSeconds ) * Time::nanoPerCenti;
+        _rDate.NanoSeconds = static_cast< sal_uInt32 >( hundredthSeconds ) * tools::Time::nanoPerCenti;
 
         _rStorage.ReadUInt16( _rDate.Seconds );
         _rStorage.ReadUInt16( _rDate.Minutes );
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index e7796727f356..bf4021360272 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -2154,7 +2154,7 @@ bool HTMLParser::ParseMetaOptionsImpl(
                  comphelper::string::getTokenCount(aContent, ';') == 2 )
             {
                 Date aDate( (sal_uLong)aContent.getToken(0, ';').toInt32() );
-                Time aTime( (sal_uLong)aContent.getToken(1, ';').toInt32() );
+                tools::Time aTime( (sal_uLong)aContent.getToken(1, ';').toInt32() );
                 DateTime aDateTime( aDate, aTime );
                 ::util::DateTime uDT(aDateTime.GetNanoSec(),
                     aDateTime.GetSec(), aDateTime.GetMin(),
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(