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 /svx/source/dialog | |
| 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 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/ctredlin.cxx | 22 |
1 files changed, 11 insertions, 11 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()) |