From 8129a28dbe68bc08ca881b5521e7adc393dd6f80 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@collabora.co.uk>
Date: Tue, 11 Feb 2014 15:47:10 +0100
Subject: don't crash in mixed reference/no reference cases, related fdo#59853

Change-Id: Iecb4841dae5f5df28c697e1ea9998251d9975b5d
---
 sc/source/filter/oox/sheetdatacontext.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 9a0f7dfd83f6..227c1d9783f5 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -278,7 +278,10 @@ void SheetDataContext::importRow( const AttributeList& rAttribs )
     RowModel aModel;
     sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 );
     if(nRow != -1)
-        aModel.mnRow          = nRow;
+    {
+        aModel.mnRow = nRow;
+        mnRow = nRow;
+    }
     else
         aModel.mnRow = ++mnRow;
     mnCol = -1;
-- 
cgit