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>

4 files changed, 16 insertions, 16 deletions

diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 6125f0f3870a..e88c880d6ee3 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -199,8 +199,8 @@ void SvxRedlinTable::UpdateFilterTest()
     sal_uInt16 nYEAR=aDateMax.GetYear()+100;
     aDateMax.SetYear(nYEAR);
     Date aDateMin(1,1,1989);
-    Time aTMin(0);
-    Time aTMax(23,59,59);
+    tools::Time aTMin(0);
+    tools::Time aTMax(23,59,59);
 
 
     DateTime aDTMin(aDateMin);
@@ -257,12 +257,12 @@ void SvxRedlinTable::SetLastDate(const Date& aDate)
     aDaTiLast.SetDate(aDate.GetDate());
 }
 
-void SvxRedlinTable::SetFirstTime(const Time& aTime)
+void SvxRedlinTable::SetFirstTime(const tools::Time& aTime)
 {
     aDaTiFirst.SetTime(aTime.GetTime());
 }
 
-void SvxRedlinTable::SetLastTime(const Time& aTime)
+void SvxRedlinTable::SetLastTime(const tools::Time& aTime)
 {
     aDaTiLast.SetTime(aTime.GetTime());
 }
@@ -586,7 +586,7 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent)
     RowEnableHdl(m_pCbComment);
 
     Date aDate( Date::SYSTEM );
-    Time aTime( Time::SYSTEM );
+    tools::Time aTime( tools::Time::SYSTEM );
     m_pDfDate->SetDate(aDate);
     m_pTfDate->SetTime(aTime);
     m_pDfDate2->SetDate(aDate);
@@ -681,12 +681,12 @@ void SvxTPFilter::SetFirstDate(const Date &aDate)
     m_pDfDate->SetDate(aDate);
 }
 
-Time SvxTPFilter::GetFirstTime() const
+tools::Time SvxTPFilter::GetFirstTime() const
 {
     return m_pTfDate->GetTime();
 }
 
-void SvxTPFilter::SetFirstTime(const Time &aTime)
+void SvxTPFilter::SetFirstTime(const tools::Time &aTime)
 {
     m_pTfDate->SetTime(aTime);
 }
@@ -702,12 +702,12 @@ void SvxTPFilter::SetLastDate(const Date &aDate)
     m_pDfDate2->SetDate(aDate);
 }
 
-Time SvxTPFilter::GetLastTime() const
+tools::Time SvxTPFilter::GetLastTime() const
 {
     return m_pTfDate2->GetTime();
 }
 
-void SvxTPFilter::SetLastTime(const Time &aTime)
+void SvxTPFilter::SetLastTime(const tools::Time &aTime)
 {
     m_pTfDate2->SetTime(aTime);
 }
@@ -911,7 +911,7 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB )
 IMPL_LINK( SvxTPFilter, TimeHdl, ImageButton*,pIB )
 {
     Date aDate( Date::SYSTEM );
-    Time aTime( Time::SYSTEM );
+    tools::Time aTime( tools::Time::SYSTEM );
     if (pIB == m_pIbClock)
     {
         m_pDfDate->SetDate(aDate);
@@ -1009,7 +1009,7 @@ IMPL_LINK( SvxTPFilter, ModifyDate, void*,pTF)
 {
 
     Date aDate( Date::SYSTEM );
-    Time aTime(0);
+    tools::Time aTime(0);
     if (m_pDfDate==pTF)
     {
         if(m_pDfDate->GetText().isEmpty())
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 8ecaf4f733d0..83c39b82a2b7 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2355,7 +2355,7 @@ namespace
                     _rField.SetText( sTime );
                 else
                 {
-                    _rField.SetTime( ::Time( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ) );
+                    _rField.SetTime( ::tools::Time( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ) );
                     sTime = _rField.GetText();
                 }
             }
@@ -2386,7 +2386,7 @@ void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel )
 
     util::Time aTime;
     if ( _rxModel->getPropertyValue( FM_PROP_DATE ) >>= aTime )
-        static_cast< TimeField* >( m_pWindow )->SetTime( ::Time( aTime ) );
+        static_cast< TimeField* >( m_pWindow )->SetTime( ::tools::Time( aTime ) );
     else
         static_cast< TimeField* >( m_pWindow )->SetText( OUString() );
 }
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 3211331fb241..555d7937374e 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -171,7 +171,7 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
 
             case OBJ_FM_TIMEFIELD:
                 sServiceSpecifier = FM_COMPONENT_TIMEFIELD;
-                aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_TIMEMAX, makeAny( Time( 23, 59, 59, 999999999 ).GetUNOTime() ) ) );
+                aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_TIMEMAX, makeAny( tools::Time( 23, 59, 59, 999999999 ).GetUNOTime() ) ) );
                 break;
 
             case OBJ_FM_NUMERICFIELD:
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index e63b6f70363e..4eb1b6d1981c 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -576,7 +576,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s
     static bool bTimesInited(false);
     static sal_uInt32 nRepeatCount(10L);
     static double fLastTimes[REMEMBERED_TIMES_COUNT];
-    const sal_uInt32 nStartTime(Time::GetSystemTicks());
+    const sal_uInt32 nStartTime(tools::Time::GetSystemTicks());
     sal_uInt32 count(1L);
     sal_uInt32 a;
 
@@ -650,7 +650,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s
 
     if(bDoTimerTest)
     {
-        const sal_uInt32 nStopTime(Time::GetSystemTicks());
+        const sal_uInt32 nStopTime(tools::Time::GetSystemTicks());
         const sal_uInt32 nNeededTime(nStopTime - nStartTime);
         const double fTimePerPaint((double)nNeededTime / (double)nRepeatCount);