[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Aug 23 14:41:35 UTC 2018


 sc/source/core/tool/interpr1.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88897b74118fa6d269ce325aca6a4ac3ac1ae3de
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Wed Aug 15 10:52:38 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 23 16:41:11 2018 +0200

    Resolves: tdf#119034 do not floor() for Logical A1
    
    Either it is 0.0 or it is not.
    
    Change-Id: I8e170e08b7a26ade65ca3b8db26a2d8c581e444c
    Reviewed-on: https://gerrit.libreoffice.org/59057
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 0815f3460fa8a595a085d853e96ffffb8ec0471f)
    Reviewed-on: https://gerrit.libreoffice.org/59494
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 964b9e9e13a4..c78c0593e986 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8083,7 +8083,7 @@ void ScInterpreter::ScAddressFunc()
         sTabStr = GetString().getString();
 
     FormulaGrammar::AddressConvention eConv = FormulaGrammar::CONV_OOO;      // default
-    if( nParamCount >= 4 && 0.0 == ::rtl::math::approxFloor( GetDoubleWithDefault( 1.0)))
+    if (nParamCount >= 4 && 0.0 == GetDoubleWithDefault( 1.0))
         eConv = FormulaGrammar::CONV_XL_R1C1;
     else
     {


More information about the Libreoffice-commits mailing list