summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-12-06 21:48:38 +0100
committerEike Rathke <erack@redhat.com>2016-12-06 22:23:34 +0000
commit21be787405b840906233530702165bda3da96fc1 (patch)
treefbc9104bb5a18350f499840108dfef0cf03a9477
parent78223678b7513ffe46804cb08f2dc5bc899b2bab (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/31705 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
-rw-r--r--sc/source/filter/excel/xetable.cxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 355e1a11127b..30a3da417462 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1690,14 +1690,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 ) ),