diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-11 15:47:10 +0100 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2014-02-14 15:02:04 +0000 |
| commit | 29a32f6a658843e6a61957178587f026a30f285a (patch) | |
| tree | 2708bda343d157228593d8c7a1ff0d7f321f8168 | |
| parent | 3804d1c27128992593fe2d770293bfb189d308b1 (diff) | |
don't crash in mixed reference/no reference cases, related fdo#59853
Change-Id: Iecb4841dae5f5df28c697e1ea9998251d9975b5d
Reviewed-on: https://gerrit.libreoffice.org/8039
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
| -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; |