diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-05-16 06:56:26 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-05-16 07:26:40 +0200 |
| commit | c02f3174f7e5e6ed32379d727d4a362420a01d56 (patch) | |
| tree | e301d734ce4f9e2c80dea34fd0db19e1c7560515 /sc | |
| parent | f8b94e51c672eaa55bceaee2ceca72d8399b434b (diff) | |
getCurrentSheetIndex should not be used anymore
getCurrentSheetIndex contains a race condition in the threaded OOXML
import
Change-Id: I0e26198d4053beb6484e835ea0d5530bec402c2b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/extlstcontext.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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<ScIconSetFormat&>(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); |