summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAyantha Randika <randika.deultima@gmail.com>2014-01-24 00:08:31 +0530
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-01-25 20:16:50 +0000
commit28e9efe5b4d6699b33498953e798f76008edaeda (patch)
tree588768f90265bf49aaa4a01d7d533189a089c834
parent03cc76aad32b0aa40e229b14d3b2dca3ebc92dd8 (diff)
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@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
-rw-r--r--sc/source/filter/excel/xehelper.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 8951e130fbe5..efdc6d80c15c 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 );
}