[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Markus Mohrhard]

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

New commits:
commit 29a32f6a658843e6a61957178587f026a30f285a
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Feb 11 15:47:10 2014 +0100

    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 at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 9a0f7df..227c1d9 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;