mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd: Avoid looking up system clock twice for current datetime

Browse Source 
Change-Id: I777210723f4c41ee27e2d6497aa466640924d8b5
Reviewed-on: https://gerrit.libreoffice.org/54348
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
This commit is contained in:
Takeshi Abe
2018-05-15 12:31:35 +09:00
parent 717af25158
commit 1de2b14b3f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sd/source/ui/app/sdmod2.cxx
View File

@@ -407,10 +407,9 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
}
else
{
Date aDate( Date::SYSTEM );
tools::Time aTime( tools::Time::SYSTEM );
DateTime aDateTime( DateTime::SYSTEM );
LanguageType eLang = pInfo->GetOutliner()->GetLanguage( pInfo->GetPara(), pInfo->GetPos() );
aRepresentation = SvxDateTimeField::GetFormatted( aDate, aTime,
aRepresentation = SvxDateTimeField::GetFormatted( aDateTime, aDateTime,
rSettings.meDateFormat, rSettings.meTimeFormat, *GetNumberFormatter(), eLang );
}
}

5
sd/source/ui/dlg/headerfooterdlg.cxx
View File

@@ -481,13 +481,12 @@ void HeaderFooterTabPage::FillFormatList( sal_Int32 nSelectedPos )
mpCBDateTimeFormat->Clear();
Date aDate( Date::SYSTEM );
tools::Time aTime( tools::Time::SYSTEM );
DateTime aDateTime( DateTime::SYSTEM );
for( int nFormat = 0; nFormat < nDateTimeFormatsCount; nFormat++ )
{
OUString aStr( SvxDateTimeField::GetFormatted(
aDate, aTime,
aDateTime, aDateTime,
nDateTimeFormats[nFormat].meDateFormat, nDateTimeFormats[nFormat].meTimeFormat,
*(SD_MOD()->GetNumberFormatter()), eLanguage ) );
const sal_Int32 nEntry = mpCBDateTimeFormat->InsertEntry( aStr );