[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Eike Rathke]

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

New commits:
commit 350b00af0a1d0bf516ac308e21849ece77acbaf6
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Aug 26 13:06:05 2015 +0200

    do not parse range fragments as valid ranges
    
    For example, "B2:" or ":B2" were accepted as valid range, with the
    missing part set to A1, which resulted in a A1:B2 range.
    
    An omitted sheet specifier always results in a valid relative sheet,
    hence that flag is set, so testing flags for non-null before the final
    result is available isn't sufficient.
    
    Change-Id: I57d1b7cf71a298e7ac108b0e13aab88208f0f00c
    (cherry picked from commit ed6209f572bad38bdb066be668163fe8acf52056)
    Reviewed-on: https://gerrit.libreoffice.org/18023
    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/address.cxx b/sc/source/core/tool/address.cxx
index fa34c64..0920eb9 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1521,7 +1521,7 @@ static sal_uInt16 lcl_ScRange_Parse_OOo( ScRange& rRange,
                     nRes2 |= SCA_COL_ABSOLUTE;
                 }
             }
-            if (nRes1 && nRes2)
+            if ((nRes1 & SCA_VALID) && (nRes2 & SCA_VALID))
             {
                 // PutInOrder / Justify
                 sal_uInt16 nMask, nBits1, nBits2;