diff options
| author | Eike Rathke <erack@redhat.com> | 2016-12-06 21:48:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-07 08:54:05 +0000 |
| commit | b58a8a42670dd3957a88a06b5fe3b0fe8c86d391 (patch) | |
| tree | 8448fd254ae312ef9e49dfaa1e0f6bb52ae0a8b4 | |
| parent | b1f739b2bc227f81b1ec740e05927e866fa81d94 (diff) | |
Revert "attempt to fix Linux-rpm_deb-x86_71-TDF tinderbox build, tdf#101363"
This is a combination of 2 commits.
Revert "try a volatile"
This reverts commit 8a460cfa1b1ce01c7a479ce2e7f21a92a2c50de3.
Turns out the cause is something completely different..
(cherry picked from commit ed4da005b076b5b1ea96dcc4b8caa994709ee733)
Revert "attempt to fix Linux-rpm_deb-x86_71-TDF tinderbox build for 5-2, tdf#101363"
This reverts commit 39aa5c2c653f36393416a6aadd6e599051bbfe7b.
Turns out the cause is something completely different..
(cherry picked from commit 709053fc72db3eacfec0a7d8e47557b34bc6193e)
Change-Id: I55f4ac6f48029676ec531a021d3b6939f670bde0
Reviewed-on: https://gerrit.libreoffice.org/31701
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/filter/excel/xetable.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 9cfadd15c00b..fe39f238d4f9 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -1691,14 +1691,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) // 100 number - used to limit precision to 0.01 with formula =Truncate( {value}*100+0.5 ) / 100 // 0.5 number (0.005 to output value) - used to increase value before truncating, // to avoid situation when 2.997 will be truncated to 2.99 and not to 3.00 - - // First create an integer value to not have a double floating point with - // something optimized away or into.. yes that was significant in a - // Linux-rpm_deb-x86_71-TDF tinderbox build that oddly produced 24.23 - // instead of 24 in a test case but only for 5-2 ... - volatile sal_Int32 nTruncatedInt = static_cast<sal_Int32>(std::trunc( nExcelColumnWidth * 100.0 + 0.5 )); - const double nTruncatedExcelColumnWidth = static_cast<double>(nTruncatedInt) / 100.0; - + const double nTruncatedExcelColumnWidth = std::trunc( nExcelColumnWidth * 100.0 + 0.5 ) / 100.0; rStrm.GetCurrentStream()->singleElement( XML_col, // OOXTODO: XML_bestFit, XML_collapsed, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_COLLAPSED ) ), |