From c02f3174f7e5e6ed32379d727d4a362420a01d56 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 16 May 2015 06:56:26 +0200 Subject: getCurrentSheetIndex should not be used anymore getCurrentSheetIndex contains a race condition in the threaded OOXML import Change-Id: I0e26198d4053beb6484e835ea0d5530bec402c2b --- sc/source/filter/oox/extlstcontext.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sc') diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 67809e21f791..7371f99574ba 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -83,7 +83,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl assert(rFormat.GetType() == condformat::ICONSET); ScIconSetFormat& rIconSet = static_cast(rFormat); ScDocument* pDoc = &getScDocument(); - SCTAB nTab = getCurrentSheetIndex(); + SCTAB nTab = getSheetIndex(); ScAddress aPos(0, 0, nTab); mpCurrentRule->SetData(&rIconSet, pDoc, aPos); delete mpCurrentRule; @@ -156,7 +156,7 @@ void ExtConditionalFormattingContext::onEndElement() if (!bSuccess || aRange.empty()) break; - SCTAB nTab = getCurrentSheetIndex(); + SCTAB nTab = getSheetIndex(); for (size_t i = 0; i < aRange.size(); ++i) { aRange[i]->aStart.SetTab(nTab); -- cgit