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>

3 files changed, 24 insertions, 24 deletions

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index a5a02abd7c0d..91da32dea2ae 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -81,7 +81,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
                     if (nFieldType != text::textfield::Type::TIME)
                     {
                         util::DateTime aDateTime = xPropSet->getPropertyValue(UNO_TC_PROP_DATE_TIME).get<util::DateTime>();
-                        Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds);
+                        tools::Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds);
 
                         bool bIsFixed = false;
                         xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed;
@@ -787,7 +787,7 @@ SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData );
 
 
 SvxExtTimeField::SvxExtTimeField()
-    : m_nFixTime( Time(Time::SYSTEM).GetTime() )
+    : m_nFixTime( tools::Time(tools::Time::SYSTEM).GetTime() )
 {
     eType = SVXTIMETYPE_VAR;
     eFormat = SVXTIMEFORMAT_STANDARD;
@@ -795,7 +795,7 @@ SvxExtTimeField::SvxExtTimeField()
 
 
 
-SvxExtTimeField::SvxExtTimeField( const Time& rTime, SvxTimeType eT, SvxTimeFormat eF )
+SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxTimeFormat eF )
     : m_nFixTime( rTime.GetTime() )
 {
     eType = eT;
@@ -849,15 +849,15 @@ void SvxExtTimeField::Save( SvPersistStream & rStm )
 
 OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
 {
-    Time aTime( Time::EMPTY );
+    tools::Time aTime( tools::Time::EMPTY );
     if ( eType == SVXTIMETYPE_FIX )
         aTime.SetTime(m_nFixTime);
     else
-        aTime = Time( Time::SYSTEM ); // current time
+        aTime = tools::Time( tools::Time::SYSTEM ); // current time
     return GetFormatted( aTime, eFormat, rFormatter, eLang );
 }
 
-OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
+OUString SvxExtTimeField::GetFormatted( tools::Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
 {
     switch( eFormat )
     {
@@ -1269,7 +1269,7 @@ void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ )
 SvxDateTimeField::SvxDateTimeField() {}
 
 OUString SvxDateTimeField::GetFormatted(
-    Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage )
+    Date& rDate, tools::Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage )
 {
     OUString aRet;
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 191bbe833291..967ae2338931 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1551,7 +1551,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b
 
     SvxAutoCorrectLanguageListsPtr pLists = 0;
 
-    Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( Time::EMPTY );
+    tools::Time nMinTime( 0, 2 ), nAktTime( tools::Time::SYSTEM ), nLastCheckTime( tools::Time::EMPTY );
 
     std::map<LanguageTag, long>::iterator nFndPos = aLastFileTable.find(rLanguageTag);
     if(nFndPos != aLastFileTable.end() &&
@@ -1925,8 +1925,8 @@ SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists(
 :   sShareAutoCorrFile( rShareAutoCorrectFile ),
     sUserAutoCorrFile( rUserAutoCorrectFile ),
     aModifiedDate( Date::EMPTY ),
-    aModifiedTime( Time::EMPTY ),
-    aLastCheckTime( Time::EMPTY ),
+    aModifiedTime( tools::Time::EMPTY ),
+    aLastCheckTime( tools::Time::EMPTY ),
     pCplStt_ExcptLst( 0 ),
     pWrdStt_ExcptLst( 0 ),
     pAutocorr_List( 0 ),
@@ -1947,12 +1947,12 @@ bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
     // Access the file system only every 2 minutes to check the date stamp
     bool bRet = false;
 
-    Time nMinTime( 0, 2 );
-    Time nAktTime( Time::SYSTEM );
+    tools::Time nMinTime( 0, 2 );
+    tools::Time nAktTime( tools::Time::SYSTEM );
     if( aLastCheckTime > nAktTime ||                    // overflow?
         ( nAktTime -= aLastCheckTime ) > nMinTime )     // min time past
     {
-        Date aTstDate( Date::EMPTY ); Time aTstTime( Time::EMPTY );
+        Date aTstDate( Date::EMPTY ); tools::Time aTstTime( tools::Time::EMPTY );
         if( FStatHelper::GetModifiedDateTimeOfFile( sShareAutoCorrFile,
                                             &aTstDate, &aTstTime ) &&
             ( aModifiedDate != aTstDate || aModifiedTime != aTstTime ))
@@ -1967,7 +1967,7 @@ bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
                 delete pAutocorr_List, pAutocorr_List = 0;
             nFlags &= ~(CplSttLstLoad | WrdSttLstLoad | ChgWordLstLoad );
         }
-        aLastCheckTime = Time( Time::SYSTEM );
+        aLastCheckTime = tools::Time( tools::Time::SYSTEM );
     }
     return bRet;
 }
@@ -2038,7 +2038,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
         // Set time stamp
         FStatHelper::GetModifiedDateTimeOfFile( sShareAutoCorrFile,
                                         &aModifiedDate, &aModifiedTime );
-        aLastCheckTime = Time( Time::SYSTEM );
+        aLastCheckTime = tools::Time( tools::Time::SYSTEM );
     }
 
 }
@@ -2138,7 +2138,7 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
     // Set time stamp
     FStatHelper::GetModifiedDateTimeOfFile( sShareAutoCorrFile,
                                     &aModifiedDate, &aModifiedTime );
-    aLastCheckTime = Time( Time::SYSTEM );
+    aLastCheckTime = tools::Time( tools::Time::SYSTEM );
 
     return pAutocorr_List;
 }
