summaryrefslogtreecommitdiff
path: root/sc/qa/unit/ucalc.cxx
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-09-17 13:37:24 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-09-18 00:15:23 +0200
commit5a2cc16f701a8e03307f6d5286e53c3305d9c6a4 (patch)
tree5c35e7a8af8c84d1808473eb0d8261d272f8acbb /sc/qa/unit/ucalc.cxx
parentbebb04bec523efe300863a39df719795cb4379cc (diff)
make sure that we are not trying to load the filter lib in ucalc
This casues crashes on exit as the ucalc lib loads the filter lib which is linked against the sclo lib. The sclo lib is statically linked into the ucalc code so that this causes the symbols to be two times in the program. Change-Id: I93e5a9b4dffa7c4b797ffef91b91f5f29f65348e
Diffstat (limited to 'sc/qa/unit/ucalc.cxx')
-rw-r--r--sc/qa/unit/ucalc.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 954669422cb8..7e8654f3ea0e 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -134,6 +134,7 @@ void Test::setUp()
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+ m_pImpl->m_xDocShell->SetIsInUcalc();
m_pImpl->m_xDocShell->DoInitUnitTest();
m_pDoc = &m_pImpl->m_xDocShell->GetDocument();
}
@@ -4436,6 +4437,7 @@ void Test::testCopyPasteFormulasExternalDoc()
m_pDoc = &getDocShell().GetDocument();
ScDocShellRef xExtDocSh = new ScDocShell;
+ xExtDocSh->SetIsInUcalc();
OUString aExtDocName("file:///extdata.fake");
OUString aExtSh1Name("ExtSheet1");
OUString aExtSh2Name("ExtSheet2");