fix sheet into which we insert extLst cond formats

Change-Id: Idbf9772bbb2c034a6c016492ab31b87e248f7b47

2 files changed, 8 insertions, 1 deletions

diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index b54930e792bf..927513c92029 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1144,10 +1144,10 @@ void CondFormatBuffer::finalizeImport()
 
     for (auto itr = maExtCondFormats.begin(); itr != maExtCondFormats.end(); ++itr)
     {
-        SCTAB nTab = this->getCurrentSheetIndex();
         ScDocument* pDoc = &getScDocument();
 
         const ScRangeList& rRange = itr->getRange();
+        SCTAB nTab = rRange.front()->aStart.Tab();
         ScConditionalFormat* pFormat = findFormatByRange(rRange, pDoc, nTab);
         if (!pFormat)
         {
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 92d7f03e67c7..67809e21f791 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -156,6 +156,13 @@ void ExtConditionalFormattingContext::onEndElement()
             if (!bSuccess || aRange.empty())
                 break;
 
+            SCTAB nTab = getCurrentSheetIndex();
+            for (size_t i = 0; i < aRange.size(); ++i)
+            {
+                aRange[i]->aStart.SetTab(nTab);
+                aRange[i]->aEnd.SetTab(nTab);
+            }
+
             boost::ptr_vector<ExtCfCondFormat>& rExtFormats =  getCondFormats().importExtCondFormat();
             rExtFormats.push_back(new ExtCfCondFormat(aRange, maEntries));
         }