[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

[Tsutomu Uchino]

 sc/source/ui/docshell/externalrefmgr.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 82f67031551c3e153b5977d2cc40ce68dda68ba0
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Thu Jan 15 18:14:41 2015 +0000

    #i117843# avoid shrinking the range from external file until the matrix supports gap from the original range

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 62b3c3e..057237f 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1369,10 +1369,11 @@ static ScTokenArray* lcl_convertToTokenArray(ScDocument* pSrcDoc, ScRange& rRang
         // Only loop within the data area.
         SCCOL nDataCol1 = nCol1, nDataCol2 = nCol2;
         SCROW nDataRow1 = nRow1, nDataRow2 = nRow2;
-        bool bShrunk;
-        if (!pSrcDoc->ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2, false))
+        // the matrix for shrunken data range gives invalid match until the matrix supports the gap
+        //bool bShrunk;
+        //if (!pSrcDoc->ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2, false))
             // no data within specified range.
-            continue;
+        //    continue;
 
         if (pUsedRange.get())
             // Make sure the used area only grows, not shrinks.