sc/qa/unit/SparklineImportExportTest.cxx | 3
sc/qa/unit/bugfix-test.cxx | 6 -
sc/qa/unit/chart2dataprovider.cxx | 1
sc/qa/unit/filters-test.cxx | 13 ---
sc/qa/unit/helper/qahelper.cxx | 14 +++-
sc/qa/unit/helper/qahelper.hxx | 2
sc/qa/unit/jumbosheets-test.cxx | 7 --
sc/qa/unit/opencl-test.cxx | 2
sc/qa/unit/pivottable_filters_test.cxx | 48 --------------
sc/qa/unit/subsequent_export_test.cxx | 78 -----------------------
sc/qa/unit/subsequent_export_test2.cxx | 103 -------------------------------
sc/qa/unit/subsequent_filters_test.cxx | 96 +++-------------------------
sc/qa/unit/subsequent_filters_test2.cxx | 100 +-----------------------------
13 files changed, 27 insertions(+), 446 deletions(-)
New commits:
commit 77a4b5b9b9a95ed4f9b4fccdb76d403086212fe2
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Apr 6 16:39:34 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Apr 6 17:36:12 2022 +0200
sc: qahelper: Check GetErrorCode returns none in loadDoc
I found it while creating a unittest for tdf#121887.
IMHO, loadDoc should fail if there is a warning
While at it, remove redundant assertions
Change-Id: Ib2b9572ee1f0f4da9ac23913e231eac1ad57cb49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132638
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/unit/SparklineImportExportTest.cxx
b/sc/qa/unit/SparklineImportExportTest.cxx
index f6969831ee17..3ae19881f8aa 100644
--- a/sc/qa/unit/SparklineImportExportTest.cxx
+++ b/sc/qa/unit/SparklineImportExportTest.cxx
@@ -166,7 +166,6 @@ void checkSparklines(ScDocument& rDocument)
void SparklineImportExportTest::testSparklinesRoundtripXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"Sparklines.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh);
checkSparklines(xDocSh->GetDocument());
@@ -181,7 +180,6 @@ void SparklineImportExportTest::testSparklinesExportODS()
{
// Load the document containing sparklines
ScDocShellRef xDocSh = loadDoc(u"Sparklines.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh);
// Save as ODS and check content.xml with XPath
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_ODS);
@@ -229,7 +227,6 @@ void SparklineImportExportTest::testSparklinesExportODS()
void SparklineImportExportTest::testSparklinesRoundtripODS()
{
ScDocShellRef xDocSh = loadDoc(u"Sparklines.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh);
checkSparklines(xDocSh->GetDocument());
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 3dac5e6df725..3b3cc27439df 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -146,7 +146,6 @@ void ScFiltersTest::testTdf137576_Measureline()
// Get document
ScDocShellRef xDocSh = loadDoc(u"tdf137576_Measureline.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load tdf137576_Measureline.ods",
xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Get shape
@@ -191,7 +190,6 @@ void ScFiltersTest::testTdf137216_HideCol()
// Get document
ScDocShellRef xDocSh = loadDoc(u"tdf137216_HideCol.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load tdf137216_HideCol.ods",
xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Get shape
@@ -216,7 +214,6 @@ void ScFiltersTest::testTdf137044_CoverHiddenRows()
// Get document
ScDocShellRef xDocSh = loadDoc(u"tdf137044_CoverHiddenRows.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load tdf137044_CoverHiddenRows.ods",
xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Get shape
@@ -263,7 +260,6 @@ void ScFiltersTest::testTdf137020_FlipVertical()
{
// Get document
ScDocShellRef xDocSh = loadDoc(u"tdf137020_FlipVertical.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load tdf137020_FlipVertical.ods",
xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Get shape
@@ -580,7 +576,6 @@ void ScFiltersTest::testTdf129789()
{
ScDocShellRef xDocSh = loadDoc(u"tdf129789.", FORMAT_ODS, true);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
{
@@ -719,7 +714,6 @@ void ScFiltersTest::testTdf130725()
void ScFiltersTest::testTdf104502_hiddenColsCountedInPageCount()
{
ScDocShellRef xShell = loadDoc(u"tdf104502_hiddenColsCountedInPageCount.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
diff --git a/sc/qa/unit/chart2dataprovider.cxx
b/sc/qa/unit/chart2dataprovider.cxx
index 31af9ba6eef9..b8afa19564ec 100644
--- a/sc/qa/unit/chart2dataprovider.cxx
+++ b/sc/qa/unit/chart2dataprovider.cxx
@@ -78,7 +78,6 @@ static void lcl_createAndCheckDataProvider(ScDocument& rDoc,
const OUString& cel
void ScChart2DataProviderTest::testHeaderExpansion()
{
ScDocShellRef xDocSh = loadDoc(u"chart2dataprovider.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load ch.ods.", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 81d84520fff5..7025fdc52018 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -190,8 +190,6 @@ void ScFiltersTest::testRangeNameODS()
{
ScDocShellRef xDocSh = loadDoc(u"named-ranges-global.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-global.*",
xDocSh.is());
-
xDocSh->DoHardRecalc();
ScDocument& rDoc = xDocSh->GetDocument();
@@ -315,8 +313,6 @@ void ScFiltersTest::testContentDIF()
{
ScDocShellRef xDocSh = loadDoc(u"universal-content.", FORMAT_DIF);
- CPPUNIT_ASSERT_MESSAGE("Failed to load universal-content.dif",
xDocSh.is());
-
xDocSh->DoClose();
}
@@ -333,7 +329,6 @@ void ScFiltersTest::testContentXLSB()
void ScFiltersTest::testContentXLS_XML()
{
ScDocShellRef xDocSh = loadDoc(u"universal-content.", FORMAT_XLS_XML);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
testContentImpl(rDoc, FORMAT_XLS_XML);
@@ -343,7 +338,6 @@ void ScFiltersTest::testContentXLS_XML()
void ScFiltersTest::testContentGnumeric()
{
ScDocShellRef xDocSh = loadDoc(u"universal-content.", FORMAT_GNUMERIC);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
testContentImpl(rDoc, FORMAT_GNUMERIC);
@@ -353,7 +347,6 @@ void ScFiltersTest::testContentGnumeric()
void ScFiltersTest::testSharedFormulaXLS()
{
ScDocShellRef xDocSh = loadDoc(u"shared-formula/basic.", FORMAT_XLS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
xDocSh->DoHardRecalc();
// Check the results of formula cells in the shared formula range.
@@ -378,7 +371,6 @@ void ScFiltersTest::testSharedFormulaXLS()
// to handle these wrong ranges that Excel stores.
xDocSh = loadDoc(u"shared-formula/gap.", FORMAT_XLS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc2 = xDocSh->GetDocument();
rDoc2.CalcAll();
@@ -659,7 +651,6 @@ static void testEnhancedProtectionImpl( const ScDocument&
rDoc )
void ScFiltersTest::testEnhancedProtectionXLS()
{
ScDocShellRef xDocSh = loadDoc(u"enhanced-protection.", FORMAT_XLS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
testEnhancedProtectionImpl( rDoc);
@@ -670,7 +661,6 @@ void ScFiltersTest::testEnhancedProtectionXLS()
void ScFiltersTest::testEnhancedProtectionXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"enhanced-protection.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
testEnhancedProtectionImpl( rDoc);
@@ -681,7 +671,6 @@ void ScFiltersTest::testEnhancedProtectionXLSX()
void ScFiltersTest::testSortWithSharedFormulasODS()
{
ScDocShellRef xDocSh = loadDoc(u"shared-formula/sort-crash.", FORMAT_ODS,
true);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// E2:E10 should be shared.
@@ -733,7 +722,6 @@ void ScFiltersTest::testSortWithSharedFormulasODS()
void ScFiltersTest::testSortWithSheetExternalReferencesODS()
{
ScDocShellRef xDocSh = loadDoc(u"sort-with-sheet-external-references.",
FORMAT_ODS, true);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on.
rDoc.CalcAll();
@@ -854,7 +842,6 @@ void
ScFiltersTest::testSortWithSheetExternalReferencesODS_Impl( ScDocShellRef c
void ScFiltersTest::testSortWithFormattingXLS()
{
ScDocShellRef xDocSh = loadDoc(u"tdf129127.", FORMAT_XLS, true);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Set as an anonymous database range to sort.
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index a11d240b9b35..5c386b2db684 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -675,7 +675,6 @@ ScDocShellRef
ScBootstrapFixture::loadDocAndSetupModelViewController(std::u16str
// 1. Open the document
ScDocShellRef xDocSh = loadDoc(rFileName, nFormat, true);
- CPPUNIT_ASSERT_MESSAGE(OString("Failed to load " +
OUStringToOString(rFileName, RTL_TEXTENCODING_UTF8)).getStr(), xDocSh.is());
uno::Reference< frame::XModel2 > xModel2 = xDocSh->GetModel();
CPPUNIT_ASSERT(xModel2.is());
@@ -694,13 +693,21 @@ ScDocShellRef
ScBootstrapFixture::loadDocAndSetupModelViewController(std::u16str
}
ScDocShellRef ScBootstrapFixture::loadDoc(
- std::u16string_view rFileName, sal_Int32 nFormat, bool bReadWrite )
+ std::u16string_view rFileName, sal_Int32 nFormat, bool bReadWrite, bool
bCheckErrorCode )
{
OUString aFileExtension = OUString::fromUtf8(aFileFormats[nFormat].pName);
OUString aFileName;
createFileURL( rFileName, aFileExtension, aFileName );
- return load(aFileName, nFormat, bReadWrite);
+ ScDocShellRef xDocShRef = load(aFileName, nFormat, bReadWrite);
+ CPPUNIT_ASSERT_MESSAGE(OString("Failed to load " +
OUStringToOString(rFileName, RTL_TEXTENCODING_UTF8)).getStr(), xDocShRef.is());
+
+ if (bCheckErrorCode)
+ {
+ CPPUNIT_ASSERT(!xDocShRef->GetErrorCode());
+ }
+
+ return xDocShRef;
}
ScBootstrapFixture::ScBootstrapFixture( const OUString& rsBaseString ) :
m_aBaseString( rsBaseString ) {}
@@ -871,7 +878,6 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam
const * aTestValues, unsi
int nImportType = aTestValues[ index ].nImportType;
int nExportType = aTestValues[ index ].nExportType;
ScDocShellRef xShell = loadDoc( sFileName, nImportType );
- CPPUNIT_ASSERT(xShell.is());
if ( nExportType != -1 )
xShell = saveAndReload(*xShell, nExportType );
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index e1b1ee6c65f9..21b3c75f2869 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -205,7 +205,7 @@ protected:
ScDocShellRef loadEmptyDocument(const
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&
rPropertyValues = {});
ScDocShellRef loadDocAndSetupModelViewController(std::u16string_view
rFileName, sal_Int32 nFormat);
ScDocShellRef loadDoc(
- std::u16string_view rFileName, sal_Int32 nFormat, bool bReadWrite =
false );
+ std::u16string_view rFileName, sal_Int32 nFormat, bool bReadWrite =
false, bool bCheckErrorCode = true );
public:
static const FileFormat* getFileFormats() { return aFileFormats; }
diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx
index deb516ae5b91..f21c27aafbda 100644
--- a/sc/qa/unit/jumbosheets-test.cxx
+++ b/sc/qa/unit/jumbosheets-test.cxx
@@ -88,7 +88,6 @@ void ScJumboSheetsTest::testRoundtripColumn2000Xlsx()
void ScJumboSheetsTest::testRoundtripColumn2000(std::u16string_view name, int
format)
{
ScDocShellRef xDocSh1 = loadDoc(name, format);
- CPPUNIT_ASSERT(xDocSh1.is());
{
ScDocument& rDoc = xDocSh1->GetDocument();
@@ -120,7 +119,6 @@ void
ScJumboSheetsTest::testRoundtripColumn2000(std::u16string_view name, int fo
void ScJumboSheetsTest::testRoundtripColumnRange()
{
ScDocShellRef xDocSh1 = loadDoc(u"sum-whole-column-row.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh1.is());
{
ScDocument& rDoc = xDocSh1->GetDocument();
@@ -172,7 +170,6 @@ void ScJumboSheetsTest::testRoundtripColumnRange()
void ScJumboSheetsTest::testRoundtripNamedRanges()
{
ScDocShellRef xDocSh1 = loadDoc(u"ranges-column-2000.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh1.is());
std::pair<OUString, OUString> ranges[] = { { "CELLBXX1", "$Sheet1.$BXX$1"
},
{ "CELLSA4_AMJ4",
"$Sheet1.$A$4:$AMJ$4" },
@@ -229,7 +226,6 @@ void ScJumboSheetsTest::testNamedRangeNameConflict()
// The document contains named ranges named 'num1' and 'num2', that should
be still treated
// as named references even though with 16k columns those are normally
NUM1 and NUM2 cells.
ScDocShellRef xDocSh = loadDoc(u"named-range-conflict.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
rDoc.CalcAll();
CPPUNIT_ASSERT_EQUAL(0.0, rDoc.GetValue(10022, 0, 0)); // NUM1
@@ -251,7 +247,6 @@ void ScJumboSheetsTest::testNamedRangeNameConflict()
void ScJumboSheetsTest::testTdf134553()
{
ScDocShellRef xDocSh = loadDocAndSetupModelViewController(u"tdf134553.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh);
ScDocument& rDoc = xDocSh->GetDocument();
@@ -299,7 +294,6 @@ void ScJumboSheetsTest::testTdf134392()
{
// Without the fix in place, the file would have crashed
ScDocShellRef xDocSh = loadDoc(u"tdf134392.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
rDoc.CalcAll(); // perform hard re-calculation.
@@ -368,7 +362,6 @@ void ScJumboSheetsTest::testTdf109061()
{
// Without the fix in place, the file would have crashed
ScDocShellRef xDocSh = loadDoc(u"tdf109061.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
rDoc.CalcAll(); // perform hard re-calculation.
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 3b258768952c..3b1132629ce0 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -517,11 +517,9 @@ bool ScOpenCLTest::initTestEnv(std::u16string_view
fileName, sal_Int32 nFormat,
return false;
xDocSh = loadDoc(fileName, nFormat, bReadWrite);
- CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocSh.is());
enableOpenCL();
xDocShRes = loadDoc(fileName, nFormat, bReadWrite);
- CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocShRes.is());
return true;
}
diff --git a/sc/qa/unit/pivottable_filters_test.cxx
b/sc/qa/unit/pivottable_filters_test.cxx
index 14f790e89b68..f0e5d5a8b830 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -207,7 +207,6 @@ bool hasDimension(const std::vector<const
ScDPSaveDimension*>& rDims, const OUSt
void ScPivotTableFiltersTest::testPivotTableBasicODS()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table-basic.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-basic.ods",
xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be exactly two sheets.",
sal_Int16(2),
@@ -266,7 +265,6 @@ void ScPivotTableFiltersTest::testPivotTableBasicODS()
void ScPivotTableFiltersTest::testPivotTableNamedRangeSourceODS()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table-named-range-source.",
FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load
pivot-table-named-range-source.ods", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
@@ -320,7 +318,6 @@ bool checkVisiblePageFieldMember(const
ScDPSaveDimension::MemberList& rMembers,
void ScPivotTableFiltersTest::testPivotTableSharedCacheGroupODS()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table-shared-cache-with-group.",
FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Make sure that page field's visibility settings are loaded correctly.
@@ -455,7 +452,6 @@ void
ScPivotTableFiltersTest::testPivotTableSharedCacheGroupODS()
void ScPivotTableFiltersTest::testGetPivotDataXLS()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-getpivotdata.", FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
rDoc.CalcAll();
@@ -472,7 +468,6 @@ void ScPivotTableFiltersTest::testGetPivotDataXLS()
void ScPivotTableFiltersTest::testPivotTableSharedGroupXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table/shared-group-field.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Check whether right group names are imported for both tables
@@ -609,7 +604,6 @@ void
ScPivotTableFiltersTest::testPivotTableSharedNestedDateGroupXLSX()
void ScPivotTableFiltersTest::testPivotTableSharedNumGroupXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table/shared-numgroup.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Check whether right number groups are imported for both tables
@@ -647,7 +641,6 @@ void
ScPivotTableFiltersTest::testPivotTableNoColumnsLayout()
{
// tdf#113268 - Pivot table: Missing popup button after opening a pivot
table from ODS
ScDocShellRef xDocSh = loadDoc(u"pivottable_no_columns_layout.",
FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// There should be exactly 2 pivot tables
@@ -676,7 +669,6 @@ void
ScPivotTableFiltersTest::testPivotTableNoColumnsLayout()
void ScPivotTableFiltersTest::testTdf112501()
{
ScDocShellRef xDocSh = loadDoc(u"tdf112501.", FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// There should be exactly 2 pivot tables
@@ -746,7 +738,6 @@ void ScPivotTableFiltersTest::testPivotTableExportXLSX()
// tdf#89139: pivot table definition needs to list items, including hidden
ScDocShellRef xShell = loadDoc(u"tdf89139_pivot_table.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable
@@ -765,7 +756,6 @@ void ScPivotTableFiltersTest::testPivotTableExportXLSX()
void ScPivotTableFiltersTest::testPivotTableExportXLSXSingleDataField()
{
ScDocShellRef xShell = loadDoc(u"tdf123421_1datafield.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable
@@ -788,7 +778,6 @@ void
ScPivotTableFiltersTest::testPivotTableExportXLSXSingleDataField()
void ScPivotTableFiltersTest::testPivotTableExportXLSXMultipleDataFields()
{
ScDocShellRef xShell = loadDoc(u"tdf123421_2datafields.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable
@@ -822,7 +811,6 @@ void ScPivotTableFiltersTest::testPivotCacheExportXLSX()
//
https://technet.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.shareditems.aspx
ScDocShellRef xShell =
loadDoc(u"pivot-table/with-strings-integers-and-dates.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pCacheDef = XPathHelper::parseExport(pXPathFile,
m_xSFactory,
@@ -1184,7 +1172,6 @@ void ScPivotTableFiltersTest::testPivotTableXLSX()
} aTest;
ScDocShellRef xDocSh = loadDoc(u"pivot-table/many-fields-in-cache.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument* pDoc = &xDocSh->GetDocument();
// Initial check.
@@ -1308,7 +1295,6 @@ void
ScPivotTableFiltersTest::testPivotTableTwoDataFieldsXLSX()
} aTest;
ScDocShellRef xDocSh = loadDoc(u"pivot-table/two-data-fields.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument* pDoc = &xDocSh->GetDocument();
// Initial check.
@@ -1330,7 +1316,6 @@ void
ScPivotTableFiltersTest::testPivotTableTwoDataFieldsXLSX()
void ScPivotTableFiltersTest::testPivotTableMedianODS()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table-median.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load test document.", xDocSh.is());
// Export the document and import again for a check
ScDocShellRef xDocSh2 = saveAndReload(*xDocSh, FORMAT_ODS);
@@ -1368,7 +1353,6 @@ void ScPivotTableFiltersTest::testPivotTableMedianODS()
void ScPivotTableFiltersTest::testPivotTableRowHeaderXLS()
{
ScDocShellRef xDocSh = loadDoc(u"pivot_row_header.", FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// There should be exactly 2 pivot tables
@@ -1438,7 +1422,6 @@ void ScPivotTableFiltersTest::testPivotTableRowHeaderXLS()
void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_double_field_filter.",
FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pDPs->GetCount());
@@ -1540,7 +1523,6 @@ void
ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter()
void ScPivotTableFiltersTest::testPivotTableStringFieldFilter()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_string_field_filter.",
FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -1576,7 +1558,6 @@ void
ScPivotTableFiltersTest::testPivotTableStringFieldFilter()
void ScPivotTableFiltersTest::testPivotTableDateFieldFilter()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_date_field_filter.",
FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -1667,7 +1648,6 @@ void
ScPivotTableFiltersTest::testPivotTableDateFieldFilter()
void ScPivotTableFiltersTest::testPivotTableBoolFieldFilter()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_bool_field_filter.",
FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -1703,7 +1683,6 @@ void
ScPivotTableFiltersTest::testPivotTableBoolFieldFilter()
void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_rowcolpage_field_filter.",
FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -1813,7 +1792,6 @@ void
ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter()
void ScPivotTableFiltersTest::testPivotTableEmptyItem()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_empty_item.", FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -1853,7 +1831,6 @@ void ScPivotTableFiltersTest::testPivotTableEmptyItem()
void ScPivotTableFiltersTest::testPivotTablePageFieldFilter()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_page_field_filter.",
FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -1960,7 +1937,6 @@ void
ScPivotTableFiltersTest::testPivotTableFirstHeaderRowXLSX()
// tdf#112733: We have different tables here, but have the same value as
firstHeaderRow
// The documentation is not clear about what firstHeaderRow actually
means, but MS Excel works on this way
ScDocShellRef xShell = loadDoc(u"pivot_table_first_header_row.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable
@@ -1982,7 +1958,6 @@ void
ScPivotTableFiltersTest::testPivotTableFirstHeaderRowXLSX()
void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_double_field_filter.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pDPs->GetCount());
@@ -2084,7 +2059,6 @@ void
ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX()
void ScPivotTableFiltersTest::testPivotTableStringFieldFilterXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_string_field_filter.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2120,7 +2094,6 @@ void
ScPivotTableFiltersTest::testPivotTableStringFieldFilterXLSX()
void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_date_field_filter.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2196,7 +2169,6 @@ void
ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX()
void ScPivotTableFiltersTest::testPivotTableBoolFieldFilterXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_bool_field_filter.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2233,7 +2205,6 @@ void
ScPivotTableFiltersTest::testPivotTableBoolFieldFilterXLSX()
void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_rowcolpage_field_filter.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2341,7 +2312,6 @@ void
ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX()
void ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_error_item_filter.",
FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2372,7 +2342,6 @@ void
ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSX()
void ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSB()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_error_item_filter.",
FORMAT_XLSB);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2396,7 +2365,6 @@ void
ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSB()
void ScPivotTableFiltersTest::testPivotTableErrorItem2FilterXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf122471.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2424,7 +2392,6 @@ void
ScPivotTableFiltersTest::testPivotTableErrorItem2FilterXLSX()
void ScPivotTableFiltersTest::testPivotTableOutlineModeXLSX()
{
ScDocShellRef xShell = loadDoc(u"pivottable_outline_mode.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable
@@ -2444,7 +2411,6 @@ void
ScPivotTableFiltersTest::testPivotTableOutlineModeXLSX()
void ScPivotTableFiltersTest::testPivotTableDuplicatedMemberFilterXLSX()
{
ScDocShellRef xShell = loadDoc(u"pivottable_duplicated_member_filter.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable
@@ -2463,7 +2429,6 @@ void
ScPivotTableFiltersTest::testPivotTableDuplicatedMemberFilterXLSX()
void ScPivotTableFiltersTest::testPivotTableTabularModeXLSX()
{
ScDocShellRef xShell = loadDoc(u"pivottable_tabular_mode.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable
@@ -2484,7 +2449,6 @@ void
ScPivotTableFiltersTest::testPivotTableTabularModeXLSX()
void ScPivotTableFiltersTest::testPivotTableDuplicateFields()
{
ScDocShellRef xShell = loadDoc(u"caseinsensitive-duplicate-fields.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pCacheDef = XPathHelper::parseExport(pXPathFile,
m_xSFactory,
@@ -2509,7 +2473,6 @@ void
ScPivotTableFiltersTest::testPivotTableDuplicateFields()
void ScPivotTableFiltersTest::testTdf112106()
{
ScDocShellRef xDocSh = loadDoc(u"tdf112106.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
ScDPCollection* pDPs = rDoc.GetDPCollection();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDPs->GetCount());
@@ -2540,7 +2503,6 @@ void ScPivotTableFiltersTest::testTdf123923()
// tdf#123923: Excel fails when it finds "Err:504" instead of "#REF!" in
pivot table cache
ScDocShellRef xShell = loadDoc(u"pivot-table-err-in-cache.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
@@ -2556,7 +2518,6 @@ void ScPivotTableFiltersTest::testTdf123939()
// tdf#123939: Excel warns on containsMixedTypes="1" if sharedItems has
only strings and errors
ScDocShellRef xShell = loadDoc(u"pivot-table-str-and-err-in-data.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
@@ -2580,7 +2541,6 @@ void ScPivotTableFiltersTest::testTdf123939()
void ScPivotTableFiltersTest::testTdf124651()
{
ScDocShellRef xDocSh = loadDoc(u"tdf124651_simplePivotTable.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/pivotTables/pivotTable1.xml", FORMAT_XLSX);
@@ -2594,7 +2554,6 @@ void ScPivotTableFiltersTest::testTdf124651()
void ScPivotTableFiltersTest::testTdf124736()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table/shared-dategroup.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xDocSh->DoClose();
@@ -2647,7 +2606,6 @@ void ScPivotTableFiltersTest::testTdf124736()
void ScPivotTableFiltersTest::tesTtdf124772NumFmt()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table-num-fmt.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xDocSh->DoClose();
@@ -2673,7 +2631,6 @@ void ScPivotTableFiltersTest::testTdf124810()
{
// First, test that we roundtrip existing pivot table style
information from XLSX.
ScDocShellRef xDocSh = loadDoc(u"pivot_dark1.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pTable = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory, "xl/pivotTables/pivotTable1.xml",
FORMAT_XLSX);
@@ -2695,7 +2652,6 @@ void ScPivotTableFiltersTest::testTdf124810()
// original document. Just use some ODS as source. This might be
changed when we start
// exporting better pivot table style information.
ScDocShellRef xDocSh = loadDoc(u"tdf124651_simplePivotTable.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pTable = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory, "xl/pivotTables/pivotTable1.xml",
FORMAT_XLSX);
@@ -2716,7 +2672,6 @@ void ScPivotTableFiltersTest::testTdf124810()
void ScPivotTableFiltersTest::testTdf124883()
{
ScDocShellRef xDocSh = loadDoc(u"pivot-table/two-data-fields.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pTable = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory, "xl/pivotTables/pivotTable1.xml",
FORMAT_XLSX);
@@ -2733,7 +2688,6 @@ void ScPivotTableFiltersTest::testTdf124883()
void ScPivotTableFiltersTest::testTdf125046()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_long_text.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory,
"xl/pivotCache/pivotCacheDefinition1.xml", FORMAT_XLSX);
@@ -2745,7 +2699,6 @@ void ScPivotTableFiltersTest::testTdf125046()
void ScPivotTableFiltersTest::testTdf125055()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_1s_difference.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory,
"xl/pivotCache/pivotCacheDefinition1.xml", FORMAT_XLSX);
@@ -2781,7 +2734,6 @@ void ScPivotTableFiltersTest::testTdf125055()
void ScPivotTableFiltersTest::testTdf125086()
{
ScDocShellRef xDocSh = loadDoc(u"pivottable_fieldInRowsAndData.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/pivotTables/pivotTable1.xml", FORMAT_XLSX);
diff --git a/sc/qa/unit/subsequent_export_test.cxx
b/sc/qa/unit/subsequent_export_test.cxx
index 93250fe199a2..d543cd692af0 100644
--- a/sc/qa/unit/subsequent_export_test.cxx
+++ b/sc/qa/unit/subsequent_export_test.cxx
@@ -347,7 +347,6 @@ void ScExportTest::testDefaultFontHeight()
void ScExportTest::testTdf139167()
{
ScDocShellRef xShell = loadDoc(u"tdf139167.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -366,7 +365,6 @@ void ScExportTest::testTdf139167()
void ScExportTest::testTdf113271()
{
ScDocShellRef xShell = loadDoc(u"tdf113271.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -389,7 +387,6 @@ void ScExportTest::testTdf113271()
void ScExportTest::testTdf139394()
{
ScDocShellRef xShell = loadDoc(u"tdf139394.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -421,7 +418,6 @@ void ScExportTest::testTdf139394()
void ScExportTest::testExtCondFormatXLSX()
{
ScDocShellRef xShell = loadDoc(u"tdf139021.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -468,7 +464,6 @@ void ScExportTest::testExtCondFormatXLSX()
void ScExportTest::testTdf90104()
{
ScDocShellRef xShell = loadDoc(u"tdf90104.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -494,7 +489,6 @@ void ScExportTest::testTdf111876()
// Document with relative path hyperlink
ScDocShellRef xShell = loadDoc(u"tdf111876.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -534,7 +528,6 @@ void ScExportTest::testPasswordExportODS()
void ScExportTest::testTdf134332()
{
ScDocShellRef xShell = loadDoc(u"tdf134332.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
@@ -557,7 +550,6 @@ void ScExportTest::testTdf134332()
void ScExportTest::testConditionalFormatExportODS()
{
ScDocShellRef xShell = loadDoc(u"new_cond_format_test_export.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.is());
@@ -572,7 +564,6 @@ void ScExportTest::testConditionalFormatExportODS()
void ScExportTest::testCondFormatExportCellIs()
{
ScDocShellRef xShell = loadDoc(u"condFormat_cellis.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -608,7 +599,6 @@ void ScExportTest::testCondFormatExportCellIs()
void ScExportTest::testConditionalFormatExportXLSX()
{
ScDocShellRef xShell = loadDoc(u"new_cond_format_test_export.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -630,7 +620,6 @@ void ScExportTest::testConditionalFormatExportXLSX()
void ScExportTest::testTdf99856_dataValidationTest()
{
ScDocShellRef xShell = loadDoc(u"tdf99856_dataValidationTest.",
FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is());
@@ -653,7 +642,6 @@ void ScExportTest::testProtectionKeyODS_UTF16LErtlSHA1()
OUString const
password("1012345678901234567890123456789012345678901234567890");
ScDocShellRef xShell = loadDoc(u"protection-key1.", FORMAT_FODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
ScDocProtection* const pDocProt(rDoc.GetDocProtection());
@@ -682,7 +670,6 @@ void ScExportTest::testProtectionKeyODS_UTF8SHA1()
OUString const
password("1012345678901234567890123456789012345678901234567890");
ScDocShellRef xShell = loadDoc(u"protection-key2.", FORMAT_FODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
ScDocProtection* const pDocProt(rDoc.GetDocProtection());
@@ -711,7 +698,6 @@ void ScExportTest::testProtectionKeyODS_UTF8SHA256ODF12()
OUString const
password("1012345678901234567890123456789012345678901234567890");
ScDocShellRef xShell = loadDoc(u"protection-key3.", FORMAT_FODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
ScDocProtection* const pDocProt(rDoc.GetDocProtection());
@@ -742,7 +728,6 @@ void ScExportTest::testProtectionKeyODS_UTF8SHA256W3C()
OUString const
password("1012345678901234567890123456789012345678901234567890");
ScDocShellRef xShell = loadDoc(u"protection-key4.", FORMAT_FODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
ScDocProtection* const pDocProt(rDoc.GetDocProtection());
@@ -773,7 +758,6 @@ void ScExportTest::testProtectionKeyODS_XL_SHA1()
OUString const
password("1012345678901234567890123456789012345678901234567890");
ScDocShellRef xShell = loadDoc(u"protection-key5.", FORMAT_FODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
ScDocProtection* const pDocProt(rDoc.GetDocProtection());
@@ -806,7 +790,6 @@ void ScExportTest::testProtectionKeyODS_XL_SHA1()
void ScExportTest::testColorScaleExportODS()
{
ScDocShellRef xShell = loadDoc(u"colorscale.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.is());
@@ -822,7 +805,6 @@ void ScExportTest::testColorScaleExportODS()
void ScExportTest::testColorScaleExportXLSX()
{
ScDocShellRef xShell = loadDoc(u"colorscale.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -838,7 +820,6 @@ void ScExportTest::testColorScaleExportXLSX()
void ScExportTest::testDataBarExportODS()
{
ScDocShellRef xShell = loadDoc(u"databar.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.is());
@@ -853,7 +834,6 @@ void ScExportTest::testDataBarExportODS()
void ScExportTest::testFormatExportODS()
{
ScDocShellRef xShell = loadDoc(u"formats.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.is());
@@ -869,7 +849,6 @@ void ScExportTest::testCommentExportXLSX()
{
//tdf#104729 FILESAVE OpenOffice do not save author of the comment during
export to .xlsx
ScDocShellRef xShell = loadDoc(u"comment.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pComments
@@ -906,7 +885,6 @@ void ScExportTest::testCommentExportXLSX_2_XLSX()
{
//tdf#117287 FILESAVE XLSX: Comments always disappear after opening the
exported XLSX file with Excel
ScDocShellRef xShell = loadDoc(u"tdf117287_comment.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
ScAddress aPosC9(2, 8, 0);
@@ -939,7 +917,6 @@ void ScExportTest::testCustomColumnWidthExportXLSX()
{
//tdf#100946 FILESAVE Excel on macOS ignored column widths in XLSX last
saved by LO
ScDocShellRef xShell = loadDoc(u"custom_column_width.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1015,7 +992,6 @@ void ScExportTest::testXfDefaultValuesXLSX()
{
//tdf#70565 FORMATTING: User Defined Custom Formatting is not applied
during importing XLSX documents
ScDocShellRef xShell = loadDoc(u"xf_default_values.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/styles.xml");
@@ -1194,7 +1170,6 @@ void ScExportTest::testColumnWidthResaveXLSX()
// tdf#91475 FILESAVE: Column width is not preserved in XLSX / after round
trip.
// Test if after resave .xlsx file, columns width is identical with
previous one
ScDocShellRef xShell = loadDoc(u"different-column-width-excel2010.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1235,8 +1210,6 @@ void ScExportTest::testColumnWidthExportFromODStoXLSX()
ScDocShellRef xShell = loadDoc(u"different-column-width.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
-
ScDocument& rOdsDoc = xShell->GetDocument();
// Col 1, Tab 0 (Column width 2.00 in)
@@ -1302,7 +1275,6 @@ void ScExportTest::testOutlineExportXLSX()
//tdf#100347 FILESAVE FILEOPEN after exporting to .xlsx format grouping
are lost
//tdf#51524 FILESAVE .xlsx and.xls looses width information for
hidden/collapsed grouped columns
ScDocShellRef xShell = loadDoc(u"outline.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1450,7 +1422,6 @@ void ScExportTest::testOutlineExportXLSX()
void ScExportTest::testAllRowsHiddenXLSX()
{
ScDocShellRef xOrigDocSh = loadDoc(u"tdf105840_allRowsHidden.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xOrigDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile
= ScBootstrapFixture::exportTo(*xOrigDocSh, FORMAT_XLSX);
@@ -1467,7 +1438,6 @@ void ScExportTest::testHiddenEmptyRowsXLSX()
{
//tdf#98106 FILESAVE: Hidden and empty rows became visible when export to
.XLSX
ScDocShellRef xShell = loadDoc(u"hidden-empty-rows.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1487,7 +1457,6 @@ void ScExportTest::testHiddenEmptyColsODS()
{
//tdf#98106 FILESAVE: Hidden and empty rows became visible when export to
.XLSX
ScDocShellRef xShell = loadDoc(u"tdf128895_emptyHiddenCols.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_ODS);
xmlDocUniquePtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"content.xml");
@@ -1502,7 +1471,6 @@ void ScExportTest::testLandscapeOrientationXLSX()
{
//tdf#48767 - Landscape page orientation is not loaded from .xlsx format
with MS Excel, after export with Libre Office
ScDocShellRef xShell = loadDoc(u"hidden-empty-rows.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1519,7 +1487,6 @@ void ScExportTest::testLandscapeOrientationXLSX()
void ScExportTest::testDataBarExportXLSX()
{
ScDocShellRef xShell = loadDoc(u"databar.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -1662,7 +1629,6 @@ void setEscapement(ScFieldEditEngine& rEE, sal_Int32
nPara, sal_Int32 nStart, sa
void ScExportTest::testNamedRangeBugfdo62729()
{
ScDocShellRef xShell = loadDoc(u"fdo62729.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
ScRangeName* pNames = rDoc.GetRangeName();
@@ -1687,7 +1653,6 @@ void ScExportTest::testNamedRangeBugfdo62729()
void ScExportTest::testBuiltinRangesXLSX()
{
ScDocShellRef xShell = loadDoc(u"built-in_ranges.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
xShell->DoClose();
@@ -2222,7 +2187,6 @@ void ScExportTest::testRichTextExportODS()
void ScExportTest::testRichTextCellFormatXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"cellformat.", FORMAT_XLS);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -2455,7 +2419,6 @@ void checkMatrixRange(ScDocument& rDoc, const ScRange&
rRange)
void ScExportTest::testInlineArrayXLS()
{
ScDocShellRef xShell = loadDoc(u"inline-array.", FORMAT_XLS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLS);
xShell->DoClose();
@@ -2478,7 +2441,6 @@ void ScExportTest::testInlineArrayXLS()
void ScExportTest::testEmbeddedChartODS()
{
ScDocShellRef xShell = loadDoc(u"embedded-chart.", FORMAT_XLS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile>
pTempFile(ScBootstrapFixture::exportTo(*xShell, FORMAT_ODS));
@@ -2496,7 +2458,6 @@ void ScExportTest::testEmbeddedChartODS()
void ScExportTest::testEmbeddedChartXLS()
{
ScDocShellRef xShell = loadDoc(u"embedded-chart.", FORMAT_XLS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLS);
xShell->DoClose();
@@ -2525,7 +2486,6 @@ void ScExportTest::testEmbeddedChartXLS()
void ScExportTest::testCellAnchoredGroupXLS()
{
ScDocShellRef xDocSh_in = loadDoc(u"cell-anchored-group.", FORMAT_XLS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-group.xls",
xDocSh_in.is());
ScDocShellRef xDocSh = saveAndReload(*xDocSh_in, FORMAT_ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to save and reload
cell-anchored-group.ods", xDocSh.is());
@@ -2551,7 +2511,6 @@ void ScExportTest::testCellAnchoredGroupXLS()
void ScExportTest::testFormulaReferenceXLS()
{
ScDocShellRef xShell = loadDoc(u"formula-reference.", FORMAT_XLS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLS);
xShell->DoClose();
@@ -2576,7 +2535,6 @@ void ScExportTest::testFormulaReferenceXLS()
void ScExportTest::testSheetProtectionXLSX()
{
ScDocShellRef xShell = loadDoc(u"ProtecteSheet1234Pass.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2600,7 +2558,6 @@ void ScExportTest::testSheetProtectionXLSX()
void ScExportTest::testSheetProtectionXLSB()
{
ScDocShellRef xShell = loadDoc(u"tdf108017_calcProtection.", FORMAT_XLSB);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2663,7 +2620,6 @@ void ScExportTest::testExcelCellBorders(sal_uLong
nFormatType)
};
ScDocShellRef xDocSh = loadDoc(u"cell-borders.", nFormatType);
- CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
{
ScDocument& rDoc = xDocSh->GetDocument();
@@ -2872,7 +2828,6 @@ void ScExportTest::testBordersExchangeXLSX()
ScDocShellRef xShell
= loadDoc(u"test_borders_export.", FORMAT_ODS); // load the ods with
our Borders
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh
= saveAndReload(*xShell, FORMAT_XLSX); // save the ods to xlsx and
load xlsx
@@ -3122,7 +3077,6 @@ void ScExportTest::testTrackChangesSimpleXLSX()
// First, test the xls variant.
ScDocShellRef xDocSh = loadDoc(u"track-changes/simple-cell-changes.",
FORMAT_XLS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument* pDoc = &xDocSh->GetDocument();
bool bGood = aTest.check(*pDoc);
CPPUNIT_ASSERT_MESSAGE("Initial check failed (xls).", bGood);
@@ -3149,7 +3103,6 @@ void ScExportTest::testTrackChangesSimpleXLSX()
// Now, test the xlsx variant the same way.
xDocSh = loadDoc(u"track-changes/simple-cell-changes.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
pDoc = &xDocSh->GetDocument();
aTest.check(*pDoc);
CPPUNIT_ASSERT_MESSAGE("Initial check failed (xlsx).", bGood);
@@ -3216,7 +3169,6 @@ void ScExportTest::testSheetTabColorsXLSX()
ScDocShellRef xDocSh = loadDoc(u"sheet-tab-color.", FORMAT_XLSX);
{
- CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
bool bRes = aTest.checkContent(rDoc);
CPPUNIT_ASSERT_MESSAGE("Failed on the initial content check.", bRes);
@@ -3235,7 +3187,6 @@ void ScExportTest::testSheetTabColorsXLSX()
void ScExportTest::testTdf133487()
{
ScDocShellRef xShell = loadDoc(u"shapes_foreground_background.",
FORMAT_FODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_ODS);
xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
@@ -3379,7 +3330,6 @@ void ScExportTest::testSharedFormulaExportXLS()
ScDocShellRef xDocSh = loadDoc(u"shared-formula/3d-reference.",
FORMAT_ODS);
{
- CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Check the content of the original.
@@ -3475,7 +3425,6 @@ void ScExportTest::testSharedFormulaExportXLSX()
ScDocShellRef xDocSh = loadDoc(u"shared-formula/3d-reference.",
FORMAT_XLSX);
{
- CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
bool bRes = aTest.checkContent(rDoc);
@@ -3547,7 +3496,6 @@ void
ScExportTest::testSharedFormulaStringResultExportXLSX()
ScDocShellRef xDocSh = loadDoc(u"shared-formula/text-results.",
FORMAT_XLSX);
{
- CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// Check content without re-calculation, to test cached formula
results.
@@ -3574,7 +3522,6 @@ void
ScExportTest::testSharedFormulaStringResultExportXLSX()
void ScExportTest::testFunctionsExcel2010(sal_uLong nFormatType)
{
ScDocShellRef xShell = loadDoc(u"functions-excel-2010.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, nFormatType);
ScDocument& rDoc = xDocSh->GetDocument();
@@ -3592,7 +3539,6 @@ void ScExportTest::testFunctionsExcel2010XLS() {
testFunctionsExcel2010(FORMAT_X
void ScExportTest::testCeilingFloor(sal_uLong nFormatType)
{
ScDocShellRef xShell = loadDoc(u"ceiling-floor.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, nFormatType);
ScDocument& rDoc = xDocSh->GetDocument();
@@ -3609,7 +3555,6 @@ void ScExportTest::testCeilingFloorODSToXLSX()
{
// tdf#100011 - Cannot open sheet containing FLOOR/CEILING functions by MS
Excel, after export to .xlsx
ScDocShellRef xShell = loadDoc(u"ceiling-floor.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/workbook.xml");
@@ -3629,7 +3574,6 @@ void ScExportTest::testCustomXml()
{
// Load document and export it to a temporary file
ScDocShellRef xShell = loadDoc(u"customxml.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pXmlDoc
@@ -3665,7 +3609,6 @@ static sal_Unicode lcl_getWindowsDrive(const OUString&
aURL)
void ScExportTest::testRelativePathsODS()
{
ScDocShellRef xDocSh = loadDoc(u"fdo79305.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pTempFile = exportTo(*xDocSh, FORMAT_ODS);
xmlDocUniquePtr pDoc = XPathHelper::parseExport(pTempFile, m_xSFactory,
"content.xml");
@@ -3709,7 +3652,6 @@ void testSheetProtection_Impl(const ScDocument& rDoc)
void ScExportTest::testSheetProtectionODS()
{
ScDocShellRef xDocSh = loadDoc(u"sheet-protection.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
{
ScDocument& rDoc = xDocSh->GetDocument();
@@ -3752,7 +3694,6 @@ void ScExportTest::testSwappedOutImageExport()
const OString sFailedMessage
= OString::Concat("Failed on filter: ") + aFilterNames[nFilter];
- CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.is());
// Export the document and import again for a check
ScDocShellRef xDocSh2 = saveAndReload(*xDocSh, nFilter);
@@ -3833,7 +3774,6 @@ void ScExportTest::tearDown()
void ScExportTest::testSupBookVirtualPathXLS()
{
ScDocShellRef xShell = loadDoc(u"external-ref.", FORMAT_XLS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLS);
xShell->DoClose();
@@ -3924,7 +3864,6 @@ void ScExportTest::testImageWithSpecialID()
const OString sFailedMessage
= OString::Concat("Failed on filter: ") + aFilterNames[nFilter];
- CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.is());
// Export the document and import again for a check
ScDocShellRef xDocSh2 = saveAndReload(*xDocSh, nFilter);
@@ -4078,7 +4017,6 @@ void ScExportTest::testRelativeNamedExpressionsXLS()
void ScExportTest::testSheetTextBoxHyperlinkXLSX()
{
ScDocShellRef xShell = loadDoc(u"textbox-hyperlink.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -4098,7 +4036,6 @@ void ScExportTest::testSheetTextBoxHyperlinkXLSX()
void ScExportTest::testFontSizeXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"fontSize.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
@@ -4114,7 +4051,6 @@ void ScExportTest::testFontSizeXLSX()
void ScExportTest::testSheetCharacterKerningSpaceXLSX()
{
ScDocShellRef xShell = loadDoc(u"textbox-CharKerningSpace.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -4136,7 +4072,6 @@ void ScExportTest::testSheetCharacterKerningSpaceXLSX()
void ScExportTest::testSheetCondensedCharacterSpaceXLSX()
{
ScDocShellRef xShell = loadDoc(u"textbox-CondensedCharacterSpace.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -4158,7 +4093,6 @@ void ScExportTest::testSheetCondensedCharacterSpaceXLSX()
void ScExportTest::testTextUnderlineColorXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"underlineColor.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
@@ -4192,7 +4126,6 @@ void ScExportTest::testTextUnderlineColorXLSX()
void ScExportTest::testSheetRunParagraphPropertyXLSX()
{
ScDocShellRef xShell = loadDoc(u"TextColor.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -4238,7 +4171,6 @@ void ScExportTest::testPreserveTextWhitespace2XLSX()
void ScExportTest::testHiddenShapeXLS()
{
ScDocShellRef xDocSh = loadDoc(u"hiddenShape.", FORMAT_XLS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(rDoc.GetTableCount() > 0);
@@ -4255,7 +4187,6 @@ void ScExportTest::testHiddenShapeXLS()
void ScExportTest::testHiddenShapeXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"hiddenShape.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(rDoc.GetTableCount() > 0);
@@ -4277,7 +4208,6 @@ void ScExportTest::testHiddenShapeXLSX()
void ScExportTest::testShapeAutofitXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"testShapeAutofit.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
@@ -4294,7 +4224,6 @@ void ScExportTest::testShapeAutofitXLSX()
void ScExportTest::testHyperlinkXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"hyperlink.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory, "xl/drawings/_rels/drawing1.xml.rels",
FORMAT_XLSX);
@@ -4307,7 +4236,6 @@ void ScExportTest::testHyperlinkXLSX()
void ScExportTest::testMoveCellAnchoredShapesODS()
{
ScDocShellRef xDocSh = loadDoc(u"move-cell-anchored-shapes.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods",
xDocSh.is());
// There are two cell-anchored objects on the first sheet.
ScDocument& rDoc = xDocSh->GetDocument();
@@ -4480,7 +4408,6 @@ void ScExportTest::testMoveCellAnchoredShapesODS()
void ScExportTest::testConditionalFormatRangeListXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"conditionalformat_rangelist.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
@@ -4491,7 +4418,6 @@ void ScExportTest::testConditionalFormatRangeListXLSX()
void ScExportTest::testConditionalFormatContainsTextXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"conditionalformat_containstext.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
@@ -4503,7 +4429,6 @@ void ScExportTest::testConditionalFormatContainsTextXLSX()
void ScExportTest::testConditionalFormatPriorityCheckXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"conditional_fmt_checkpriority.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
@@ -4552,7 +4477,6 @@ void
ScExportTest::testConditionalFormatPriorityCheckXLSX()
void ScExportTest::testConditionalFormatOriginXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"conditional_fmt_origin.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
@@ -4566,7 +4490,6 @@ void ScExportTest::testConditionalFormatOriginXLSX()
void ScExportTest::testTdf113646()
{
ScDocShellRef xShell = loadDoc(u"tdf113646.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
auto pXPathFile = ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/styles.xml");
@@ -4581,7 +4504,6 @@ void ScExportTest::testDateStandardfilterXLSX()
{
// XLSX Roundtripping standard filter with date
ScDocShellRef xDocSh = loadDoc(u"tdf142607.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
diff --git a/sc/qa/unit/subsequent_export_test2.cxx
b/sc/qa/unit/subsequent_export_test2.cxx
index b0ffb138c51f..77b8858fcd97 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -348,7 +348,6 @@ void ScExportTest2::registerNamespaces(xmlXPathContextPtr&
pXmlXPathCtx)
void ScExportTest2::testMatrixMultiplicationXLSX()
{
ScDocShellRef xShell = loadDoc(u"matrix-multiplication.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -373,7 +372,6 @@ void ScExportTest2::testMatrixMultiplicationXLSX()
void ScExportTest2::testRefStringXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"ref_string.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is());
//make sure ref syntax gets saved for MSO-produced docs
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
@@ -390,7 +388,6 @@ void ScExportTest2::testRefStringConfigXLSX()
{
// this doc is configured with CalcA1 ref syntax
ScDocShellRef xDocSh = loadDoc(u"empty.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is());
@@ -516,7 +513,6 @@ void ScExportTest2::testHeaderFooterContentODS()
void ScExportTest2::testTextDirectionXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"writingMode.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
@@ -531,7 +527,6 @@ void ScExportTest2::testTextDirectionXLSX()
void ScExportTest2::testTdf121260()
{
ScDocShellRef xDocSh = loadDoc(u"tdf121260.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
// change formula syntax (i.e. not string ref syntax) to ExcelA1
@@ -557,7 +552,6 @@ void ScExportTest2::testTdf121260()
void ScExportTest2::testTdf120168()
{
ScDocShellRef xDocSh = loadDoc(u"tdf120168.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
@@ -576,7 +570,6 @@ void ScExportTest2::testTdf66668()
{
// Would hang on exporting without the fix in place
ScDocShellRef xDocSh = loadDoc(u"tdf66668.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
@@ -587,7 +580,6 @@ void ScExportTest2::testTdf66668()
void ScExportTest2::testTdf130108()
{
ScDocShellRef xDocSh = loadDoc(u"tdf130108.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
@@ -606,7 +598,6 @@ void ScExportTest2::testTdf130108()
void ScExportTest2::testTdf76949()
{
ScDocShellRef xDocSh = loadDoc(u"tdf76949.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pSheet = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -620,7 +611,6 @@ void ScExportTest2::testTdf76949()
void ScExportTest2::testTdf107586()
{
ScDocShellRef xDocSh = loadDoc(u"tdf107586.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pSheet = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -636,7 +626,6 @@ void ScExportTest2::testTdf107586()
void ScExportTest2::testTdf55417()
{
ScDocShellRef xDocSh = loadDoc(u"tdf55417.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
@@ -650,7 +639,6 @@ void ScExportTest2::testTdf55417()
void ScExportTest2::testTdf129985()
{
ScDocShellRef xDocSh = loadDoc(u"tdf129985.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
@@ -664,7 +652,6 @@ void ScExportTest2::testTdf129985()
void ScExportTest2::testTdf73063()
{
ScDocShellRef xDocSh = loadDoc(u"tdf73063.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
@@ -680,7 +667,6 @@ xmlDocUniquePtr
ScExportTest2::testTdf95640(std::u16string_view rFileName, sal_I
sal_Int32 nDestFormat)
{
ScDocShellRef xShell = loadDoc(rFileName, nSourceFormat);
- CPPUNIT_ASSERT(xShell);
auto pXPathFile = ScBootstrapFixture::exportTo(*xShell, nDestFormat);
xShell->DoClose();
@@ -734,7 +720,6 @@ void ScExportTest2::testDateAutofilterXLSX()
{
// XLSX Roundtripping autofilter with date list
ScDocShellRef xDocSh = loadDoc(u"dateAutofilter.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -759,7 +744,6 @@ void ScExportTest2::testDateAutofilterXLSX()
void ScExportTest2::testDateAutofilterODS()
{
ScDocShellRef xDocSh = loadDoc(u"tdf142231.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"content.xml", FORMAT_ODS);
@@ -773,7 +757,6 @@ void ScExportTest2::testDateAutofilterODS()
void ScExportTest2::testAutofilterColorsODF()
{
ScDocShellRef xDocSh = loadDoc(u"autofilter-colors.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"content.xml", FORMAT_ODS);
@@ -813,7 +796,6 @@ void ScExportTest2::testAutofilterColorsOOXML()
{
{
ScDocShellRef xDocSh = loadDoc(u"autofilter-colors.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile
= ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pTable1
@@ -835,7 +817,6 @@ void ScExportTest2::testAutofilterColorsOOXML()
{
ScDocShellRef xDocSh = loadDoc(u"autofilter-colors-fg.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile
= ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pTable1
@@ -859,7 +840,6 @@ void ScExportTest2::testAutofilterColorsOOXML()
void ScExportTest2::testAutofilterTop10XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf143068_top10filter.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -873,7 +853,6 @@ void ScExportTest2::testAutofilterTop10XLSX()
void ScExportTest2::testTdf88657ODS()
{
ScDocShellRef xDocSh = loadDoc(u"tdf88657.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc
= XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, "styles.xml",
FORMAT_ODS);
@@ -887,7 +866,6 @@ void ScExportTest2::testTdf88657ODS()
void ScExportTest2::testTdf41722()
{
ScDocShellRef xDocSh = loadDoc(u"tdf41722.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -903,7 +881,6 @@ void ScExportTest2::testTdf41722()
void ScExportTest2::testTdf113621()
{
ScDocShellRef xDocSh = loadDoc(u"tdf113621.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -917,7 +894,6 @@ void ScExportTest2::testTdf113621()
void ScExportTest2::testEscapeCharInNumberFormatXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf81939.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -950,7 +926,6 @@ void ScExportTest2::testEscapeCharInNumberFormatXLSX()
void ScExportTest2::testNatNumInNumberFormatXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf79398_NatNum5.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX); // Convert [NatNum5] to
[DBNum2] in Chinese
CPPUNIT_ASSERT(xDocSh.is());
@@ -967,7 +942,6 @@ void ScExportTest2::testNatNumInNumberFormatXLSX()
void ScExportTest2::testExponentWithoutSignFormatXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf102370_ExponentWithoutSign.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -988,7 +962,6 @@ void ScExportTest2::testExponentWithoutSignFormatXLSX()
void ScExportTest2::testExtendedLCIDXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf36038_ExtendedLCID.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -1064,7 +1037,6 @@ void ScExportTest2::testHiddenRepeatedRowsODS()
void ScExportTest2::testHyperlinkTargetFrameODS()
{
ScDocShellRef xDocSh = loadDoc(u"hyperlink_frame.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
const EditTextObject* pEditText = rDoc.GetEditText(ScAddress(2, 5, 0));
@@ -1105,7 +1077,6 @@ void ScExportTest2::testOpenDocumentAsReadOnly()
void ScExportTest2::testKeepSettingsOfBlankRows()
{
ScDocShellRef xDocSh = loadDoc(u"tdf41425.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1121,7 +1092,6 @@ void ScExportTest2::testKeepSettingsOfBlankRows()
void ScExportTest2::testTdf133595()
{
ScDocShellRef xDocSh = loadDoc(u"tdf133595.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1137,7 +1107,6 @@ void ScExportTest2::testTdf133595()
void ScExportTest2::testTdf134769()
{
ScDocShellRef xDocSh = loadDoc(u"tdf134769.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1160,7 +1129,6 @@ void ScExportTest2::testTdf134769()
void ScExportTest2::testTdf106181()
{
ScDocShellRef xDocSh = loadDoc(u"tdf106181.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -1199,7 +1167,6 @@ void ScExportTest2::testTdf106181()
void ScExportTest2::testTdf145057()
{
ScDocShellRef xDocSh = loadDoc(u"tdf145057.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
@@ -1212,7 +1179,6 @@ void ScExportTest2::testTdf145057()
void ScExportTest2::testTdf105272()
{
ScDocShellRef xDocSh = loadDoc(u"tdf105272.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
ScDocument& rDoc = xDocSh->GetDocument();
//without the fix in place,it would fail
@@ -1227,7 +1193,6 @@ void ScExportTest2::testTdf105272()
void ScExportTest2::testTdf118990()
{
ScDocShellRef xDocSh = loadDoc(u"tdf118990.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
ScDocument& rDoc = xDocSh->GetDocument();
@@ -1250,7 +1215,6 @@ void ScExportTest2::testTdf118990()
void ScExportTest2::testTdf121612()
{
ScDocShellRef xDocSh = loadDoc(u"tdf121612.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
ScDocument& rDoc = xDocSh->GetDocument();
@@ -1269,7 +1233,6 @@ void ScExportTest2::testTdf121612()
void ScExportTest2::testTdf112936()
{
ScDocShellRef xDocSh = loadDoc(u"tdf112936.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory,
"xl/pivotCache/pivotCacheDefinition1.xml", FORMAT_XLSX);
@@ -1301,7 +1264,6 @@ void ScExportTest2::testXltxExport()
void ScExportTest2::testPivotCacheAfterExportXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"numgroup_example.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
// export only
std::shared_ptr<utl::TempFile> pTemp = exportTo(*xDocSh, FORMAT_XLSX);
@@ -1330,7 +1292,6 @@ void ScExportTest2::testPivotCacheAfterExportXLSX()
void ScExportTest2::testTdf114969XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"sheet_name_with_dots.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -1344,7 +1305,6 @@ void ScExportTest2::testTdf114969XLSX()
void ScExportTest2::testTdf115192XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"test_115192.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(
*this, *xDocSh, m_xSFactory, "xl/drawings/_rels/drawing1.xml.rels",
FORMAT_XLSX);
@@ -1361,7 +1321,6 @@ void ScExportTest2::testTdf115192XLSX()
void ScExportTest2::testTdf142764()
{
ScDocShellRef xShell = loadDoc(u"tdf142764.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell);
auto pXPathFile = ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -1378,7 +1337,6 @@ void ScExportTest2::testTdf142764()
void ScExportTest2::testTdf91634XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"image_hyperlink.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -1400,7 +1358,6 @@ void ScExportTest2::testTdf91634XLSX()
void ScExportTest2::testValidationCopyPaste()
{
ScDocShellRef xDocSh = loadDoc(u"validation-copypaste.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rSrcDoc = xDocSh->GetDocument();
// Copy B1 from src doc to clip
@@ -1435,7 +1392,6 @@ void ScExportTest2::testValidationCopyPaste()
void ScExportTest2::testTdf115159()
{
ScDocShellRef xShell = loadDoc(u"tdf115159.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
xShell->DoClose();
@@ -1463,7 +1419,6 @@ void ScExportTest2::testTdf112567()
});
ScDocShellRef xShell = loadDoc(u"tdf112567.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
xShell->DoClose();
@@ -1491,7 +1446,6 @@ void ScExportTest2::testTdf122191()
});
ScDocShellRef xShell = loadDoc(u"tdf122191.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
CPPUNIT_ASSERT_EQUAL(OUString("IGAZ"), rDoc.GetString(0, 0, 0));
@@ -1512,7 +1466,6 @@ void ScExportTest2::testTdf122191()
void ScExportTest2::testTdf142881()
{
ScDocShellRef xDocSh = loadDoc(u"tdf142881.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to load tdf142881.xlsx", xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDrawing1
@@ -1556,7 +1509,6 @@ void ScExportTest2::testTdf112567b()
});
ScDocShellRef xShell = loadDoc(u"tdf112567.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
xShell->DoClose();
@@ -1578,7 +1530,6 @@ void ScExportTest2::testTdf112567b()
void ScExportTest2::testTdf123645XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"chart_hyperlink.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -1619,7 +1570,6 @@ void ScExportTest2::testTdf123645XLSX()
void ScExportTest2::testTdf125173XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"text_box_hyperlink.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -1641,7 +1591,6 @@ void ScExportTest2::testTdf125173XLSX()
void ScExportTest2::testTdf79972XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf79972.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -1662,7 +1611,6 @@ void ScExportTest2::testTdf79972XLSX()
void ScExportTest2::testTdf126024XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"hyperlink_formula.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -1683,7 +1631,6 @@ void ScExportTest2::testTdf126024XLSX()
void ScExportTest2::testTdf126177XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"hyperlink_export.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -1705,7 +1652,6 @@ void ScExportTest2::testCommentTextVAlignment()
{
// Testing comment text alignments.
ScDocShellRef xShell = loadDoc(u"CommentTextVAlign.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -1722,7 +1668,6 @@ void ScExportTest2::testCommentTextHAlignment()
{
// Testing comment text alignments.
ScDocShellRef xShell = loadDoc(u"CommentTextHAlign.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -1744,7 +1689,6 @@ void ScExportTest2::testRotatedImageODS()
xGlobalSheetSettings->setMetric(static_cast<sal_Int16>(FieldUnit::MM));
ScDocShellRef xDocSh = loadDoc(u"tdf103092_RotatedImage.", FORMAT_ODS,
true);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pTemp = exportTo(*xDocSh, FORMAT_ODS);
CPPUNIT_ASSERT(pTemp);
@@ -1789,7 +1733,6 @@ void ScExportTest2::testTdf85553()
void ScExportTest2::testTdf128976()
{
ScDocShellRef xShell = loadDoc(u"tdf128976.", FORMAT_XLS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLS);
xShell->DoClose();
@@ -1871,7 +1814,6 @@ void ScExportTest2::testTdf120502()
void ScExportTest2::testTdf131372()
{
ScDocShellRef xShell = loadDoc(u"tdf131372.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell);
auto pXPathFile = ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -1887,7 +1829,6 @@ void ScExportTest2::testTdf131372()
void ScExportTest2::testTdf81470()
{
ScDocShellRef xShell = loadDoc(u"tdf81470.", FORMAT_XLS);
- CPPUNIT_ASSERT(xShell);
//without the fix in place, it would have crashed at export time
auto pXPathFile = ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -1910,7 +1851,6 @@ void ScExportTest2::testTdf81470()
void ScExportTest2::testTdf122331()
{
ScDocShellRef xShell = loadDoc(u"tdf122331.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell);
auto pXPathFile = ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -1929,7 +1869,6 @@ void ScExportTest2::testTdf83779()
{
// Roundtripping TRUE/FALSE constants (not functions) must convert them to
functions
ScDocShellRef xShell = loadDoc(u"tdf83779.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell);
auto pXPathFile = ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -1947,7 +1886,6 @@ void
ScExportTest2::testTdf121715_FirstPageHeaderFooterXLSX()
{
// Check if first page header and footer are exported properly
ScDocShellRef xShell = loadDoc(u"tdf121715.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -1968,7 +1906,6 @@ void
ScExportTest2::testTdf121716_ExportEvenHeaderFooterXLSX()
// then the footer will be duplicated to have the same footer separately
for even/odd pages
ScDocShellRef xShell = loadDoc(u"tdf121716_EvenHeaderFooter.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2002,7 +1939,6 @@ void ScExportTest2::testTdf134459_HeaderFooterColorXLSX()
{
// Colors in header and footer should be exported, and imported properly
ScDocShellRef xShell = loadDoc(u"tdf134459_HeaderFooterColor.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2023,7 +1959,6 @@ void
ScExportTest2::testTdf134817_HeaderFooterTextWith2SectionXLSX()
{
// Header/footer text with multiple selection should be exported, and
imported properly
ScDocShellRef xShell = loadDoc(u"tdf134817_HeaderFooterTextWith2Section.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2044,7 +1979,6 @@ void ScExportTest2::testTdf121718_UseFirstPageNumberXLSX()
{
// If "First page number" is not checked then useFirstPageNumb, and
firstPageNumber should not be exported.
ScDocShellRef xShell = loadDoc(u"tdf121718_UseFirstPageNumber.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2069,7 +2003,6 @@ void ScExportTest2::testTdf121718_UseFirstPageNumberXLSX()
void ScExportTest2::testHeaderFontStyleXLSX()
{
ScDocShellRef xShell = loadDoc(u"tdf134826.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
SfxStyleSheetBase* pStyleSheet
@@ -2107,7 +2040,6 @@ void ScExportTest2::testTdf135828_Shape_Rect()
// tdf#123613 Check the positioning, and allow massive rounding errors
because of the back and
// forth conversion between emu and hmm.
ScDocShellRef xShell = loadDoc(u"tdf135828_Shape_Rect.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2140,7 +2072,6 @@ void ScExportTest2::testTdf135828_Shape_Rect()
void ScExportTest2::testTdf123139XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf123139_applyAlignment.", FORMAT_XLSX);
- CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
const ScPatternAttr* pAttr = rDoc.GetPattern(0, 0, 0); //A1
@@ -2198,7 +2129,6 @@ void ScExportTest2::testTdf123139XLSX()
void ScExportTest2::testTdf123353()
{
ScDocShellRef xShell = loadDoc(u"tdf123353.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2217,7 +2147,6 @@ void ScExportTest2::testTdf123353()
void ScExportTest2::testTdf140098()
{
ScDocShellRef xShell = loadDoc(u"tdf140098.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2237,7 +2166,6 @@ void ScExportTest2::testTdf133688_precedents()
{
// tdf#133688 Check that we do not export detective shapes.
ScDocShellRef xShell = loadDoc(u"tdf133688_dont_save_precedents_to_xlsx.",
FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pDrawing
@@ -2253,7 +2181,6 @@ void
ScExportTest2::testTdf91251_missingOverflowRoundtrip()
// tdf#91251 check whether textBox overflow property (horzOverflow and
vertOverflow) is
// getting preserved after roundtrip
ScDocShellRef xShell = loadDoc(u"tdf91251_missingOverflowRoundtrip.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2277,7 +2204,6 @@ void ScExportTest2::testTdf137000_handle_upright()
// (Upright is an xml attribute of xdr:txBody/a:bodyPr. It is set when
// in a textbox menu we choose: do not rotate this element.)
ScDocShellRef xShell = loadDoc(u"tdf137000_export_upright.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pDrawing
@@ -2291,7 +2217,6 @@ void ScExportTest2::testTdf137000_handle_upright()
void ScExportTest2::testTdf126305_DataValidatyErrorAlert()
{
ScDocShellRef xShell = loadDoc(u"tdf126305.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2313,7 +2238,6 @@ void ScExportTest2::testTdf126305_DataValidatyErrorAlert()
void ScExportTest2::testTdf76047_externalLink()
{
ScDocShellRef pShell = loadDoc(u"tdf76047_externalLink.", FORMAT_XLSX);
- CPPUNIT_ASSERT(pShell.is());
// load data from external links. (tdf76047_externalLinkSource.ods)
// that file has to be in the same directory as tdf76047_externalLink.xlsx
@@ -2338,7 +2262,6 @@ void ScExportTest2::testTdf76047_externalLink()
void ScExportTest2::testTdf87973_externalLinkSkipUnuseds()
{
ScDocShellRef pShell = loadDoc(u"tdf87973_externalLinkSkipUnuseds.",
FORMAT_ODS);
- CPPUNIT_ASSERT(pShell.is());
// try to load data from external link: tdf132105_external.ods
// that file has to be in the same directory as
tdf87973_externalLinkSkipUnuseds.ods
@@ -2389,7 +2312,6 @@ void ScExportTest2::testTdf87973_externalLinkSkipUnuseds()
void ScExportTest2::testTdf51022_lostPrintRange()
{
ScDocShellRef pShell = loadDoc(u"tdf87973_externalLinkSkipUnuseds.",
FORMAT_ODS);
- CPPUNIT_ASSERT(pShell.is());
pShell->ReloadAllLinks();
ScDocument& rDoc = pShell->GetDocument();
@@ -2416,7 +2338,6 @@ void ScExportTest2::testTdf51022_lostPrintRange()
void ScExportTest2::testTdf138741_externalLinkSkipUnusedsCrash()
{
ScDocShellRef xShell = loadDoc(u"tdf138741_externalLinkSkipUnusedsCrash.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell);
//without the fix in place, it would have crashed at export time
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -2427,7 +2348,6 @@ void
ScExportTest2::testTdf138741_externalLinkSkipUnusedsCrash()
void ScExportTest2::testTdf138824_linkToParentDirectory()
{
ScDocShellRef xShell =
loadDoc(u"childDir/tdf138824_linkToParentDirectory.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
@@ -2465,7 +2385,6 @@ void ScExportTest2::testTdf138824_linkToParentDirectory()
void ScExportTest2::testTdf129969()
{
ScDocShellRef xShell = loadDoc(u"external_hyperlink.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2482,7 +2401,6 @@ void ScExportTest2::testTdf129969()
void ScExportTest2::testTdf147088()
{
ScDocShellRef xShell = loadDoc(u"tdf147088.", FORMAT_FODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
xShell->DoClose();
@@ -2501,7 +2419,6 @@ void ScExportTest2::testTdf147088()
void ScExportTest2::testTdf84874()
{
ScDocShellRef xShell = loadDoc(u"tdf84874.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
xShell->DoClose();
@@ -2532,7 +2449,6 @@ void ScExportTest2::testTdf84874()
void ScExportTest2::testTdf136721_paper_size()
{
ScDocShellRef xShell = loadDoc(u"tdf136721_letter_sized_paper.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
xmlDocUniquePtr pDoc
@@ -2546,7 +2462,6 @@ void ScExportTest2::testTdf139258_rotated_image()
{
// Check that the topleft position of the image is correct.
ScDocShellRef xShell = loadDoc(u"tdf139258_rotated_image.", FORMAT_ODS);
- CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -2582,7 +2497,6 @@ void ScExportTest2::testTdf144642_RowHeightRounding()
// Calc simulates this roundings but only if the xlsx file was saved in MS
Excel.
ScDocShellRef xShell = loadDoc(u"tdf144642_RowHeight_10mm_SavedByCalc.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
// 10mm == 567 twips == 28.35pt
CPPUNIT_ASSERT_EQUAL(sal_uInt16(567), rDoc.GetRowHeight(0, 0));
@@ -2590,7 +2504,6 @@ void ScExportTest2::testTdf144642_RowHeightRounding()
xShell->DoClose();
xShell = loadDoc(u"tdf144642_RowHeight_28.35pt_SavedByExcel.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc2 = xShell->GetDocument();
// 555twips == 27.75pt == 9.79mm
CPPUNIT_ASSERT_EQUAL(sal_uInt16(555), rDoc2.GetRowHeight(0, 0));
@@ -2605,7 +2518,6 @@ void
ScExportTest2::testTdf145129_DefaultRowHeightRounding()
ScDocShellRef xShell
= loadDoc(u"tdf145129_DefaultRowHeight_28.35pt_SavedByExcel.",
FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocument& rDoc = xShell->GetDocument();
// 555twips == 27.75pt == 9.79mm
CPPUNIT_ASSERT_EQUAL(sal_uInt16(555), rDoc.GetRowHeight(0, 0));
@@ -2616,7 +2528,6 @@ void
ScExportTest2::testTdf145129_DefaultRowHeightRounding()
void ScExportTest2::testTdf140431()
{
ScDocShellRef xShell = loadDoc(u"129969-min.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2636,7 +2547,6 @@ void ScExportTest2::testCheckboxFormControlXlsxExport()
return;
// Given a document that has a checkbox form control:
ScDocShellRef xShell = loadDoc(u"checkbox-form-control.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
// When exporting to XLSX:
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -2653,7 +2563,6 @@ void ScExportTest2::testButtonFormControlXlsxExport()
{
// Given a document that has a checkbox form control:
ScDocShellRef xShell = loadDoc(u"button-form-control.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
// When exporting to XLSX:
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xShell, FORMAT_XLSX);
@@ -2681,7 +2590,6 @@ void ScExportTest2::testTdf142929_filterLessThanXLSX()
{
// Document contains a standard filter with '<' condition.
ScDocShellRef xDocSh = loadDoc(u"tdf142929.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -2697,7 +2605,6 @@ void ScExportTest2::testInvalidNamedRange()
// Given a document which has a named range (myname) that refers to the
"1" external link, but
// the link's type is xlPathMissing, when importing that document:
ScDocShellRef xDocSh = loadDoc(u"invalid-named-range.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
// Then make sure that named range is ignored, as "1" can't be resolved,
and exporting it back
// to XLSX (without the xlPathMissing link) would corrupt the document:
@@ -2712,7 +2619,6 @@ void ScExportTest2::testInvalidNamedRange()
void ScExportTest2::testExternalDefinedNameXLSX()
{
ScDocShellRef xShell = loadDoc(u"tdf144397.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xShell.is());
ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2772,7 +2678,6 @@ void ScExportTest2::testExternalDefinedNameXLSX()
void ScExportTest2::testHyperlinkLocationXLSX()
{
ScDocShellRef xDocSh = loadDoc(u"tdf143220.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
@@ -2796,7 +2701,6 @@ void ScExportTest2::testTdf142264ManyChartsToXLSX()
officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get());
ScDocShellRef xDocSh = loadDoc(u"many_charts.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
xDocSh = saveAndReload(*xDocSh, FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
@@ -2872,7 +2776,6 @@ void ScExportTest2::testTdf142264ManyChartsToXLSX()
void ScExportTest2::testTdf143929MultiColumnToODS()
{
ScDocShellRef xDocSh = loadDoc(u"two-col-shape.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh);
{
css::uno::Reference<css::drawing::XDrawPagesSupplier>
xSupplier(xDocSh->GetModel(),
@@ -2943,7 +2846,6 @@ void ScExportTest2::testTdf143929MultiColumnToODS()
void ScExportTest2::testTdf142578()
{
ScDocShellRef xDocSh = loadDoc(u"tdf142578.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh);
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xmlDocUniquePtr pSheet
@@ -2981,7 +2883,6 @@ void ScExportTest2::testTdf142578()
void ScExportTest2::testTdf145059()
{
ScDocShellRef xDocSh = loadDoc(u"tdf145059.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh);
// Export to xlsx.
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
@@ -3009,7 +2910,6 @@ void ScExportTest2::testTdf145059()
void ScExportTest2::testTdf130104_XLSXIndent()
{
ScDocShellRef xDocSh = loadDoc(u"tdf130104_indent.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh);
// Resave the xlsx file without any modification.
std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
@@ -3097,7 +2997,6 @@ void ScExportTest2::testTdf130104_XLSXIndent()
void ScExportTest2::testWholeRowBold()
{
ScDocShellRef xDocSh1 = loadDoc(u"blank.", FORMAT_ODS);
- CPPUNIT_ASSERT_MESSAGE("Failed to open empty doc", xDocSh1.is());
ScDocument* pDoc = &xDocSh1->GetDocument();
// Make entire second row bold.
@@ -3128,7 +3027,6 @@ void ScExportTest2::testWholeRowBold()
void ScExportTest2::testXlsxRowsOrder()
{
ScDocShellRef xDocSh = loadDoc(u"tdf58243.", FORMAT_XLSX);
- CPPUNIT_ASSERT(xDocSh.is());
// Make sure code in SheetDataBuffer doesn't assert columns/rows sorting.
ScBootstrapFixture::exportTo(*xDocSh, FORMAT_XLSX);
xDocSh->DoClose();
@@ -3137,7 +3035,6 @@ void ScExportTest2::testXlsxRowsOrder()
void ScExportTest2::testTdf91286()
{
ScDocShellRef xDocSh = loadDoc(u"tdf91286.", FORMAT_ODS);
- CPPUNIT_ASSERT(xDocSh.is());
std::shared_ptr<utl::TempFile> pTemp = exportTo(*xDocSh, FORMAT_XLSX);
xDocSh->DoClose();
diff --git a/sc/qa/unit/subsequent_filters_test.cxx
b/sc/qa/unit/subsequent_filters_test.cxx
index f0a749e810dd..d2cdaee3da54 100644
... etc. - the rest is truncated
