[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/qa sc/source

[Libreoffice Gerrit user]

 sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv |    2 +-
 sc/source/filter/excel/xestyle.cxx                         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 35a78c9082df46b338f0f137485a9a4cd7aede19
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Sun Jul 15 00:35:21 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Mon Jul 16 18:01:41 2018 +0200

    related tdf#117816, the dxf ID is a global and not a sheet property
    
    Change-Id: I4c5ca66ce550de74d8b9396aa0213c558b7f884f
    Reviewed-on: https://gerrit.libreoffice.org/57467
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv b/sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv
index b35f4e58e25b..9bbdfede11ac 100644
--- a/sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv
+++ b/sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv
@@ -1,3 +1,3 @@
 2.00,2
-1,1.00
+1,1.000
 4.00,3
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 746cad084b16..dd74300e4774 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2980,12 +2980,12 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
     mxFormatter->FillKeywordTableForExcel( *mpKeywordTable );
 
     SCTAB nTables = rRoot.GetDoc().GetTableCount();
+    sal_Int32 nIndex = 0;
     for(SCTAB nTab = 0; nTab < nTables; ++nTab)
     {
         ScConditionalFormatList* pList = rRoot.GetDoc().GetCondFormList(nTab);
         if (pList)
         {
-            sal_Int32 nIndex = 0;
             for (ScConditionalFormatList::const_iterator itr = pList->begin();
                     itr != pList->end(); ++itr)
             {