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

Ayantha Randika randika.deultima at gmail.com
Sat Jan 25 12:17:12 PST 2014


 sc/source/filter/excel/xehelper.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 28e9efe5b4d6699b33498953e798f76008edaeda
Author: Ayantha Randika <randika.deultima at gmail.com>
Date:   Fri Jan 24 00:08:31 2014 +0530

    fdo#40694 - Error in message when truncating col/row numbers in calc
    
    It looks like while older version (3.5.x) gives a wrong warning
    The newer version doesn't give any warnings.
    With this it gives the warning with correct message.
    
    Change-Id: Iad3eac92527ac6acbc534fe77d8d39e5b242ca93
    Reviewed-on: https://gerrit.libreoffice.org/7618
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 8951e13..efdc6d8 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -166,10 +166,13 @@ bool XclExpAddressConverter::CheckAddress( const ScAddress& rScPos, bool bWarn )
     bool bValidTab = (0 <= rScPos.Tab()) && (rScPos.Tab() <= maMaxPos.Tab());
 
     bool bValid = bValidCol && bValidRow && bValidTab;
-    if( !bValid && bWarn )
+    if( !bValid )
     {
         mbColTrunc |= !bValidCol;
         mbRowTrunc |= !bValidRow;
+    }
+    if( !bValid && bWarn )
+    {
         mbTabTrunc |= (rScPos.Tab() > maMaxPos.Tab());  // do not warn for deleted refs
         mrTracer.TraceInvalidAddress( rScPos, maMaxPos );
     }


More information about the Libreoffice-commits mailing list