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

Resolves: tdf#123748 do not strip date part before calling Time::GetClock()

Browse Source 
GetClock() needs it to properly scale and round the floating point
value. It also handles negative values, fiddling with that is only
needed for the [] formats.

Regression from

    commit e2e4789818
    CommitDate: Fri Aug 31 12:50:52 2018 +0200

        Use tools::Time::GetClock() in number formatter for wall clock time

Change-Id: I05fe9e22886d4e59f110c0a826dadb43234d348a
Reviewed-on: https://gerrit.libreoffice.org/68508
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
This commit is contained in:
Eike Rathke
2019-02-28 14:44:02 +01:00
parent 2538dc89de
commit 609ea85b53
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
svl/source/numbers/zformat.cxx
View File

@@ -3000,7 +3000,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
{ {
using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::i18n;
bool bCalendarSet = false; bool bCalendarSet = false;
double fNumberOrig = fNumber; const double fNumberOrig = fNumber;
bool bRes = false; bool bRes = false;
bool bSign = false; bool bSign = false;
if (fNumber < 0.0) if (fNumber < 0.0)
@@ -3020,10 +3020,6 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
return false; return false;
} }
} }
else
{
fNumber -= floor(fNumber); // Else truncate date
}
bool bInputLine; bool bInputLine;
sal_Int32 nCntPost; sal_Int32 nCntPost;
if ( rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION && if ( rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION &&
@@ -3037,10 +3033,6 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
bInputLine = false; bInputLine = false;
nCntPost = rInfo.nCntPost; nCntPost = rInfo.nCntPost;
} }
if (bSign && !rInfo.bThousand) // No [] format
{
fNumber = 1.0 - fNumber; // "Inverse"
}
OUStringBuffer sSecStr; OUStringBuffer sSecStr;
sal_Int32 nSecPos = 0; // For figure by figure processing sal_Int32 nSecPos = 0; // For figure by figure processing
@@ -3049,7 +3041,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
{ {
sal_uInt16 nCHour, nCMinute, nCSecond; sal_uInt16 nCHour, nCMinute, nCSecond;
double fFractionOfSecond; double fFractionOfSecond;
tools::Time::GetClock( fNumber, nCHour, nCMinute, nCSecond, fFractionOfSecond, nCntPost); tools::Time::GetClock( fNumberOrig, nCHour, nCMinute, nCSecond, fFractionOfSecond, nCntPost);
nHour = nCHour; nHour = nCHour;
nMin = nCMinute; nMin = nCMinute;
nSec = nCSecond; nSec = nCSecond;