From 16bfddca6187a426523bbe187db4506a34b5511c Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 29 Dec 2014 06:01:27 +0100 Subject: handle relative refs correctly in xls import, fdo#80091 Change-Id: Ia70f96e1d31e71c56f03c828be0a4e49fff4b198 --- sc/source/filter/excel/excform8.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index f206804ee817..042d79bddc08 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -631,9 +631,12 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, ExcRelToScRel8( nRowFirst, nColFirst, aCRD.Ref1, bRNorSF ); ExcRelToScRel8( nRowLast, nColLast, aCRD.Ref2, bRNorSF ); - if( IsComplColRange( nColFirst, nColLast ) ) + bool bColRel = aCRD.Ref1.IsColRel() || aCRD.Ref2.IsColRel(); + bool bRowRel = aCRD.Ref1.IsRowRel() || aCRD.Ref2.IsRowRel(); + + if( !bColRel && IsComplColRange( nColFirst, nColLast ) ) SetComplCol( aCRD ); - else if( IsComplRowRange( nRowFirst, nRowLast ) ) + else if( !bRowRel && IsComplRowRange( nRowFirst, nRowLast ) ) SetComplRow( aCRD ); aStack << aPool.Store( aCRD ); -- cgit