strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a date is a date, without time

Browse source 
And use DateTime instead of manually concatenating Date and Time.

Change-Id: I6f9fb988beea2a9a17c976d3b98860c4f9ed063b
This commit is contained in:
Eike Rathke 2014-08-19 19:05:40 +02:00
parent f47baab6d3
commit 11f145d90f
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sc/source/ui/view/viewfun6.cxx
View file

@ -244,15 +244,31 @@ void ScViewFunc::InsertCurrentTime(short nCellFmt, const OUString& rUndoStr)
ScDocument& rDoc = pDocSh->GetDocument();
::svl::IUndoManager* pUndoMgr = pDocSh->GetUndoManager();
SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
double fVal;
switch (nCellFmt)
{
case NUMBERFORMAT_DATE:
{
Date aActDate( Date::SYSTEM );
double fDate = aActDate - *pFormatter->GetNullDate();
Time aActTime( Time::SYSTEM );
double fTime = aActTime.GetHour() / static_cast<double>(::Time::hourPerDay) +
aActTime.GetMin() / static_cast<double>(::Time::minutePerDay) +
aActTime.GetSec() / static_cast<double>(::Time::secondPerDay) +
aActTime.GetNanoSec() / static_cast<double>(::Time::nanoSecPerDay);
fVal = aActDate - *pFormatter->GetNullDate();
}
break;
default:
assert(!"unhandled current date/time");
// fallthru
case NUMBERFORMAT_TIME:
case NUMBERFORMAT_DATETIME: // for now treat datetime and time identically
{
DateTime aActDateTime( DateTime::SYSTEM );
// Converting the null date to DateTime forces the correct
// operator-() to be used, resulting in a fractional date&time
// instead of only date value.
fVal = aActDateTime - DateTime( *pFormatter->GetNullDate());
}
break;
}
pUndoMgr->EnterListAction(rUndoStr, rUndoStr);
pDocSh->GetDocFunc().SetValueCell(aCurPos, fDate+fTime, true);
pDocSh->GetDocFunc().SetValueCell(aCurPos, fVal, true);
// Set the new cell format only when it differs from the current cell
// format type.