@@ -2184,7 +2184,7 @@ bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const OUString& rNew)
         // Set time stamp
         FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
                                             &aModifiedDate, &aModifiedTime );
-        aLastCheckTime = Time( Time::SYSTEM );
+        aLastCheckTime = tools::Time( tools::Time::SYSTEM );
         aRet = true;
     }
     return aRet;
@@ -2205,7 +2205,7 @@ bool SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const OUString& rNew)
         // Set time stamp
         FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
                                             &aModifiedDate, &aModifiedTime );
-        aLastCheckTime = Time( Time::SYSTEM );
+        aLastCheckTime = tools::Time( tools::Time::SYSTEM );
         aRet = true;
     }
     return aRet;
@@ -2238,7 +2238,7 @@ void SvxAutoCorrectLanguageLists::SaveCplSttExceptList()
     // Set time stamp
     FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
                                             &aModifiedDate, &aModifiedTime );
-    aLastCheckTime = Time( Time::SYSTEM );
+    aLastCheckTime = tools::Time( tools::Time::SYSTEM );
 }
 
 void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList )
@@ -2282,7 +2282,7 @@ void SvxAutoCorrectLanguageLists::SaveWrdSttExceptList()
     // Set time stamp
     FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile,
                                             &aModifiedDate, &aModifiedTime );
-    aLastCheckTime = Time( Time::SYSTEM );
+    aLastCheckTime = tools::Time( tools::Time::SYSTEM );
 }
 
 void SvxAutoCorrectLanguageLists::SetWrdSttExceptList( SvStringsISortDtor* pList )
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index e84482e707e3..8d46c15f8729 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -201,7 +201,7 @@ static util::DateTime getTime(sal_Int64 const nTime)
     util::DateTime aTime;
     memset( &aTime, 0, sizeof( util::DateTime ) );
 
-    Time aTempTime( nTime );
+    tools::Time aTempTime( nTime );
 
     aTime.NanoSeconds = aTempTime.GetNanoSec();
     aTime.Seconds = aTempTime.GetSec();
@@ -211,9 +211,9 @@ static util::DateTime getTime(sal_Int64 const nTime)
     return aTime;
 }
 
-inline Time setTime( util::DateTime& rDate )
+inline tools::Time setTime( util::DateTime& rDate )
 {
-    return Time( rDate.Hours, rDate.Minutes, rDate.Seconds, rDate.NanoSeconds  );
+    return tools::Time( rDate.Hours, rDate.Minutes, rDate.Seconds, rDate.NanoSeconds  );
 }
 
 
@@ -398,7 +398,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
         {
             if( mnServiceId != text::textfield::Type::TIME && mnServiceId != text::textfield::Type::DATE )
             {
-                Time aTime( setTime( mpImpl->maDateTime ) );
+                tools::Time aTime( setTime( mpImpl->maDateTime ) );
                 pData = new SvxExtTimeField( aTime, mpImpl->mbBoolean1?SVXTIMETYPE_FIX:SVXTIMETYPE_VAR );
 
                 if( mpImpl->mnInt32 >= SVXTIMEFORMAT_APPDEFAULT && mpImpl->mnInt32 <= SVXTIMEFORMAT_AM_HMSH )