sc/source/filter/oox/workbookfragment.cxx | 4 ++++
sc/source/filter/oox/worksheethelper.cxx | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6652768ef832f4e1555a01a2962c087fa8937e30
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Feb 1 09:40:52 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Feb 1 14:50:13 2023 +0000
crashtesting: threaded import crash seen in forum-mso-en4-802501.xlsx
sporadically reproducible with tsan and
./instdir/program/soffice.bin --headless --convert-to pdf
~/forum-mso-en4-802501.xlsx
move getTables().applyAutoFilters(), which wants to query tab 1 while
tab 1 is still getting imported, until after the threaded import has
completed.
This call was moved before in:
commit edd51b813005c2159426d8f2917eede5b14a4577
Date: Thu Aug 15 16:23:46 2013 +0100
fix for bnc#834705 missing drop downs for autofilter
==================
WARNING: ThreadSanitizer: data race (pid=3791886)
Read of size 8 at 0x7b5000040f20 by thread T7 (mutexes: write M0, write
M1):
#0 __gnu_cxx::__normal_iterator<unsigned long const*,
std::vector<unsigned long, std::allocator<unsigned
long>>>::__normal_iterator(unsigned long const* const&)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/stl_iterator.h:1073:20
(libsclo.so+0x3d31c4) (BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#1 std::vector<unsigned long, std::allocator<unsigned long>>::cend()
const
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/stl_vector.h:960:16
(libsclo.so+0x3d31c4)
#2
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::cbegin() const
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:3771:34
(libsclo.so+0x3d31c4)
#3
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::begin() const
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:3753:12
(libsclo.so+0x3d31c4)
#4 ScColumn::InitBlockPosition(sc::ColumnBlockConstPosition&) const
core/sc/source/core/data/column3.cxx:1135:35 (libsclo.so+0x3d31c4)
#5 ScTable::GetDataArea(short&, int&, short&, int&, bool, bool) const
core/sc/source/core/data/table1.cxx:908:19 (libsclo.so+0x637b39) (BuildId:
4582437348063bd1c461478348ce37a0dbd28def)
#6 ScDocument::GetDataArea(short, short&, int&, short&, int&, bool,
bool) const core/sc/source/core/data/document.cxx:1104:23 (libsclo.so+0x49b696)
(BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#7 ScDBData::ExtendDataArea(ScDocument const&)
core/sc/source/core/tool/dbdata.cxx:654:10 (libsclo.so+0x741e77) (BuildId:
4582437348063bd1c461478348ce37a0dbd28def)
#8 ScDocument::GetFilterEntries(short, int, short, ScFilterEntries&)
core/sc/source/core/data/documen3.cxx:1577:14 (libsclo.so+0x46e7a6) (BuildId:
4582437348063bd1c461478348ce37a0dbd28def)
#9 (anonymous namespace)::fillQueryParam(ScQueryParam&, ScDocument*,
com::sun::star::uno::Sequence<com::sun::star::sheet::TableFilterField3> const&)
core/sc/source/ui/unoobj/datauno.cxx:1164:27 (libsclo.so+0xf7dd72) (BuildId:
4582437348063bd1c461478348ce37a0dbd28def)
#10
ScFilterDescriptorBase::setFilterFields3(com::sun::star::uno::Sequence<com::sun::star::sheet::TableFilterField3>
const&) core/sc/source/ui/unoobj/datauno.cxx:1380:5 (libsclo.so+0xf7dd72)
#11 non-virtual thunk to
ScFilterDescriptorBase::setFilterFields3(com::sun::star::uno::Sequence<com::sun::star::sheet::TableFilterField3>
const&) core/sc/source/ui/unoobj/datauno.cxx (libsclo.so+0xf7e2c2) (BuildId:
4582437348063bd1c461478348ce37a0dbd28def)
#12
oox::xls::AutoFilter::finalizeImport(com::sun::star::uno::Reference<com::sun::star::sheet::XDatabaseRange>
const&, short) core/sc/source/filter/oox/autofilterbuffer.cxx:803:22
(libscfiltlo.so+0x3cca2c) (BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#13
oox::xls::AutoFilterBuffer::finalizeImport(com::sun::star::uno::Reference<com::sun::star::sheet::XDatabaseRange>
const&, short) core/sc/source/filter/oox/autofilterbuffer.cxx:950:22
(libscfiltlo.so+0x3cdc0b) (BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#14 oox::xls::Table::applyAutoFilters()
core/sc/source/filter/oox/tablebuffer.cxx:143:23 (libscfiltlo.so+0x4b9268)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#15 void std::__invoke_impl<void, void (oox::xls::Table::*&)(),
oox::xls::Table&>(std::__invoke_memfun_ref, void (oox::xls::Table::*&)(),
oox::xls::Table&)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/invoke.h:67:14
(libscfiltlo.so+0x4b9d96) (BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#16 std::__invoke_result<void (oox::xls::Table::*&)(),
oox::xls::Table&>::type std::__invoke<void (oox::xls::Table::*&)(),
oox::xls::Table&>(void (oox::xls::Table::*&)(), oox::xls::Table&)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/invoke.h:96:14
(libscfiltlo.so+0x4b9d96)
#17 void std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()>::__call<void, oox::xls::Table&,
0ul>(std::tuple<oox::xls::Table&>&&, std::_Index_tuple<0ul>)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/functional:495:11
(libscfiltlo.so+0x4b9d96)
#18 void std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()>::operator()<oox::xls::Table&,
void>(oox::xls::Table&)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/functional:580:17
(libscfiltlo.so+0x4b9d96)
#19 oox::RefMap<int, oox::xls::Table,
std::less<int>>::ForEachFunctor<std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()>>::operator()(std::pair<int const,
std::shared_ptr<oox::xls::Table>> const&)
core/include/oox/helper/refmap.hxx:122:89 (libscfiltlo.so+0x4b9d96)
#20 oox::RefMap<int, oox::xls::Table,
std::less<int>>::ForEachFunctor<std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()>>
std::for_each<std::_Rb_tree_const_iterator<std::pair<int const,
std::shared_ptr<oox::xls::Table>>>, oox::RefMap<int, oox::xls::Table,
std::less<int>>::ForEachFunctor<std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()>>>(std::_Rb_tree_const_iterator<std::pair<int const,
std::shared_ptr<oox::xls::Table>>>, std::_Rb_tree_const_iterator<std::pair<int
const, std::shared_ptr<oox::xls::Table>>>, oox::RefMap<int, oox::xls::Table,
std::less<int>>::ForEachFunctor<std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()>>)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/stl_algo.h:3787:2
(libscfiltlo.so+0x4b9d96)
#21 void oox::RefMap<int, oox::xls::Table,
std::less<int>>::forEach<std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()>>(std::_Bind<void (oox::xls::Table::*
(std::_Placeholder<1>))()> const&) const
core/include/oox/helper/refmap.hxx:71:29 (libscfiltlo.so+0x4b9d96)
#22 void oox::RefMap<int, oox::xls::Table,
std::less<int>>::forEachMem<void (oox::xls::Table::*)()>(void
(oox::xls::Table::*)()) const core/include/oox/helper/refmap.hxx:79:29
(libscfiltlo.so+0x4b9d96)
#23 oox::xls::TableBuffer::applyAutoFilters()
core/sc/source/filter/oox/tablebuffer.cxx:179:16 (libscfiltlo.so+0x4b9d96)
#24 oox::xls::WorksheetGlobals::finalizeWorksheetImport()
core/sc/source/filter/oox/worksheethelper.cxx:943:17 (libscfiltlo.so+0x4ee58e)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#25 oox::xls::WorksheetHelper::finalizeWorksheetImport()
core/sc/source/filter/oox/worksheethelper.cxx:1625:17 (libscfiltlo.so+0x4f2cff)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#26 oox::xls::WorksheetFragment::finalizeImport()
core/sc/source/filter/oox/worksheetfragment.cxx:632:5 (libscfiltlo.so+0x4e91cc)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#27 oox::core::FragmentHandler2::endDocument()
core/oox/source/core/fragmenthandler2.cxx:53:5 (libooxlo.so+0x1c20d9) (BuildId:
eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#28 non-virtual thunk to oox::core::FragmentHandler2::endDocument()
core/oox/source/core/fragmenthandler2.cxx (libooxlo.so+0x1c20d9)
#29
sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource
const&) core/sax/source/fastparser/fastparser.cxx:910:36
(libexpwraplo.so+0x2a06a) (BuildId: 4c8d8739ce3b93f891afa1e160f975a2892a4af4)
#30
sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource
const&) core/sax/source/fastparser/fastparser.cxx:1482:13
(libexpwraplo.so+0x31738) (BuildId: 4c8d8739ce3b93f891afa1e160f975a2892a4af4)
#31
oox::core::FastParser::parseStream(com::sun::star::xml::sax::InputSource
const&, bool) core/oox/source/core/fastparser.cxx:121:15 (libooxlo.so+0x1ae980)
(BuildId: eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#32
oox::core::FastParser::parseStream(com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
const&, rtl::OUString const&) core/oox/source/core/fastparser.cxx:129:5
(libooxlo.so+0x1aebdf) (BuildId: eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#33
oox::core::XmlFilterBase::importFragment(rtl::Reference<oox::core::FragmentHandler>
const&, oox::core::FastParser&) core/oox/source/core/xmlfilterbase.cxx:412:21
(libooxlo.so+0x1d01ac) (BuildId: eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#34
oox::xls::WorkbookHelper::importOoxFragment(rtl::Reference<oox::core::FragmentHandler>
const&, oox::core::FastParser&)
core/sc/source/filter/oox/workbookhelper.cxx:1024:27 (libscfiltlo.so+0x4dbbd2)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#35 oox::xls::(anonymous namespace)::WorkerThread::doWork()
core/sc/source/filter/oox/workbookfragment.cxx:249:27 (libscfiltlo.so+0x4d3347)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#36 comphelper::ThreadTask::exec()
core/comphelper/source/misc/threadpool.cxx:319:9 (libcomphelper.so+0x17dbc1)
(BuildId: 30a9bf106ea764f860a55d99b75dd87a0f268335)
#37 comphelper::ThreadPool::ThreadWorker::execute()
core/comphelper/source/misc/threadpool.cxx:85:24 (libcomphelper.so+0x17dbc1)
#38 salhelper::Thread::run() core/salhelper/source/thread.cxx:39:5
(libuno_salhelpergcc3.so.3+0x5267) (BuildId:
d146f721ac5d8da923b02df0d671788655b81eb6)
#39 non-virtual thunk to salhelper::Thread::run()
core/salhelper/source/thread.cxx (libuno_salhelpergcc3.so.3+0x5267)
#40 threadFunc core/include/osl/thread.hxx:189:15
(libuno_salhelpergcc3.so.3+0x551e) (BuildId:
d146f721ac5d8da923b02df0d671788655b81eb6)
#41 osl_thread_start_Impl(void*) core/sal/osl/unx/thread.cxx:265:9
(libuno_sal.so.3+0x6a9d5) (BuildId: 767a6cd7c58bf820064a10cf0ab0f15b30c2f4ac)
Previous write of size 8 at 0x7b5000040f20 by thread T6 (mutexes: write
M2):
#0 std::vector<unsigned long, std::allocator<unsigned
long>>::_M_fill_insert(__gnu_cxx::__normal_iterator<unsigned long*,
std::vector<unsigned long, std::allocator<unsigned long>>>, unsigned long,
unsigned long const&)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/vector.tcc:556:29
(libsclo.so+0x2f6766) (BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#1 std::vector<unsigned long, std::allocator<unsigned
long>>::insert(__gnu_cxx::__normal_iterator<unsigned long const*,
std::vector<unsigned long, std::allocator<unsigned long>>>, unsigned long,
unsigned long const&)
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/stl_vector.h:1435:2
(libsclo.so+0x2ffd3a) (BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#2
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::blocks_type::insert(unsigned long,
unsigned long)
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:99:15
(libsclo.so+0x2ffd3a)
#3
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::set_new_block_to_middle(unsigned long,
unsigned long, unsigned long, bool)
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:4326:19
(libsclo.so+0x2ffd3a)
#4
mdds::mtv::soa::detail::iterator_base<mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::iterator_trait>
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>,
sc::CellStoreTrait>::set_cell_to_middle_of_block<double>(unsigned long,
unsigned long, double const&)
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:3999:19
(libsclo.so+0x3259fe) (BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#5
mdds::mtv::soa::detail::iterator_base<mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::iterator_trait>
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::set_cell_to_empty_block<double>(unsigned
long, unsigned long, double const&)
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:3313:12
(libsclo.so+0x3259fe)
#6
mdds::mtv::soa::detail::iterator_base<mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::iterator_trait>
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::set_impl<double>(unsigned long, unsigned
long, double const&)
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:1260:16
(libsclo.so+0x32492f) (BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#7
mdds::mtv::soa::detail::iterator_base<mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::iterator_trait>
mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>,
sc::CellStoreTrait>::set<double>(mdds::mtv::soa::detail::iterator_base<mdds::mtv::soa::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell>>, sc::CellStoreTrait>::iterator_trait> const&, unsigned long,
double const&) core/wo
rkdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:754:20
(libsclo.so+0x4cc138) (BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#8 ScDocumentImport::setNumericCell(ScAddress const&, double)
core/sc/source/core/data/documentimport.cxx:259:35 (libsclo.so+0x4cc138)
#9 oox::xls::SheetDataBuffer::setValueCell(oox::xls::CellModel const&,
double) core/sc/source/filter/oox/sheetdatabuffer.cxx:107:20
(libscfiltlo.so+0x4833c0) (BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#10 oox::xls::SheetDataContext::onEndElement()
core/sc/source/filter/oox/sheetdatacontext.cxx:185:25 (libscfiltlo.so+0x48fed2)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#11 non-virtual thunk to oox::xls::SheetDataContext::onEndElement()
core/sc/source/filter/oox/sheetdatacontext.cxx (libscfiltlo.so+0x48fff9)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#12 oox::core::ContextHandler2Helper::implEndElement(int)
core/oox/source/core/contexthandler2.cxx:125:9 (libooxlo.so+0x1ac82b) (BuildId:
eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#13 oox::core::ContextHandler2::endFastElement(int)
core/oox/source/core/contexthandler2.cxx:220:5 (libooxlo.so+0x1ac82b)
#14 non-virtual thunk to
oox::core::ContextHandler2::endFastElement(int)
core/oox/source/core/contexthandler2.cxx (libooxlo.so+0x1ac82b)
#15 (anonymous namespace)::Entity::endElement()
core/sax/source/fastparser/fastparser.cxx:515:27 (libexpwraplo.so+0x3042f)
(BuildId: 4c8d8739ce3b93f891afa1e160f975a2892a4af4)
#16 sax_fastparser::FastSaxParserImpl::consume((anonymous
namespace)::EventList&) core/sax/source/fastparser/fastparser.cxx:1029:25
(libexpwraplo.so+0x29d37) (BuildId: 4c8d8739ce3b93f891afa1e160f975a2892a4af4)
#17
sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource
const&) core/sax/source/fastparser/fastparser.cxx:869:22
(libexpwraplo.so+0x29d37)
#18
sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource
const&) core/sax/source/fastparser/fastparser.cxx:1482:13
(libexpwraplo.so+0x31738) (BuildId: 4c8d8739ce3b93f891afa1e160f975a2892a4af4)
#19
oox::core::FastParser::parseStream(com::sun::star::xml::sax::InputSource
const&, bool) core/oox/source/core/fastparser.cxx:121:15 (libooxlo.so+0x1ae980)
(BuildId: eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#20
oox::core::FastParser::parseStream(com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
const&, rtl::OUString const&) core/oox/source/core/fastparser.cxx:129:5
(libooxlo.so+0x1aebdf) (BuildId: eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#21
oox::core::XmlFilterBase::importFragment(rtl::Reference<oox::core::FragmentHandler>
const&, oox::core::FastParser&) core/oox/source/core/xmlfilterbase.cxx:412:21
(libooxlo.so+0x1d01ac) (BuildId: eba40a8f6e1e986eafb2008b5a61a9060f9b6c0b)
#22
oox::xls::WorkbookHelper::importOoxFragment(rtl::Reference<oox::core::FragmentHandler>
const&, oox::core::FastParser&)
core/sc/source/filter/oox/workbookhelper.cxx:1024:27 (libscfiltlo.so+0x4dbbd2)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#23 oox::xls::(anonymous namespace)::WorkerThread::doWork()
core/sc/source/filter/oox/workbookfragment.cxx:249:27 (libscfiltlo.so+0x4d3347)
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#24 comphelper::ThreadTask::exec()
core/comphelper/source/misc/threadpool.cxx:319:9 (libcomphelper.so+0x17dbc1)
(BuildId: 30a9bf106ea764f860a55d99b75dd87a0f268335)
#25 comphelper::ThreadPool::ThreadWorker::execute()
core/comphelper/source/misc/threadpool.cxx:85:24 (libcomphelper.so+0x17dbc1)
#26 salhelper::Thread::run() core/salhelper/source/thread.cxx:39:5
(libuno_salhelpergcc3.so.3+0x5267) (BuildId:
d146f721ac5d8da923b02df0d671788655b81eb6)
#27 non-virtual thunk to salhelper::Thread::run()
core/salhelper/source/thread.cxx (libuno_salhelpergcc3.so.3+0x5267)
#28 threadFunc core/include/osl/thread.hxx:189:15
(libuno_salhelpergcc3.so.3+0x551e) (BuildId:
d146f721ac5d8da923b02df0d671788655b81eb6)
#29 osl_thread_start_Impl(void*) core/sal/osl/unx/thread.cxx:265:9
(libuno_sal.so.3+0x6a9d5) (BuildId: 767a6cd7c58bf820064a10cf0ab0f15b30c2f4ac)
Change-Id: I7542432749fded8ab5e35f79cb221ad712f7802d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146430
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index 127823995b38..2702335ddbbf 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -477,6 +477,10 @@ void WorkbookFragment::finalizeImport()
// load all worksheets
importSheetFragments(*this, aSheetFragments);
+ // assumes getTables().finalizeImport ( which creates the DatabaseRanges )
+ // has been called already
+ getTables().applyAutoFilters();
+
sal_Int16 nActiveSheet = getViewSettings().getActiveCalcSheet();
getWorksheets().finalizeImport( nActiveSheet );
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index 2c409e0d7b14..7bf652107475 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -938,9 +938,6 @@ void WorksheetGlobals::finalizeWorksheetImport()
{
lclUpdateProgressBar( mxRowProgress, 1.0 );
maSheetData.finalizeImport();
- // assumes getTables().finalizeImport ( which creates the DatabaseRanges )
- // has been called already
- getTables().applyAutoFilters();
getCondFormats().finalizeImport();
lclUpdateProgressBar( mxFinalProgress, 0.25 );
