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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/dialogs/postdlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optmemory.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optupdt.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 3bec42caa6ad..67eb4ca287eb 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -182,7 +182,7 @@ IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl) IMPL_LINK_NOARG(SvxPostItDialog, Stamp) { Date aDate( Date::SYSTEM ); - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); OUString aTmp( SvtUserOptions().GetID() ); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); OUString aStr( m_pEditED->GetText() ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 787cf6f0a7f2..255356f742a4 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -174,7 +174,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) officecfg::Office::Common::Cache::GraphicManager::ObjectCacheSize::set( objectCacheSize, batch); - const Time aTime( m_pTfGraphicObjectTime->GetTime() ); + const tools::Time aTime( m_pTfGraphicObjectTime->GetTime() ); sal_Int32 objectReleaseTime = aTime.GetSec() + aTime.GetMin() * 60 + aTime.GetHour() * 3600; officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime::set( @@ -227,7 +227,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) sal_Int32 nTime = officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime:: get(); - Time aTime( (sal_uInt16)( nTime / 3600 ), (sal_uInt16)( ( nTime % 3600 ) / 60 ), (sal_uInt16)( ( nTime % 3600 ) % 60 ) ); + tools::Time aTime( (sal_uInt16)( nTime / 3600 ), (sal_uInt16)( ( nTime % 3600 ) / 60 ), (sal_uInt16)( ( nTime % 3600 ) % 60 ) ); m_pTfGraphicObjectTime->SetTime( aTime ); GraphicCacheConfigHdl(m_pNfGraphicCache); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 702373b53009..3a7c6715b2dc 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -108,7 +108,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() oslDateTime lastCheckedDT; Date aDate( Date::EMPTY ); - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); lastCheckedTV.Seconds = (sal_uInt32) lastChecked; osl_getLocalTimeFromSystemTime( &lastCheckedTV, &lastCheckedTV ); @@ -116,7 +116,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() if ( osl_getDateTimeFromTimeValue( &lastCheckedTV, &lastCheckedDT ) ) { aDate = Date( lastCheckedDT.Day, lastCheckedDT.Month, lastCheckedDT.Year ); - aTime = Time( lastCheckedDT.Hours, lastCheckedDT.Minutes ); + aTime = ::tools::Time( lastCheckedDT.Hours, lastCheckedDT.Minutes ); } LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType(); |