diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-07-15 00:35:21 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-07-15 23:58:19 +0200 |
| commit | 0f0466c6498287c3eb790136655ac65f501b9f0f (patch) | |
| tree | 2855151f3e38bb836d7c4e04636cadaefc697940 | |
| parent | 16048ebc230880148346f02403820b7646b2649c (diff) | |
related tdf#117816, the dxf ID is a global and not a sheet property
Change-Id: I4c5ca66ce550de74d8b9396aa0213c558b7f884f
Reviewed-on: https://gerrit.libreoffice.org/57445
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | sc/qa/unit/data/contentCSV/new_cond_format_test_sheet2.csv | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 050eaa850c30..ca0db5c3e42f 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2981,12 +2981,12 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) xFormatter->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) { |