[Libreoffice-commits] core.git: 2 commits - sc/source

[Eike Rathke]

 sc/source/filter/excel/xetable.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 709053fc72db3eacfec0a7d8e47557b34bc6193e
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Dec 6 21:49:15 2016 +0100

    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..

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 8d3bcfe..d22eb46 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 ...
-    const 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 ) ),
commit ed4da005b076b5b1ea96dcc4b8caa994709ee733
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Dec 6 21:48:38 2016 +0100

    Revert "try a volatile"
    
    This reverts commit 8a460cfa1b1ce01c7a479ce2e7f21a92a2c50de3.
    
    Turns out the cause is something completely different..

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 108f7f2..8d3bcfe 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1696,7 +1696,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm )
     // 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 sal_Int32 nTruncatedInt = static_cast<sal_Int32>(std::trunc( nExcelColumnWidth * 100.0 + 0.5 ));
     const double nTruncatedExcelColumnWidth = static_cast<double>(nTruncatedInt) / 100.0;
 
     rStrm.GetCurrentStream()->singleElement( XML_col,