summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-07-04 01:52:24 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-07-04 02:17:26 +0200
commit9894c5a3cd545b112a226df88a790f56991af5ed (patch)
tree026e1694f9e7d72dba5aa93ea65db619f87b557a /sc
parent823788d83bd7151a35b95a927dd26e2af1c66804 (diff)
add hard recalc to the remaining calc import tests
Change-Id: I9db8889af83aa172e8d7192994e78c6691a03e71
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index f621c8322ca9..b9b24fc914a7 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -538,6 +538,7 @@ void ScFiltersTest::testMatrixODS()
{
const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("matrix."));
ScDocShellRef xDocSh = loadDoc( aFileNameBase, 0);
+ xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
@@ -552,6 +553,7 @@ void ScFiltersTest::testMatrixXLS()
{
const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("matrix."));
ScDocShellRef xDocSh = loadDoc( aFileNameBase, 1);
+ xDocSh->DoHardRecalc(true);
CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -644,6 +646,7 @@ void ScFiltersTest::testBugFixesODS()
rtl::OUString aFilterType(aFileFormats[0].pTypeName, strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8);
std::cout << aFileFormats[0].pName << " Test" << std::endl;
ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), aFilterType, aFileFormats[0].nFormatType);
+ xDocSh->DoHardRecalc(true);
CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -679,6 +682,7 @@ void ScFiltersTest::testBugFixesXLS()
rtl::OUString aFilterType(aFileFormats[1].pTypeName, strlen(aFileFormats[1].pTypeName), RTL_TEXTENCODING_UTF8);
std::cout << aFileFormats[1].pName << " Test" << std::endl;
ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), aFilterType, aFileFormats[1].nFormatType);
+ xDocSh->DoHardRecalc(true);
CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -696,6 +700,7 @@ void ScFiltersTest::testBugFixesXLSX()
rtl::OUString aFilterType(aFileFormats[2].pTypeName, strlen(aFileFormats[2].pTypeName), RTL_TEXTENCODING_UTF8);
std::cout << aFileFormats[2].pName << " Test" << std::endl;
ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), aFilterType, aFileFormats[2].nFormatType);
+ xDocSh->DoHardRecalc(true);
CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xlsx", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -959,6 +964,7 @@ void ScFiltersTest::testSharedFormulaXLSX()
rtl::OUString aFilterType(aFileFormats[XLSX].pTypeName, strlen(aFileFormats[XLSX].pTypeName), RTL_TEXTENCODING_UTF8);
std::cout << aFileFormats[XLSX].pName << " Test" << std::endl;
ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), aFilterType, aFileFormats[XLSX].nFormatType);
+ xDocSh->DoHardRecalc(true);
CPPUNIT_ASSERT_MESSAGE("Failed to load shared-formula.xlsx", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -997,7 +1003,7 @@ void ScFiltersTest::testCellValueXLSX()
createCSVPath( aFileNameBase, aCSVPath );
testFile( aCSVPath, pDoc, 0 );
- xDocSh->DoClose();
+ xDocSh->DoClose();
}
void ScFiltersTest::testPassword_Impl(const rtl::OUString& aFileNameBase)