diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-11 15:47:10 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-12 01:01:36 +0100 |
commit | 8129a28dbe68bc08ca881b5521e7adc393dd6f80 (patch) | |
tree | 2a80826578adcb6dcd1269a423af54e84ab3a936 | |
parent | 70b30060029c57780d92b652696514d6d4b5739c (diff) |
don't crash in mixed reference/no reference cases, related fdo#59853
Change-Id: Iecb4841dae5f5df28c697e1ea9998251d9975b5d
-rw-r--r-- | sc/source/filter/oox/sheetdatacontext.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
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; |