sc/qa/unit/subsequent_export-test.cxx | 1788 +++++++++++++++++++++-------------
solenv/clang-format/excludelist | 1
2 files changed, 1106 insertions(+), 683 deletions(-)
New commits:
commit 341f923b5e487fa596e369d2ad17daaea909d9ec
Author: Bartosz Kosiorek <gan...@poczta.onet.pl>
AuthorDate: Thu Aug 19 06:32:26 2021 -0400
Commit: Bartosz Kosiorek <gan...@poczta.onet.pl>
CommitDate: Fri Aug 20 16:02:06 2021 +0200
Enable automatic code style formatting for subsequent_export-test.cxx
As subsequent_export-test.cxx code style is following the recommended
code style (except too long lines and minor formattings), the code
is used only for testing and it is rarely modified (mainly adding
new test cases), I decided to enable automatic code formatting.
It is one step closer to migrate to common code style.
Change-Id: Iaa6c243fab45c37cb01672633717577651916c3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120706
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gan...@poczta.onet.pl>
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index e1d3f78bb93b..aa2a12f69d33 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -84,6 +84,7 @@ class ScExportTest : public ScBootstrapFixture, public
XmlTestTools
{
protected:
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
+
public:
ScExportTest();
@@ -166,12 +167,12 @@ public:
void testSharedFormulaExportXLSX();
void testSharedFormulaStringResultExportXLSX();
- void testFunctionsExcel2010( sal_uLong nFormatType );
+ void testFunctionsExcel2010(sal_uLong nFormatType);
void testFunctionsExcel2010XLSX();
void testFunctionsExcel2010XLS();
void testFunctionsExcel2010ODS();
- void testCeilingFloor( sal_uLong nFormatType );
+ void testCeilingFloor(sal_uLong nFormatType);
void testCeilingFloorXLSX();
void testCeilingFloorODSToXLSX();
void testCeilingFloorXLS();
@@ -313,7 +314,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- void testExcelCellBorders( sal_uLong nFormatType );
+ void testExcelCellBorders(sal_uLong nFormatType);
uno::Reference<uno::XInterface> m_xCalcComponent;
};
@@ -326,21 +327,20 @@ void ScExportTest::registerNamespaces(xmlXPathContextPtr&
pXmlXPathCtx)
void ScExportTest::test()
{
- ScDocShell* pShell = new ScDocShell(
- SfxModelFlags::EMBEDDED_OBJECT |
- SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
- SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+ ScDocShell* pShell
+ = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS
+ | SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
pShell->DoInitNew();
ScDocument& rDoc = pShell->GetDocument();
- rDoc.SetValue(0,0,0, 1.0);
+ rDoc.SetValue(0, 0, 0, 1.0);
ScDocShellRef xDocSh = saveAndReload(pShell, FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rLoadedDoc = xDocSh->GetDocument();
- double aVal = rLoadedDoc.GetValue(0,0,0);
+ double aVal = rLoadedDoc.GetValue(0, 0, 0);
ASSERT_DOUBLES_EQUAL(aVal, 1.0);
xDocSh->DoClose();
}
@@ -376,7 +376,8 @@ void ScExportTest::testTdf139167()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/styles.xml");
CPPUNIT_ASSERT(pDoc);
@@ -395,7 +396,8 @@ void ScExportTest::testTdf113271()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/styles.xml");
CPPUNIT_ASSERT(pDoc);
@@ -418,19 +420,27 @@ void ScExportTest::testTdf139394()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
- xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+ xmlDocUniquePtr pDoc
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pDoc);
- assertXPathContent(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
- "x14:cfRule/xm:f", "LEFT(A1,LEN(\"+\"))=\"+\"");
- assertXPathContent(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
- "x14:cfRule/xm:f", "RIGHT(A2,LEN(\"-\"))=\"-\"");
- assertXPathContent(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[3]/"
- "x14:cfRule/xm:f", "LEFT(A3,LEN($B$3))=$B$3");
+ assertXPathContent(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
+ "x14:cfRule/xm:f",
+ "LEFT(A1,LEN(\"+\"))=\"+\"");
+ assertXPathContent(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
+ "x14:cfRule/xm:f",
+ "RIGHT(A2,LEN(\"-\"))=\"-\"");
+ assertXPathContent(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[3]/"
+ "x14:cfRule/xm:f",
+ "LEFT(A3,LEN($B$3))=$B$3");
xDocSh->DoClose();
}
@@ -443,28 +453,42 @@ void ScExportTest::testExtCondFormatXLSX()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
- xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+ xmlDocUniquePtr pDoc
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pDoc);
- assertXPath(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
- "x14:cfRule", "type", "containsText");
- assertXPathContent(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
- "x14:cfRule/xm:f[1]", "NOT(ISERROR(SEARCH($B$1,A1)))");
- assertXPathContent(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
- "x14:cfRule/xm:f[2]", "$B$1");
- assertXPath(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
- "x14:cfRule", "type", "notContainsText");
- assertXPathContent(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
- "x14:cfRule/xm:f[1]", "ISERROR(SEARCH($B$2,A2))");
- assertXPathContent(pDoc,
-
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
- "x14:cfRule/xm:f[2]", "$B$2");
+ assertXPath(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
+ "x14:cfRule",
+ "type", "containsText");
+ assertXPathContent(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
+ "x14:cfRule/xm:f[1]",
+ "NOT(ISERROR(SEARCH($B$1,A1)))");
+ assertXPathContent(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[1]/"
+ "x14:cfRule/xm:f[2]",
+ "$B$1");
+ assertXPath(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
+ "x14:cfRule",
+ "type", "notContainsText");
+ assertXPathContent(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
+ "x14:cfRule/xm:f[1]",
+ "ISERROR(SEARCH($B$2,A2))");
+ assertXPathContent(
+ pDoc,
+
"/x:worksheet/x:extLst/x:ext/x14:conditionalFormattings/x14:conditionalFormatting[2]/"
+ "x14:cfRule/xm:f[2]",
+ "$B$2");
xDocSh->DoClose();
}
@@ -484,14 +508,18 @@ void ScExportTest::testTdf90104()
= XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pDoc);
- assertXPathContent(pDoc,
"/x:worksheet/x:dataValidations/x:dataValidation/mc:AlternateContent"
- "/mc:Choice/x12ac:list", "1,\"2,3\",4,\"5,6\"");
- assertXPathContent(pDoc,
"/x:worksheet/x:dataValidations/x:dataValidation/mc:AlternateContent"
- "/mc:Fallback/x:formula1", "\"1,2,3,4,5,6\"");
+ assertXPathContent(pDoc,
+
"/x:worksheet/x:dataValidations/x:dataValidation/mc:AlternateContent"
+ "/mc:Choice/x12ac:list",
+ "1,\"2,3\",4,\"5,6\"");
+ assertXPathContent(pDoc,
+
"/x:worksheet/x:dataValidations/x:dataValidation/mc:AlternateContent"
+ "/mc:Fallback/x:formula1",
+ "\"1,2,3,4,5,6\"");
}
void ScExportTest::testTdf111876()
- {
+{
// Document with relative path hyperlink
ScDocShellRef xShell = loadDoc(u"tdf111876.", FORMAT_XLSX);
@@ -500,7 +528,8 @@ void ScExportTest::testTdf111876()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.is());
- xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory, "xl/worksheets/_rels/sheet1.xml.rels", FORMAT_XLSX);
+ xmlDocUniquePtr pDoc = XPathHelper::parseExport2(
+ *this, *xDocSh, m_xSFactory, "xl/worksheets/_rels/sheet1.xml.rels",
FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
OUString sTarget = getXPath(pDoc, "/rels:Relationships/rels:Relationship",
"Target");
@@ -512,10 +541,9 @@ void ScExportTest::testTdf111876()
void ScExportTest::testPasswordExportODS()
{
- ScDocShell* pShell = new ScDocShell(
- SfxModelFlags::EMBEDDED_OBJECT |
- SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
- SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+ ScDocShell* pShell
+ = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS
+ | SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
pShell->DoInitNew();
ScDocument& rDoc = pShell->GetDocument();
@@ -526,7 +554,7 @@ void ScExportTest::testPasswordExportODS()
CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rLoadedDoc = xDocSh->GetDocument();
- double aVal = rLoadedDoc.GetValue(0,0,0);
+ double aVal = rLoadedDoc.GetValue(0, 0, 0);
ASSERT_DOUBLES_EQUAL(aVal, 1.0);
xDocSh->DoClose();
@@ -539,18 +567,18 @@ void ScExportTest::testTdf134332()
ScDocument& rDoc = xShell->GetDocument();
- ASSERT_DOUBLES_EQUAL(190.0, rDoc.GetValue(ScAddress(0,0,0)));
+ ASSERT_DOUBLES_EQUAL(190.0, rDoc.GetValue(ScAddress(0, 0, 0)));
- ASSERT_DOUBLES_EQUAL(238.0, rDoc.GetValue(ScAddress(0,10144,0)));
+ ASSERT_DOUBLES_EQUAL(238.0, rDoc.GetValue(ScAddress(0, 10144, 0)));
ScDocShellRef xDocSh = saveAndReloadPassword(xShell.get(), FORMAT_ODS);
// Without the fixes in place, it would have failed here
CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rLoadedDoc = xDocSh->GetDocument();
- ASSERT_DOUBLES_EQUAL(190.0, rLoadedDoc.GetValue(ScAddress(0,0,0)));
+ ASSERT_DOUBLES_EQUAL(190.0, rLoadedDoc.GetValue(ScAddress(0, 0, 0)));
- ASSERT_DOUBLES_EQUAL(238.0, rLoadedDoc.GetValue(ScAddress(0,10144,0)));
+ ASSERT_DOUBLES_EQUAL(238.0, rLoadedDoc.GetValue(ScAddress(0, 10144, 0)));
xDocSh->DoClose();
}
@@ -564,7 +592,7 @@ void ScExportTest::testConditionalFormatExportODS()
CPPUNIT_ASSERT(xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
OUString aCSVPath;
- createCSVPath( "new_cond_format_test_export.", aCSVPath );
+ createCSVPath("new_cond_format_test_export.", aCSVPath);
testCondFile(aCSVPath, &rDoc, 0);
xDocSh->DoClose();
@@ -588,20 +616,20 @@ void ScExportTest::testCondFormatExportCellIs()
CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::ExtCondition, pEntry->GetType());
const ScCondFormatEntry* pCondition = static_cast<const
ScCondFormatEntry*>(pEntry);
- CPPUNIT_ASSERT_EQUAL( ScConditionMode::Equal, pCondition->GetOperation());
+ CPPUNIT_ASSERT_EQUAL(ScConditionMode::Equal, pCondition->GetOperation());
OUString aStr = pCondition->GetExpression(ScAddress(0, 0, 0), 0);
- CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$2"), aStr );
+ CPPUNIT_ASSERT_EQUAL(OUString("$Sheet2.$A$2"), aStr);
pEntry = pFormat->GetEntry(1);
CPPUNIT_ASSERT(pEntry);
CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::ExtCondition, pEntry->GetType());
pCondition = static_cast<const ScCondFormatEntry*>(pEntry);
- CPPUNIT_ASSERT_EQUAL( ScConditionMode::Equal, pCondition->GetOperation());
+ CPPUNIT_ASSERT_EQUAL(ScConditionMode::Equal, pCondition->GetOperation());
aStr = pCondition->GetExpression(ScAddress(0, 0, 0), 0);
- CPPUNIT_ASSERT_EQUAL( OUString("$Sheet2.$A$1"), aStr );
+ CPPUNIT_ASSERT_EQUAL(OUString("$Sheet2.$A$1"), aStr);
xDocSh->DoClose();
}
@@ -616,12 +644,12 @@ void ScExportTest::testConditionalFormatExportXLSX()
ScDocument& rDoc = xDocSh->GetDocument();
{
OUString aCSVPath;
- createCSVPath( "new_cond_format_test_export.", aCSVPath );
+ createCSVPath("new_cond_format_test_export.", aCSVPath);
testCondFile(aCSVPath, &rDoc, 0);
}
{
OUString aCSVPath;
- createCSVPath( "new_cond_format_test_sheet2.", aCSVPath );
+ createCSVPath("new_cond_format_test_sheet2.", aCSVPath);
testCondFile(aCSVPath, &rDoc, 1);
}
@@ -633,7 +661,7 @@ 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.get(), FORMAT_XLSX);
+ ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX);
CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is());
ScDocument& rDoc = xDocSh->GetDocument();
@@ -657,17 +685,24 @@ void ScExportTest::testProtectionKeyODS_UTF16LErtlSHA1()
CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
- ScDocProtection *const pDocProt(rDoc.GetDocProtection());
+ ScDocProtection* const pDocProt(rDoc.GetDocProtection());
CPPUNIT_ASSERT(pDocProt->verifyPassword(password));
- const ScTableProtection *const pTabProt(rDoc.GetTabProtection(0));
+ const ScTableProtection* const pTabProt(rDoc.GetTabProtection(0));
CPPUNIT_ASSERT(pTabProt->verifyPassword(password));
// we can't assume that the user entered the password; check that we
// round-trip the password as-is
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPath(pXmlDoc,
"//office:spreadsheet[@table:structure-protected='true' and
@table:protection-key='vbnhxyBKtPHCA1wB21zG1Oha8ZA=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
- assertXPath(pXmlDoc, "//table:table[@table:protected='true' and
@table:protection-key='vbnhxyBKtPHCA1wB21zG1Oha8ZA=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
+ assertXPath(pXmlDoc,
+ "//office:spreadsheet[@table:structure-protected='true' and "
+ "@table:protection-key='vbnhxyBKtPHCA1wB21zG1Oha8ZA=' and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
+ assertXPath(pXmlDoc,
+ "//table:table[@table:protected='true' and "
+ "@table:protection-key='vbnhxyBKtPHCA1wB21zG1Oha8ZA=' and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
xShell->DoClose();
}
@@ -680,17 +715,24 @@ void ScExportTest::testProtectionKeyODS_UTF8SHA1()
CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
- ScDocProtection *const pDocProt(rDoc.GetDocProtection());
+ ScDocProtection* const pDocProt(rDoc.GetDocProtection());
CPPUNIT_ASSERT(pDocProt->verifyPassword(password));
- const ScTableProtection *const pTabProt(rDoc.GetTabProtection(0));
+ const ScTableProtection* const pTabProt(rDoc.GetTabProtection(0));
CPPUNIT_ASSERT(pTabProt->verifyPassword(password));
// we can't assume that the user entered the password; check that we
// round-trip the password as-is
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPath(pXmlDoc,
"//office:spreadsheet[@table:structure-protected='true' and
@table:protection-key='nLHas0RIwepGDaH4c2hpyIUvIS8=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
- assertXPath(pXmlDoc, "//table:table[@table:protected='true' and
@table:protection-key='nLHas0RIwepGDaH4c2hpyIUvIS8=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
+ assertXPath(pXmlDoc,
+ "//office:spreadsheet[@table:structure-protected='true' and "
+ "@table:protection-key='nLHas0RIwepGDaH4c2hpyIUvIS8=' and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
+ assertXPath(pXmlDoc,
+ "//table:table[@table:protected='true' and "
+ "@table:protection-key='nLHas0RIwepGDaH4c2hpyIUvIS8=' and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha1']");
xShell->DoClose();
}
@@ -703,17 +745,26 @@ void ScExportTest::testProtectionKeyODS_UTF8SHA256ODF12()
CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
- ScDocProtection *const pDocProt(rDoc.GetDocProtection());
+ ScDocProtection* const pDocProt(rDoc.GetDocProtection());
CPPUNIT_ASSERT(pDocProt->verifyPassword(password));
- const ScTableProtection *const pTabProt(rDoc.GetTabProtection(0));
+ const ScTableProtection* const pTabProt(rDoc.GetTabProtection(0));
CPPUNIT_ASSERT(pTabProt->verifyPassword(password));
// we can't assume that the user entered the password; check that we
// round-trip the password as-is
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPath(pXmlDoc,
"//office:spreadsheet[@table:structure-protected='true' and
@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
- assertXPath(pXmlDoc, "//table:table[@table:protected='true' and
@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
+ assertXPath(
+ pXmlDoc,
+ "//office:spreadsheet[@table:structure-protected='true' and "
+ "@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ='
and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
+ assertXPath(
+ pXmlDoc,
+ "//table:table[@table:protected='true' and "
+ "@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ='
and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
xShell->DoClose();
}
@@ -726,17 +777,26 @@ void ScExportTest::testProtectionKeyODS_UTF8SHA256W3C()
CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
- ScDocProtection *const pDocProt(rDoc.GetDocProtection());
+ ScDocProtection* const pDocProt(rDoc.GetDocProtection());
CPPUNIT_ASSERT(pDocProt->verifyPassword(password));
- const ScTableProtection *const pTabProt(rDoc.GetTabProtection(0));
+ const ScTableProtection* const pTabProt(rDoc.GetTabProtection(0));
CPPUNIT_ASSERT(pTabProt->verifyPassword(password));
// we can't assume that the user entered the password; check that we
// round-trip the password as-is
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPath(pXmlDoc,
"//office:spreadsheet[@table:structure-protected='true' and
@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
- assertXPath(pXmlDoc, "//table:table[@table:protected='true' and
@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ=' and
@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
+ assertXPath(
+ pXmlDoc,
+ "//office:spreadsheet[@table:structure-protected='true' and "
+ "@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ='
and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
+ assertXPath(
+ pXmlDoc,
+ "//table:table[@table:protected='true' and "
+ "@table:protection-key='1tnJohagR2T0yF/v69hLPuumSTsj32CumW97nkKGuSQ='
and "
+
"@table:protection-key-digest-algorithm='http://www.w3.org/2000/09/xmldsig#sha256']");
xShell->DoClose();
}
@@ -749,17 +809,30 @@ void ScExportTest::testProtectionKeyODS_XL_SHA1()
CPPUNIT_ASSERT_MESSAGE("Failed to load doc", xShell.is());
ScDocument& rDoc = xShell->GetDocument();
- ScDocProtection *const pDocProt(rDoc.GetDocProtection());
+ ScDocProtection* const pDocProt(rDoc.GetDocProtection());
CPPUNIT_ASSERT(pDocProt->verifyPassword(password));
- const ScTableProtection *const pTabProt(rDoc.GetTabProtection(0));
+ const ScTableProtection* const pTabProt(rDoc.GetTabProtection(0));
CPPUNIT_ASSERT(pTabProt->verifyPassword(password));
// we can't assume that the user entered the password; check that we
// round-trip the password as-is
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_ODS);
xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPath(pXmlDoc,
"//office:spreadsheet[@table:structure-protected='true' and
@table:protection-key='OX3WkEe79fv1PE+FUmfOLdwVoqI=' and
@table:protection-key-digest-algorithm='http://docs.oasis-open.org/office/ns/table/legacy-hash-excel'
and
@loext:protection-key-digest-algorithm-2='http://www.w3.org/2000/09/xmldsig#sha1']");
- assertXPath(pXmlDoc, "//table:table[@table:protected='true' and
@table:protection-key='OX3WkEe79fv1PE+FUmfOLdwVoqI=' and
@table:protection-key-digest-algorithm='http://docs.oasis-open.org/office/ns/table/legacy-hash-excel'
and
@loext:protection-key-digest-algorithm-2='http://www.w3.org/2000/09/xmldsig#sha1']");
+ assertXPath(
+ pXmlDoc,
+ "//office:spreadsheet[@table:structure-protected='true' and "
+ "@table:protection-key='OX3WkEe79fv1PE+FUmfOLdwVoqI=' and "
+
"@table:protection-key-digest-algorithm='http://docs.oasis-open.org/office/ns/table/";
+ "legacy-hash-excel' and "
+
"@loext:protection-key-digest-algorithm-2='http://www.w3.org/2000/09/xmldsig#sha1']");
+ assertXPath(
+ pXmlDoc,
+ "//table:table[@table:protected='true' and "
+ "@table:protection-key='OX3WkEe79fv1PE+FUmfOLdwVoqI=' and "
+
"@table:protection-key-digest-algorithm='http://docs.oasis-open.org/office/ns/table/";
+ "legacy-hash-excel' and "
+
"@loext:protection-key-digest-algorithm-2='http://www.w3.org/2000/09/xmldsig#sha1']");
xShell->DoClose();
}
@@ -870,10 +943,9 @@ void ScExportTest::testCommentExportXLSX_2_XLSX()
ScDocShellRef xShell = loadDoc(u"tdf117287_comment.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.is());
-
ScDocument& rDoc = xShell->GetDocument();
ScAddress aPosC9(2, 8, 0);
- ScPostIt *pNote = rDoc.GetNote(aPosC9);
+ ScPostIt* pNote = rDoc.GetNote(aPosC9);
CPPUNIT_ASSERT(pNote);
CPPUNIT_ASSERT(!pNote->IsCaptionShown());
@@ -905,8 +977,10 @@ void ScExportTest::testCustomColumnWidthExportXLSX()
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 = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+ xmlDocUniquePtr pSheet
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pSheet);
// tdf#124741: check that we export default width, otherwise the skipped
columns would have
@@ -980,7 +1054,8 @@ void ScExportTest::testXfDefaultValuesXLSX()
ScDocShellRef xShell = loadDoc(u"xf_default_values.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.is());
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
xmlDocUniquePtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/styles.xml");
CPPUNIT_ASSERT(pSheet);
@@ -1000,16 +1075,16 @@ void ScExportTest::testXfDefaultValuesXLSX()
xShell->DoClose();
}
-namespace {
-
+namespace
+{
// TODO where to put this?
class Resetter
{
private:
- std::function<void ()> m_Func;
+ std::function<void()> m_Func;
public:
- Resetter(std::function<void ()> const& rFunc)
+ Resetter(std::function<void()> const& rFunc)
: m_Func(rFunc)
{
}
@@ -1029,15 +1104,15 @@ public:
} // namespace
-static auto verifySpreadsheet13(char const*const pTestName, ScDocShellRef&
pShell) -> void
+static auto verifySpreadsheet13(char const* const pTestName, ScDocShellRef&
pShell) -> void
{
ScDocument const& rDoc(pShell->GetDocument());
// OFFICE-2173 table:tab-color
CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, Color(0xff3838),
rDoc.GetTabBgColor(0));
// OFFICE-3857 table:scale-to-X/table:scale-to-Y
OUString styleName = rDoc.GetPageStyle(0);
- ScStyleSheetPool * pStylePool = rDoc.GetStyleSheetPool();
- SfxStyleSheetBase * pStyleSheet = pStylePool->Find(styleName,
SfxStyleFamily::Page);
+ ScStyleSheetPool* pStylePool = rDoc.GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet = pStylePool->Find(styleName,
SfxStyleFamily::Page);
CPPUNIT_ASSERT_MESSAGE(pTestName, pStyleSheet);
SfxItemSet const& rSet = pStyleSheet->GetItemSet();
@@ -1055,11 +1130,11 @@ void ScExportTest::testODF13()
verifySpreadsheet13("import", pShell);
Resetter _([]() {
- std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
- comphelper::ConfigurationChanges::create());
- officecfg::Office::Common::Save::ODF::DefaultVersion::set(3,
pBatch);
- return pBatch->commit();
- });
+ std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
+ comphelper::ConfigurationChanges::create());
+ officecfg::Office::Common::Save::ODF::DefaultVersion::set(3, pBatch);
+ return pBatch->commit();
+ });
{
// export ODF 1.3
@@ -1068,17 +1143,24 @@ void ScExportTest::testODF13()
officecfg::Office::Common::Save::ODF::DefaultVersion::set(10, pBatch);
pBatch->commit();
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*pShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*pShell), FORMAT_ODS);
// check XML
- xmlDocUniquePtr pContentXml = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPath(pContentXml,
"/office:document-content/office:automatic-styles/style:style/style:table-properties[@table:tab-color='#ff3838']");
- xmlDocUniquePtr pStylesXml = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "styles.xml");
- assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/style:page-layout-properties[@style:scale-to-X='2']");
- assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/style:page-layout-properties[@style:scale-to-Y='3']");
+ xmlDocUniquePtr pContentXml
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory, "content.xml");
+ assertXPath(pContentXml,
"/office:document-content/office:automatic-styles/style:style/"
+
"style:table-properties[@table:tab-color='#ff3838']");
+ xmlDocUniquePtr pStylesXml
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory, "styles.xml");
+ assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/"
+
"style:page-layout-properties[@style:scale-to-X='2']");
+ assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/"
+
"style:page-layout-properties[@style:scale-to-Y='3']");
// reload
- pShell = load(pXPathFile->GetURL(), "calc8", OUString(), OUString(),
ODS_FORMAT_TYPE, SotClipboardFormatId::STARCALC_8);
+ pShell = load(pXPathFile->GetURL(), "calc8", OUString(), OUString(),
ODS_FORMAT_TYPE,
+ SotClipboardFormatId::STARCALC_8);
// check model
verifySpreadsheet13("1.3 reload", pShell);
@@ -1090,18 +1172,25 @@ void ScExportTest::testODF13()
officecfg::Office::Common::Save::ODF::DefaultVersion::set(9, pBatch);
pBatch->commit();
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::saveAs(&(*pShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::saveAs(&(*pShell), FORMAT_ODS);
pShell->DoClose();
// check XML
- xmlDocUniquePtr pContentXml = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPath(pContentXml,
"/office:document-content/office:automatic-styles/style:style/style:table-properties[@tableooo:tab-color='#ff3838']");
- xmlDocUniquePtr pStylesXml = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "styles.xml");
- assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/style:page-layout-properties[@loext:scale-to-X='2']");
- assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/style:page-layout-properties[@loext:scale-to-Y='3']");
+ xmlDocUniquePtr pContentXml
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory, "content.xml");
+ assertXPath(pContentXml,
"/office:document-content/office:automatic-styles/style:style/"
+
"style:table-properties[@tableooo:tab-color='#ff3838']");
+ xmlDocUniquePtr pStylesXml
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory, "styles.xml");
+ assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/"
+
"style:page-layout-properties[@loext:scale-to-X='2']");
+ assertXPath(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout/"
+
"style:page-layout-properties[@loext:scale-to-Y='3']");
// reload
- pShell = load(pXPathFile->GetURL(), "calc8", OUString(), OUString(),
ODS_FORMAT_TYPE, SotClipboardFormatId::STARCALC_8);
+ pShell = load(pXPathFile->GetURL(), "calc8", OUString(), OUString(),
ODS_FORMAT_TYPE,
+ SotClipboardFormatId::STARCALC_8);
// check model
verifySpreadsheet13("1.2 Extended reload", pShell);
@@ -1113,15 +1202,27 @@ void ScExportTest::testODF13()
officecfg::Office::Common::Save::ODF::DefaultVersion::set(4, pBatch);
pBatch->commit();
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::saveAs(&(*pShell), FORMAT_ODS);
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::saveAs(&(*pShell), FORMAT_ODS);
pShell->DoClose();
// check XML
- xmlDocUniquePtr pContentXml = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "content.xml");
- assertXPathNoAttribute(pContentXml,
"/office:document-content/office:automatic-styles/style:style/style:table-properties",
"tab-color");
- xmlDocUniquePtr pStylesXml = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "styles.xml");
- assertXPathNoAttribute(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout[1]/style:page-layout-properties",
"scale-to-X");
- assertXPathNoAttribute(pStylesXml,
"/office:document-styles/office:automatic-styles/style:page-layout[1]/style:page-layout-properties",
"scale-to-Y");
+ xmlDocUniquePtr pContentXml
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory, "content.xml");
+ assertXPathNoAttribute(
+ pContentXml,
+
"/office:document-content/office:automatic-styles/style:style/style:table-properties",
+ "tab-color");
+ xmlDocUniquePtr pStylesXml
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory, "styles.xml");
+ assertXPathNoAttribute(pStylesXml,
+
"/office:document-styles/office:automatic-styles/"
+
"style:page-layout[1]/style:page-layout-properties",
+ "scale-to-X");
+ assertXPathNoAttribute(pStylesXml,
+
"/office:document-styles/office:automatic-styles/"
+
"style:page-layout[1]/style:page-layout-properties",
+ "scale-to-Y");
// don't reload - no point
}
@@ -1134,8 +1235,10 @@ void ScExportTest::testColumnWidthResaveXLSX()
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 = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+ xmlDocUniquePtr pSheet
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pSheet);
// In original Excel document the width is "24"
@@ -1172,58 +1275,63 @@ void ScExportTest::testColumnWidthExportFromODStoXLSX()
ScDocShellRef xShell = loadDoc(u"different-column-width.", FORMAT_ODS);
- CPPUNIT_ASSERT( xShell.is() );
+ CPPUNIT_ASSERT(xShell.is());
ScDocument& rOdsDoc = xShell->GetDocument();
// Col 1, Tab 0 (Column width 2.00 in)
- sal_uInt16 nExpectedColumn0Width =
rOdsDoc.GetColWidth(static_cast<SCCOL>(0), static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( static_cast< sal_uInt16 >( 2880 ),
nExpectedColumn0Width );
+ sal_uInt16 nExpectedColumn0Width
+ = rOdsDoc.GetColWidth(static_cast<SCCOL>(0), static_cast<SCTAB>(0),
false);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(2880), nExpectedColumn0Width);
// Col 2, Tab 0 (Column width 1.00 in)
- sal_uInt16 nExpectedColumn1Width =
rOdsDoc.GetColWidth(static_cast<SCCOL>(1), static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( static_cast< sal_uInt16 >( 1440 ),
nExpectedColumn1Width );
+ sal_uInt16 nExpectedColumn1Width
+ = rOdsDoc.GetColWidth(static_cast<SCCOL>(1), static_cast<SCTAB>(0),
false);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(1440), nExpectedColumn1Width);
// Col 3, Tab 0 (Column width 0.50 in)
- sal_uInt16 nExpectedColumn2Width =
rOdsDoc.GetColWidth(static_cast<SCCOL>(2), static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( static_cast< sal_uInt16 >( 720 ),
nExpectedColumn2Width );
+ sal_uInt16 nExpectedColumn2Width
+ = rOdsDoc.GetColWidth(static_cast<SCCOL>(2), static_cast<SCTAB>(0),
false);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(720), nExpectedColumn2Width);
// Col 4, Tab 0 (Column width 0.25 in)
- sal_uInt16 nExpectedColumn3Width =
rOdsDoc.GetColWidth(static_cast<SCCOL>(3), static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( static_cast< sal_uInt16 >( 360 ),
nExpectedColumn3Width );
+ sal_uInt16 nExpectedColumn3Width
+ = rOdsDoc.GetColWidth(static_cast<SCCOL>(3), static_cast<SCTAB>(0),
false);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(360), nExpectedColumn3Width);
// Col 5, Tab 0 (Column width 13.57 in)
- sal_uInt16 nExpectedColumn4Width =
rOdsDoc.GetColWidth(static_cast<SCCOL>(4), static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( static_cast< sal_uInt16 >( 19539 ),
nExpectedColumn4Width );
+ sal_uInt16 nExpectedColumn4Width
+ = rOdsDoc.GetColWidth(static_cast<SCCOL>(4), static_cast<SCTAB>(0),
false);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(19539),
nExpectedColumn4Width);
// Export to .xlsx and compare column width with the .ods
// We expect that column width from .ods will be exactly the same as
imported from .xlsx
- ScDocShellRef xXlsxDocSh = saveAndReload( xShell.get(), FORMAT_XLSX );
- CPPUNIT_ASSERT( xXlsxDocSh.is() );
+ ScDocShellRef xXlsxDocSh = saveAndReload(xShell.get(), FORMAT_XLSX);
+ CPPUNIT_ASSERT(xXlsxDocSh.is());
ScDocument& rDoc = xXlsxDocSh->GetDocument();
// Col 1, Tab 0
sal_uInt16 nCalcWidth;
nCalcWidth = rDoc.GetColWidth(static_cast<SCCOL>(0),
static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( nExpectedColumn0Width, nCalcWidth );
+ CPPUNIT_ASSERT_EQUAL(nExpectedColumn0Width, nCalcWidth);
// Col 2, Tab 0
nCalcWidth = rDoc.GetColWidth(static_cast<SCCOL>(1),
static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( nExpectedColumn1Width, nCalcWidth );
+ CPPUNIT_ASSERT_EQUAL(nExpectedColumn1Width, nCalcWidth);
// Col 3, Tab 0
nCalcWidth = rDoc.GetColWidth(static_cast<SCCOL>(2),
static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( nExpectedColumn2Width, nCalcWidth );
+ CPPUNIT_ASSERT_EQUAL(nExpectedColumn2Width, nCalcWidth);
// Col 4, Tab 0
nCalcWidth = rDoc.GetColWidth(static_cast<SCCOL>(3),
static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( nExpectedColumn3Width, nCalcWidth );
+ CPPUNIT_ASSERT_EQUAL(nExpectedColumn3Width, nCalcWidth);
// Col 5, Tab 0
nCalcWidth = rDoc.GetColWidth(static_cast<SCCOL>(4),
static_cast<SCTAB>(0), false);
- CPPUNIT_ASSERT_EQUAL( nExpectedColumn4Width, nCalcWidth );
+ CPPUNIT_ASSERT_EQUAL(nExpectedColumn4Width, nCalcWidth);
xXlsxDocSh->DoClose();
}
@@ -1236,8 +1344,10 @@ void ScExportTest::testOutlineExportXLSX()
ScDocShellRef xShell = loadDoc(u"outline.", FORMAT_ODS);
CPPUNIT_ASSERT(xShell.is());
- std::shared_ptr<utl::TempFile> pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
- xmlDocUniquePtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+ xmlDocUniquePtr pSheet
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pSheet);
// Maximum Outline Row is 4 for this document
@@ -1383,10 +1493,12 @@ 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);
- xmlDocUniquePtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xOrigDocSh), FORMAT_XLSX);
+ xmlDocUniquePtr pSheet
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pSheet);
- assertXPath(pSheet, "/x:worksheet/x:sheetFormatPr", "zeroHeight", "true" );
+ assertXPath(pSheet, "/x:worksheet/x:sheetFormatPr", "zeroHeight", "true");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row", 0);
xOrigDocSh->DoClose();
@@ -1398,11 +1510,13 @@ void ScExportTest::testHiddenEmptyRowsXLSX()
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 = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+ xmlDocUniquePtr pSheet
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pSheet);
- assertXPath(pSheet, "/x:worksheet/x:sheetFormatPr", "zeroHeight", "false"
);
+ assertXPath(pSheet, "/x:worksheet/x:sheetFormatPr", "zeroHeight", "false");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "hidden", "true");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "hidden", "true");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "hidden", "true");
@@ -1417,8 +1531,10 @@ void ScExportTest::testLandscapeOrientationXLSX()
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 = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+ xmlDocUniquePtr pSheet
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pSheet);
// the usePrinterDefaults cannot be saved to allow opening sheets in
Landscape mode via MS Excel
@@ -1445,8 +1561,7 @@ void ScExportTest::testDataBarExportXLSX()
void ScExportTest::testMiscRowHeightExport()
{
- static const TestParam::RowData DfltRowData[] =
- {
+ static const TestParam::RowData DfltRowData[] = {
{ 0, 4, 0, 529, 0, false },
{ 5, 10, 0, 1058, 0, false },
{ 17, 20, 0, 1767, 0, false },
@@ -1455,8 +1570,7 @@ void ScExportTest::testMiscRowHeightExport()
{ 1048573, 1048575, 0, 529, 0, false },
};
- static const TestParam::RowData EmptyRepeatRowData[] =
- {
+ static const TestParam::RowData EmptyRepeatRowData[] = {
// rows 0-4, 5-10, 17-20 are all set at various
// heights, there is no content in the rows, there
// was a bug where only the first row ( of repeated rows )
@@ -1466,8 +1580,7 @@ void ScExportTest::testMiscRowHeightExport()
{ 17, 20, 0, 1767, 0, false },
};
- TestParam aTestValues[] =
- {
+ TestParam aTestValues[] = {
// Checks that some distributed ( non-empty ) heights remain set after
export (roundtrip)
// additionally there is effectively a default row height ( 5.29 mm ).
So we test the
// unset rows at the end of the document to ensure the effective xlsx
default height
@@ -1476,16 +1589,19 @@ void ScExportTest::testMiscRowHeightExport()
// Checks that some distributed ( non-empty ) heights remain set after
export (to xls)
{ "miscrowheights.", FORMAT_XLSX, FORMAT_XLS,
SAL_N_ELEMENTS(DfltRowData), DfltRowData },
// Checks that repreated rows ( of various heights ) remain set after
export ( to xlsx )
- { "miscemptyrepeatedrowheights.", FORMAT_ODS, FORMAT_XLSX,
SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
+ { "miscemptyrepeatedrowheights.", FORMAT_ODS, FORMAT_XLSX,
+ SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
// Checks that repreated rows ( of various heights ) remain set after
export ( to xls )
- { "miscemptyrepeatedrowheights.", FORMAT_ODS, FORMAT_XLS,
SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
+ { "miscemptyrepeatedrowheights.", FORMAT_ODS, FORMAT_XLS,
+ SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
};
- miscRowHeightsTest( aTestValues, SAL_N_ELEMENTS(aTestValues) );
+ miscRowHeightsTest(aTestValues, SAL_N_ELEMENTS(aTestValues));
}
-namespace {
-
-void setAttribute( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd, sal_uInt16 nType, Color nColor = COL_BLACK )
+namespace
+{
+void setAttribute(ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd,
+ sal_uInt16 nType, Color nColor = COL_BLACK)
{
ESelection aSel;
aSel.nStartPara = aSel.nEndPara = nPara;
@@ -1537,12 +1653,12 @@ void setAttribute( ScFieldEditEngine& rEE, sal_Int32
nPara, sal_Int32 nStart, sa
rEE.QuickSetAttribs(aItemSet, aSel);
}
break;
- default:
- ;
+ default:;
}
}
-void setFont( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd, const OUString& rFontName )
+void setFont(ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd,
+ const OUString& rFontName)
{
ESelection aSel;
aSel.nStartPara = aSel.nEndPara = nPara;
@@ -1550,12 +1666,14 @@ void setFont( ScFieldEditEngine& rEE, sal_Int32 nPara,
sal_Int32 nStart, sal_Int
aSel.nEndPos = nEnd;
SfxItemSet aItemSet = rEE.GetEmptyItemSet();
- SvxFontItem aItem(FAMILY_MODERN, rFontName, "", PITCH_VARIABLE,
RTL_TEXTENCODING_UTF8, EE_CHAR_FONTINFO);
+ SvxFontItem aItem(FAMILY_MODERN, rFontName, "", PITCH_VARIABLE,
RTL_TEXTENCODING_UTF8,
+ EE_CHAR_FONTINFO);
aItemSet.Put(aItem);
rEE.QuickSetAttribs(aItemSet, aSel);
}
-void setEscapement( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd, short nEsc, sal_uInt8 nRelSize )
+void setEscapement(ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart,
sal_Int32 nEnd,
+ short nEsc, sal_uInt8 nRelSize)
{
ESelection aSel;
aSel.nStartPara = aSel.nEndPara = nPara;
@@ -1567,7 +1685,6 @@ void setEscapement( ScFieldEditEngine& rEE, sal_Int32
nPara, sal_Int32 nStart, s
aItemSet.Put(aItem);
rEE.QuickSetAttribs(aItemSet, aSel);
}
-
}
void ScExportTest::testNamedRangeBugfdo62729()
@@ -1603,20 +1720,45 @@ void ScExportTest::testBuiltinRangesXLSX()
CPPUNIT_ASSERT(xDocSh.is());
xShell->DoClose();
- xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh,
m_xSFactory, "xl/workbook.xml", FORMAT_XLSX);
+ xmlDocUniquePtr pDoc
+ = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/workbook.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
//assert the existing OOXML built-in names are still there
- assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='0']",
"'Sheet1 Test'!$A$1:$A$5");
- assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='1']",
"'Sheet2 Test'!$K$10:$K$14");
- assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='0']",
"'Sheet1 Test'!$A$1:$A$5");
- assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='1']",
"'Sheet2 Test'!$K$10:$M$18");
+ assertXPathContent(pDoc,
+ "/x:workbook/x:definedNames/"
+
"x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='0']",
+ "'Sheet1 Test'!$A$1:$A$5");
+ assertXPathContent(pDoc,
+ "/x:workbook/x:definedNames/"
+
"x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='1']",
+ "'Sheet2 Test'!$K$10:$K$14");
+ assertXPathContent(
+ pDoc,
+
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='0']",
+ "'Sheet1 Test'!$A$1:$A$5");
+ assertXPathContent(
+ pDoc,
+
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='1']",
+ "'Sheet2 Test'!$K$10:$M$18");
//...and that no extra ones are added (see tdf#112571)
- assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='0']",
0);
- assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='1']",
0);
- assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='0']",
0);
- assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='1']",
0);
+ assertXPath(pDoc,
+ "/x:workbook/x:definedNames/"
+
"x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='0']",
+ 0);
+ assertXPath(pDoc,
+ "/x:workbook/x:definedNames/"
+
"x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='1']",
+ 0);
+ assertXPath(
+ pDoc,
+
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='0']",
+ 0);
+ assertXPath(
+ pDoc,
+
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='1']",
+ 0);
xDocSh->DoClose();
}
@@ -1627,62 +1769,83 @@ void ScExportTest::testRichTextExportODS()
{
static bool isBold(const editeng::Section& rAttr)
{
- return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(), [](const SfxPoolItem* p) {
- return p->Which() == EE_CHAR_WEIGHT &&
- static_cast<const SvxWeightItem*>(p)->GetWeight() ==
WEIGHT_BOLD; });
+ return std::any_of(
+ rAttr.maAttributes.begin(), rAttr.maAttributes.end(), [](const
SfxPoolItem* p) {
+ return p->Which() == EE_CHAR_WEIGHT
+ && static_cast<const
SvxWeightItem*>(p)->GetWeight() == WEIGHT_BOLD;
+ });
}
static bool isItalic(const editeng::Section& rAttr)
{
- return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(), [](const SfxPoolItem* p) {
- return p->Which() == EE_CHAR_ITALIC &&
- static_cast<const SvxPostureItem*>(p)->GetPosture() ==
ITALIC_NORMAL; });
+ return std::any_of(
+ rAttr.maAttributes.begin(), rAttr.maAttributes.end(), [](const
SfxPoolItem* p) {
+ return p->Which() == EE_CHAR_ITALIC
+ && static_cast<const
SvxPostureItem*>(p)->GetPosture() == ITALIC_NORMAL;
+ });
}
static bool isStrikeOut(const editeng::Section& rAttr)
{
- return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(), [](const SfxPoolItem* p) {
- return p->Which() == EE_CHAR_STRIKEOUT &&
- static_cast<const SvxCrossedOutItem*>(p)->GetStrikeout()
== STRIKEOUT_SINGLE; });
+ return std::any_of(
+ rAttr.maAttributes.begin(), rAttr.maAttributes.end(), [](const
SfxPoolItem* p) {
+ return p->Which() == EE_CHAR_STRIKEOUT
+ && static_cast<const
SvxCrossedOutItem*>(p)->GetStrikeout()
+ == STRIKEOUT_SINGLE;
+ });
}
static bool isOverline(const editeng::Section& rAttr, FontLineStyle
eStyle)
{
- return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(), [&eStyle](const SfxPoolItem* p) {
- return p->Which() == EE_CHAR_OVERLINE &&
- static_cast<const SvxOverlineItem*>(p)->GetLineStyle() ==
eStyle; });
+ return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(),
+ [&eStyle](const SfxPoolItem* p) {
+ return p->Which() == EE_CHAR_OVERLINE
+ && static_cast<const
SvxOverlineItem*>(p)->GetLineStyle()
+ == eStyle;
+ });
}
static bool isUnderline(const editeng::Section& rAttr, FontLineStyle
eStyle)
{
- return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(), [&eStyle](const SfxPoolItem* p) {
- return p->Which() == EE_CHAR_UNDERLINE &&
- static_cast<const SvxUnderlineItem*>(p)->GetLineStyle() ==
eStyle; });
+ return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(),
+ [&eStyle](const SfxPoolItem* p) {
+ return p->Which() == EE_CHAR_UNDERLINE
+ && static_cast<const
SvxUnderlineItem*>(p)->GetLineStyle()
+ == eStyle;
+ });
}
static bool isFont(const editeng::Section& rAttr, const OUString&
rFontName)
{
- return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(), [&rFontName](const SfxPoolItem* p) {
- return p->Which() == EE_CHAR_FONTINFO &&
- static_cast<const SvxFontItem*>(p)->GetFamilyName() ==
rFontName; });
+ return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(),
+ [&rFontName](const SfxPoolItem* p) {
+ return p->Which() == EE_CHAR_FONTINFO
+ && static_cast<const
SvxFontItem*>(p)->GetFamilyName()
+ == rFontName;
+ });
}
static bool isEscapement(const editeng::Section& rAttr, short nEsc,
sal_uInt8 nRelSize)
{
return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(),
- [&nEsc, &nRelSize](const SfxPoolItem* p) {
- if (p->Which() != EE_CHAR_ESCAPEMENT)
- return false;
- const SvxEscapementItem* pItem = static_cast<const
SvxEscapementItem*>(p);
- return ((pItem->GetEsc() == nEsc) &&
(pItem->GetProportionalHeight() == nRelSize));
- });
+ [&nEsc, &nRelSize](const SfxPoolItem* p) {
+ if (p->Which() != EE_CHAR_ESCAPEMENT)
+ return false;
+ const SvxEscapementItem* pItem
+ = static_cast<const
SvxEscapementItem*>(p);
+ return ((pItem->GetEsc() == nEsc)
+ && (pItem->GetProportionalHeight()
== nRelSize));
+ });
}
static bool isColor(const editeng::Section& rAttr, Color nColor)
{
- return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(), [&nColor](const SfxPoolItem* p) {
- return p->Which() == EE_CHAR_COLOR &&
- static_cast<const SvxColorItem*>(p)->GetValue() == nColor;
});
+ return std::any_of(rAttr.maAttributes.begin(),
rAttr.maAttributes.end(),
+ [&nColor](const SfxPoolItem* p) {
+ return p->Which() == EE_CHAR_COLOR
+ && static_cast<const
SvxColorItem*>(p)->GetValue()
+ == nColor;
+ });
}
bool checkB2(const EditTextObject* pText) const
@@ -1703,7 +1866,7 @@ void ScExportTest::testRichTextExportODS()
// Check the first bold section.
const editeng::Section* pAttr = aSecAttrs.data();
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 0 || pAttr->mnEnd
!= 4)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 0 || pAttr->mnEnd
!= 4)
return false;
if (pAttr->maAttributes.size() != 1 || !isBold(*pAttr))
@@ -1711,7 +1874,7 @@ void ScExportTest::testRichTextExportODS()
// The middle section should be unformatted.
pAttr = &aSecAttrs[1];
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 4 || pAttr->mnEnd
!= 9)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 4 || pAttr->mnEnd
!= 9)
return false;
if (!pAttr->maAttributes.empty())
@@ -1719,7 +1882,7 @@ void ScExportTest::testRichTextExportODS()
// The last section should be italic.
pAttr = &aSecAttrs[2];
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 9 || pAttr->mnEnd
!= 15)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 9 || pAttr->mnEnd
!= 15)
return false;
if (pAttr->maAttributes.size() != 1 || !isItalic(*pAttr))
@@ -1795,7 +1958,7 @@ void ScExportTest::testRichTextExportODS()
// Check the first strike-out section.
const editeng::Section* pAttr = aSecAttrs.data();
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 0 || pAttr->mnEnd
!= 6)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 0 || pAttr->mnEnd
!= 6)
return false;
if (pAttr->maAttributes.size() != 1 || !isStrikeOut(*pAttr))
@@ -1824,7 +1987,7 @@ void ScExportTest::testRichTextExportODS()
// First section should have "Courier" font applied.
const editeng::Section* pAttr = aSecAttrs.data();
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 0 || pAttr->mnEnd
!= 5)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 0 || pAttr->mnEnd
!= 5)
return false;
if (pAttr->maAttributes.size() != 1 || !isFont(*pAttr, "Courier"))
@@ -1832,7 +1995,7 @@ void ScExportTest::testRichTextExportODS()
// Last section should have "Luxi Mono" applied.
pAttr = &aSecAttrs[2];
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 10 || pAttr->mnEnd
!= 15)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 10 ||
pAttr->mnEnd != 15)
return false;
if (pAttr->maAttributes.size() != 1 || !isFont(*pAttr, "Luxi
Mono"))
@@ -1859,7 +2022,7 @@ void ScExportTest::testRichTextExportODS()
// First section shoul have overline applied.
const editeng::Section* pAttr = aSecAttrs.data();
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 0 || pAttr->mnEnd
!= 4)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 0 || pAttr->mnEnd
!= 4)
return false;
if (pAttr->maAttributes.size() != 1 || !isOverline(*pAttr,
LINESTYLE_DOUBLE))
@@ -1867,7 +2030,7 @@ void ScExportTest::testRichTextExportODS()
// Last section should have underline applied.
pAttr = &aSecAttrs[2];
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 9 || pAttr->mnEnd
!= 14)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 9 || pAttr->mnEnd
!= 14)
return false;
if (pAttr->maAttributes.size() != 1 || !isUnderline(*pAttr,
LINESTYLE_DOUBLE))
@@ -1894,7 +2057,7 @@ void ScExportTest::testRichTextExportODS()
// superscript
const editeng::Section* pAttr = aSecAttrs.data();
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 0 || pAttr->mnEnd
!= 3)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 0 || pAttr->mnEnd
!= 3)
return false;
if (pAttr->maAttributes.size() != 1 || !isEscapement(*pAttr, 32,
64))
@@ -1902,7 +2065,7 @@ void ScExportTest::testRichTextExportODS()
// subscript
pAttr = &aSecAttrs[2];
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 8 || pAttr->mnEnd
!= 13)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 8 || pAttr->mnEnd
!= 13)
return false;
if (pAttr->maAttributes.size() != 1 || !isEscapement(*pAttr, -32,
66))
@@ -1929,7 +2092,7 @@ void ScExportTest::testRichTextExportODS()
// auto color
const editeng::Section* pAttr = &aSecAttrs[1];
- if (pAttr->mnParagraph != 0 ||pAttr->mnStart != 5 || pAttr->mnEnd
!= 9)
+ if (pAttr->mnParagraph != 0 || pAttr->mnStart != 5 || pAttr->mnEnd
!= 9)
return false;
if (pAttr->maAttributes.size() != 1 || !isColor(*pAttr, COL_AUTO))
@@ -1946,7 +2109,8 @@ void ScExportTest::testRichTextExportODS()
const EditTextObject* pEditText;
{
ScDocument& rDoc = xOrigDocSh->GetDocument();
- CPPUNIT_ASSERT_MESSAGE("This document should at least have one
sheet.", rDoc.GetTableCount() > 0);
+ CPPUNIT_ASSERT_MESSAGE("This document should at least have one sheet.",
+ rDoc.GetTableCount() > 0);
// Insert an edit text cell.
ScFieldEditEngine* pEE = &rDoc.GetEditEngine();
@@ -1959,8 +2123,8 @@ void ScExportTest::testRichTextExportODS()
aSel.nStartPara = aSel.nEndPara = 0;
// Set this edit text to cell B2.
- rDoc.SetEditText(ScAddress(1,1,0), pEE->CreateTextObject());
- pEditText = rDoc.GetEditText(ScAddress(1,1,0));
+ rDoc.SetEditText(ScAddress(1, 1, 0), pEE->CreateTextObject());
+ pEditText = rDoc.GetEditText(ScAddress(1, 1, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B2 value.",
aCheckFunc.checkB2(pEditText));
}
@@ -1970,7 +2134,8 @@ void ScExportTest::testRichTextExportODS()
xOrigDocSh->DoClose();
CPPUNIT_ASSERT(xNewDocSh.is());
ScDocument& rDoc2 = xNewDocSh->GetDocument();
- CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one
sheet.", rDoc2.GetTableCount() > 0);
+ CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one
sheet.",
+ rDoc2.GetTableCount() > 0);
ScFieldEditEngine* pEE = &rDoc2.GetEditEngine();
// Make sure the content of B2 is still intact.
@@ -1979,8 +2144,8 @@ void ScExportTest::testRichTextExportODS()
// Insert a multi-line content to B4.
pEE->Clear();
pEE->SetTextCurrentDefaults("One\nTwo\nThree");
- rDoc2.SetEditText(ScAddress(1,3,0), pEE->CreateTextObject());
- pEditText = rDoc2.GetEditText(ScAddress(1,3,0));
+ rDoc2.SetEditText(ScAddress(1, 3, 0), pEE->CreateTextObject());
+ pEditText = rDoc2.GetEditText(ScAddress(1, 3, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B4 value.",
aCheckFunc.checkB4(pEditText));
}
@@ -1991,16 +2156,16 @@ void ScExportTest::testRichTextExportODS()
ScFieldEditEngine* pEE = &rDoc3.GetEditEngine();
xNewDocSh->DoClose();
- pEditText = rDoc3.GetEditText(ScAddress(1,1,0));
+ pEditText = rDoc3.GetEditText(ScAddress(1, 1, 0));
CPPUNIT_ASSERT_MESSAGE("B2 should be an edit text.", pEditText);
- pEditText = rDoc3.GetEditText(ScAddress(1,3,0));
+ pEditText = rDoc3.GetEditText(ScAddress(1, 3, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B4 value.",
aCheckFunc.checkB4(pEditText));
// Insert a multi-line content to B5, but this time, set some empty
paragraphs.
pEE->Clear();
pEE->SetTextCurrentDefaults("\nTwo\nThree\n\nFive\n");
- rDoc3.SetEditText(ScAddress(1,4,0), pEE->CreateTextObject());
- pEditText = rDoc3.GetEditText(ScAddress(1,4,0));
+ rDoc3.SetEditText(ScAddress(1, 4, 0), pEE->CreateTextObject());
+ pEditText = rDoc3.GetEditText(ScAddress(1, 4, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B5 value.",
aCheckFunc.checkB5(pEditText));
// Insert a text with strikethrough in B6.
@@ -2008,8 +2173,8 @@ void ScExportTest::testRichTextExportODS()
pEE->SetTextCurrentDefaults("Strike Me");
// Set the 'Strike' part strikethrough.
setAttribute(*pEE, 0, 0, 6, EE_CHAR_STRIKEOUT);
- rDoc3.SetEditText(ScAddress(1,5,0), pEE->CreateTextObject());
- pEditText = rDoc3.GetEditText(ScAddress(1,5,0));
+ rDoc3.SetEditText(ScAddress(1, 5, 0), pEE->CreateTextObject());
+ pEditText = rDoc3.GetEditText(ScAddress(1, 5, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B6 value.",
aCheckFunc.checkB6(pEditText));
// Insert a text with different font segments in B7.
@@ -2017,8 +2182,8 @@ void ScExportTest::testRichTextExportODS()
pEE->SetTextCurrentDefaults("Font1 and Font2");
setFont(*pEE, 0, 0, 5, "Courier");
setFont(*pEE, 0, 10, 15, "Luxi Mono");
- rDoc3.SetEditText(ScAddress(1,6,0), pEE->CreateTextObject());
- pEditText = rDoc3.GetEditText(ScAddress(1,6,0));
+ rDoc3.SetEditText(ScAddress(1, 6, 0), pEE->CreateTextObject());
+ pEditText = rDoc3.GetEditText(ScAddress(1, 6, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B7 value.",
aCheckFunc.checkB7(pEditText));
// Insert a text with overline and underline in B8.
@@ -2026,16 +2191,16 @@ void ScExportTest::testRichTextExportODS()
pEE->SetTextCurrentDefaults("Over and Under");
setAttribute(*pEE, 0, 0, 4, EE_CHAR_OVERLINE);
setAttribute(*pEE, 0, 9, 14, EE_CHAR_UNDERLINE);
- rDoc3.SetEditText(ScAddress(1,7,0), pEE->CreateTextObject());
- pEditText = rDoc3.GetEditText(ScAddress(1,7,0));
+ rDoc3.SetEditText(ScAddress(1, 7, 0), pEE->CreateTextObject());
+ pEditText = rDoc3.GetEditText(ScAddress(1, 7, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B8 value.",
aCheckFunc.checkB8(pEditText));
pEE->Clear();
pEE->SetTextCurrentDefaults("Sub and Super");
setEscapement(*pEE, 0, 0, 3, 32, 64);
setEscapement(*pEE, 0, 8, 13, -32, 66);
- rDoc3.SetEditText(ScAddress(1,8,0), pEE->CreateTextObject());
- pEditText = rDoc3.GetEditText(ScAddress(1,8,0));
+ rDoc3.SetEditText(ScAddress(1, 8, 0), pEE->CreateTextObject());
+ pEditText = rDoc3.GetEditText(ScAddress(1, 8, 0));
CPPUNIT_ASSERT_MESSAGE("Incorrect B9 value.",
aCheckFunc.checkB9(pEditText));
ScPatternAttr aCellFontColor(rDoc3.GetPool());
@@ -2056,20 +2221,27 @@ void ScExportTest::testRichTextExportODS()
ScDocument& rDoc4 = xNewDocSh3->GetDocument();
xNewDocSh2->DoClose();
- pEditText = rDoc4.GetEditText(ScAddress(1,1,0));
- CPPUNIT_ASSERT_MESSAGE("Incorrect B2 value after save and reload.",
aCheckFunc.checkB2(pEditText));
- pEditText = rDoc4.GetEditText(ScAddress(1,3,0));
- CPPUNIT_ASSERT_MESSAGE("Incorrect B4 value after save and reload.",
aCheckFunc.checkB4(pEditText));
- pEditText = rDoc4.GetEditText(ScAddress(1,4,0));
- CPPUNIT_ASSERT_MESSAGE("Incorrect B5 value after save and reload.",
aCheckFunc.checkB5(pEditText));
- pEditText = rDoc4.GetEditText(ScAddress(1,5,0));
- CPPUNIT_ASSERT_MESSAGE("Incorrect B6 value after save and reload.",
aCheckFunc.checkB6(pEditText));
- pEditText = rDoc4.GetEditText(ScAddress(1,6,0));
- CPPUNIT_ASSERT_MESSAGE("Incorrect B7 value after save and reload.",
aCheckFunc.checkB7(pEditText));
- pEditText = rDoc4.GetEditText(ScAddress(1,7,0));
- CPPUNIT_ASSERT_MESSAGE("Incorrect B8 value after save and reload.",
aCheckFunc.checkB8(pEditText));
- pEditText = rDoc4.GetEditText(ScAddress(1,9,0));
- CPPUNIT_ASSERT_MESSAGE("Incorrect B10 value after save and reload.",
aCheckFunc.checkB10(pEditText));
+ pEditText = rDoc4.GetEditText(ScAddress(1, 1, 0));
+ CPPUNIT_ASSERT_MESSAGE("Incorrect B2 value after save and reload.",
+ aCheckFunc.checkB2(pEditText));
+ pEditText = rDoc4.GetEditText(ScAddress(1, 3, 0));
+ CPPUNIT_ASSERT_MESSAGE("Incorrect B4 value after save and reload.",
+ aCheckFunc.checkB4(pEditText));
+ pEditText = rDoc4.GetEditText(ScAddress(1, 4, 0));
+ CPPUNIT_ASSERT_MESSAGE("Incorrect B5 value after save and reload.",
+ aCheckFunc.checkB5(pEditText));
+ pEditText = rDoc4.GetEditText(ScAddress(1, 5, 0));
+ CPPUNIT_ASSERT_MESSAGE("Incorrect B6 value after save and reload.",
+ aCheckFunc.checkB6(pEditText));
+ pEditText = rDoc4.GetEditText(ScAddress(1, 6, 0));
+ CPPUNIT_ASSERT_MESSAGE("Incorrect B7 value after save and reload.",
+ aCheckFunc.checkB7(pEditText));
+ pEditText = rDoc4.GetEditText(ScAddress(1, 7, 0));
+ CPPUNIT_ASSERT_MESSAGE("Incorrect B8 value after save and reload.",
+ aCheckFunc.checkB8(pEditText));
+ pEditText = rDoc4.GetEditText(ScAddress(1, 9, 0));
+ CPPUNIT_ASSERT_MESSAGE("Incorrect B10 value after save and reload.",
+ aCheckFunc.checkB10(pEditText));
xNewDocSh3->DoClose();
}
@@ -2079,8 +2251,10 @@ 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 = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+ std::shared_ptr<utl::TempFile> pXPathFile
+ = ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+ xmlDocUniquePtr pSheet
+ = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
CPPUNIT_ASSERT(pSheet);
// make sure the only cell in this doc is assigned some formatting record
@@ -2090,15 +2264,15 @@ void ScExportTest::testRichTextCellFormatXLSX()
xmlDocUniquePtr pStyles = XPathHelper::parseExport(pXPathFile,
m_xSFactory, "xl/styles.xml");
CPPUNIT_ASSERT(pStyles);
- OString nFormatIdx = OString::number( aCellFormat.toInt32() + 1 );
- const OString aXPath1( "/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx +
"]/x:alignment" );
+ OString nFormatIdx = OString::number(aCellFormat.toInt32() + 1);
+ const OString aXPath1("/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx +
"]/x:alignment");
// formatting record is set to wrap text
assertXPath(pStyles, aXPath1, "wrapText", "true");
// see what font it references
- const OString aXPath2( "/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx +"]" );
+ const OString aXPath2("/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx + "]");
OUString aFontId = getXPath(pStyles, aXPath2, "fontId");
- OString nFontIdx = OString::number( aFontId.toInt32() + 1 );
+ OString nFontIdx = OString::number(aFontId.toInt32() + 1);
// that font should be bold
const OString aXPath3("/x:styleSheet/x:fonts/x:font[" + nFontIdx +
"]/x:b");
@@ -2114,9 +2288,9 @@ void ScExportTest::testFormulaRefSheetNameODS()
ScDocument& rDoc = xDocSh->GetDocument();
sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn on auto calc.
- rDoc.SetString(ScAddress(1,1,0), "='90''s Data'.B2");
- CPPUNIT_ASSERT_EQUAL(1.1, rDoc.GetValue(ScAddress(1,1,0)));
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(1,1,0), "'90''s Data'.B2", "Wrong
formula");
+ rDoc.SetString(ScAddress(1, 1, 0), "='90''s Data'.B2");
+ CPPUNIT_ASSERT_EQUAL(1.1, rDoc.GetValue(ScAddress(1, 1, 0)));
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(1, 1, 0), "'90''s Data'.B2",
"Wrong formula");
}
// Now, save and reload this document.
ScDocShellRef xNewDocSh = saveAndReload(xDocSh.get(), FORMAT_ODS);
@@ -2124,8 +2298,8 @@ void ScExportTest::testFormulaRefSheetNameODS()
ScDocument& rDoc = xNewDocSh->GetDocument();
rDoc.CalcAll();
- CPPUNIT_ASSERT_EQUAL(1.1, rDoc.GetValue(ScAddress(1,1,0)));
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(1,1,0), "'90''s Data'.B2", "Wrong
formula");
+ CPPUNIT_ASSERT_EQUAL(1.1, rDoc.GetValue(ScAddress(1, 1, 0)));
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(1, 1, 0), "'90''s Data'.B2", "Wrong
formula");
xNewDocSh->DoClose();
}
@@ -2136,67 +2310,69 @@ void ScExportTest::testCellValuesExportODS()
ScDocShellRef xOrigDocSh = loadDoc(u"empty.", FORMAT_ODS);
{
ScDocument& rDoc = xOrigDocSh->GetDocument();
- CPPUNIT_ASSERT_MESSAGE("This document should at least have one
sheet.", rDoc.GetTableCount() > 0);
+ CPPUNIT_ASSERT_MESSAGE("This document should at least have one sheet.",
+ rDoc.GetTableCount() > 0);
// set a value double
- rDoc.SetValue(ScAddress(0,0,0), 2.0); // A1
+ rDoc.SetValue(ScAddress(0, 0, 0), 2.0); // A1
// set a formula
- rDoc.SetValue(ScAddress(2,0,0), 3.0); // C1
- rDoc.SetValue(ScAddress(3,0,0), 3); // D1
- rDoc.SetString(ScAddress(4,0,0), "=10*C1/4"); // E1
- rDoc.SetValue(ScAddress(5,0,0), 3.0); // F1
- rDoc.SetString(ScAddress(7,0,0), "=SUM(C1:F1)"); //H1
+ rDoc.SetValue(ScAddress(2, 0, 0), 3.0); // C1
+ rDoc.SetValue(ScAddress(3, 0, 0), 3); // D1
+ rDoc.SetString(ScAddress(4, 0, 0), "=10*C1/4"); // E1
+ rDoc.SetValue(ScAddress(5, 0, 0), 3.0); // F1
+ rDoc.SetString(ScAddress(7, 0, 0), "=SUM(C1:F1)"); //H1
// set a string
- rDoc.SetString(ScAddress(0,2,0), "a simple line"); //A3
+ rDoc.SetString(ScAddress(0, 2, 0), "a simple line"); //A3
// set a digit string
- rDoc.SetString(ScAddress(0,4,0), "'12"); //A5
+ rDoc.SetString(ScAddress(0, 4, 0), "'12"); //A5
// set a contiguous value
- rDoc.SetValue(ScAddress(0,5,0), 12.0); //A6
+ rDoc.SetValue(ScAddress(0, 5, 0), 12.0); //A6
// set a contiguous string
- rDoc.SetString(ScAddress(0,6,0), "a string"); //A7
+ rDoc.SetString(ScAddress(0, 6, 0), "a string"); //A7
// set a contiguous formula
- rDoc.SetString(ScAddress(0,7,0), "=$A$6"); //A8
+ rDoc.SetString(ScAddress(0, 7, 0), "=$A$6"); //A8
}
// save and reload
ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_ODS);
xOrigDocSh->DoClose();
CPPUNIT_ASSERT(xNewDocSh.is());
ScDocument& rDoc = xNewDocSh->GetDocument();
- CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one
sheet.", rDoc.GetTableCount() > 0);
+ CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one sheet.",
+ rDoc.GetTableCount() > 0);
// check value
- CPPUNIT_ASSERT_EQUAL(2.0, rDoc.GetValue(0,0,0));
- CPPUNIT_ASSERT_EQUAL(3.0, rDoc.GetValue(2,0,0));
- CPPUNIT_ASSERT_EQUAL(3.0, rDoc.GetValue(3,0,0));
- CPPUNIT_ASSERT_EQUAL(7.5, rDoc.GetValue(4,0,0));
- CPPUNIT_ASSERT_EQUAL(3.0, rDoc.GetValue(5,0,0));
+ CPPUNIT_ASSERT_EQUAL(2.0, rDoc.GetValue(0, 0, 0));
+ CPPUNIT_ASSERT_EQUAL(3.0, rDoc.GetValue(2, 0, 0));
+ CPPUNIT_ASSERT_EQUAL(3.0, rDoc.GetValue(3, 0, 0));
+ CPPUNIT_ASSERT_EQUAL(7.5, rDoc.GetValue(4, 0, 0));
+ CPPUNIT_ASSERT_EQUAL(3.0, rDoc.GetValue(5, 0, 0));
// check formula
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(4,0,0), "10*C1/4", "Wrong formula
=10*C1/4");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(7,0,0), "SUM(C1:F1)", "Wrong formula
=SUM(C1:F1)");
- CPPUNIT_ASSERT_EQUAL(16.5, rDoc.GetValue(7,0,0));
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(4, 0, 0), "10*C1/4", "Wrong formula
=10*C1/4");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(7, 0, 0), "SUM(C1:F1)", "Wrong
formula =SUM(C1:F1)");
+ CPPUNIT_ASSERT_EQUAL(16.5, rDoc.GetValue(7, 0, 0));
// check string
ScRefCellValue aCell;
- aCell.assign(rDoc, ScAddress(0,2,0));
- CPPUNIT_ASSERT_EQUAL( CELLTYPE_STRING, aCell.meType );
+ aCell.assign(rDoc, ScAddress(0, 2, 0));
+ CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, aCell.meType);
// check for an empty cell
- aCell.assign(rDoc, ScAddress(0,3,0));
- CPPUNIT_ASSERT_EQUAL( CELLTYPE_NONE, aCell.meType);
+ aCell.assign(rDoc, ScAddress(0, 3, 0));
+ CPPUNIT_ASSERT_EQUAL(CELLTYPE_NONE, aCell.meType);
// check a digit string
- aCell.assign(rDoc, ScAddress(0,4,0));
- CPPUNIT_ASSERT_EQUAL( CELLTYPE_STRING, aCell.meType);
+ aCell.assign(rDoc, ScAddress(0, 4, 0));
+ CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, aCell.meType);
//check contiguous values
- CPPUNIT_ASSERT_EQUAL( 12.0, rDoc.GetValue(0,5,0) );
- CPPUNIT_ASSERT_EQUAL( OUString("a string"), rDoc.GetString(0,6,0) );
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(0,7,0), "$A$6", "Wrong formula
=$A$6");
- CPPUNIT_ASSERT_EQUAL( rDoc.GetValue(0,5,0), rDoc.GetValue(0,7,0) );
+ CPPUNIT_ASSERT_EQUAL(12.0, rDoc.GetValue(0, 5, 0));
+ CPPUNIT_ASSERT_EQUAL(OUString("a string"), rDoc.GetString(0, 6, 0));
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(0, 7, 0), "$A$6", "Wrong formula
=$A$6");
+ CPPUNIT_ASSERT_EQUAL(rDoc.GetValue(0, 5, 0), rDoc.GetValue(0, 7, 0));
xNewDocSh->DoClose();
}
@@ -2204,7 +2380,7 @@ void ScExportTest::testCellValuesExportODS()
void ScExportTest::testCellNoteExportODS()
{
ScDocShellRef xOrigDocSh = loadDoc(u"single-note.", FORMAT_ODS);
- ScAddress aPos(0,0,0); // Start with A1.
+ ScAddress aPos(0, 0, 0); // Start with A1.
{
ScDocument& rDoc = xOrigDocSh->GetDocument();
@@ -2236,20 +2412,21 @@ void ScExportTest::testCellNoteExportXLS()
ScDocShellRef xOrigDocSh = loadDoc(u"notes-on-3-sheets.", FORMAT_ODS);
{
ScDocument& rDoc = xOrigDocSh->GetDocument();
- CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.",
SCTAB(3), rDoc.GetTableCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.",
SCTAB(3),
+ rDoc.GetTableCount());
// Check note's presence.
- CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,0,0)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,1,0)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,2,0)));
+ CPPUNIT_ASSERT(rDoc.HasNote(ScAddress(0, 0, 0)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 1, 0)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 2, 0)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,0,1)));
- CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,1,1)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,2,1)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 0, 1)));
+ CPPUNIT_ASSERT(rDoc.HasNote(ScAddress(0, 1, 1)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 2, 1)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,0,2)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,1,2)));
- CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,2,2)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 0, 2)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 1, 2)));
+ CPPUNIT_ASSERT(rDoc.HasNote(ScAddress(0, 2, 2)));
}
// save and reload as XLS.
ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_XLS);
@@ -2257,27 +2434,28 @@ void ScExportTest::testCellNoteExportXLS()
xOrigDocSh->DoClose();
CPPUNIT_ASSERT(xNewDocSh.is());
ScDocument& rDoc = xNewDocSh->GetDocument();
- CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.",
SCTAB(3), rDoc.GetTableCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.",
SCTAB(3),
+ rDoc.GetTableCount());
// Check note's presence again.
- CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,0,0)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,1,0)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,2,0)));
+ CPPUNIT_ASSERT(rDoc.HasNote(ScAddress(0, 0, 0)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 1, 0)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 2, 0)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,0,1)));
- CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,1,1)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,2,1)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 0, 1)));
+ CPPUNIT_ASSERT(rDoc.HasNote(ScAddress(0, 1, 1)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 2, 1)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,0,2)));
- CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0,1,2)));
- CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,2,2)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 0, 2)));
+ CPPUNIT_ASSERT(!rDoc.HasNote(ScAddress(0, 1, 2)));
+ CPPUNIT_ASSERT(rDoc.HasNote(ScAddress(0, 2, 2)));
xNewDocSh->DoClose();
}
}
-namespace {
-
+namespace
+{
void checkMatrixRange(ScDocument& rDoc, const ScRange& rRange)
{
ScRange aMatRange;
@@ -2299,7 +2477,6 @@ void checkMatrixRange(ScDocument& rDoc, const ScRange&
rRange)
}
}
}
-
}
void ScExportTest::testInlineArrayXLS()
@@ -2314,13 +2491,13 @@ void ScExportTest::testInlineArrayXLS()
ScDocument& rDoc = xDocSh->GetDocument();
// B2:C3 contains a matrix.
- checkMatrixRange(rDoc, ScRange(1,1,0,2,2,0));
+ checkMatrixRange(rDoc, ScRange(1, 1, 0, 2, 2, 0));
// B5:D6 contains a matrix.
- checkMatrixRange(rDoc, ScRange(1,4,0,3,5,0));
+ checkMatrixRange(rDoc, ScRange(1, 4, 0, 3, 5, 0));
// B8:C10 as well.
- checkMatrixRange(rDoc, ScRange(1,7,0,2,9,0));
+ checkMatrixRange(rDoc, ScRange(1, 7, 0, 2, 9, 0));
xDocSh->DoClose();
}
@@ -2331,14 +2508,15 @@ void ScExportTest::testEmbeddedChartODS()
CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pTempFile(
- ScBootstrapFixture::exportTo(xShell.get(), FORMAT_ODS));
+ ScBootstrapFixture::exportTo(xShell.get(), FORMAT_ODS));
xmlDocUniquePtr pDoc = XPathHelper::parseExport(pTempFile, m_xSFactory,
"content.xml");
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc,
-
"/office:document-content/office:body/office:spreadsheet/table:table[2]/table:table-row[7]/table:table-cell[2]/draw:frame/draw:object",
- "notify-on-update-of-ranges",
- "Chart1.B3:Chart1.B5 Chart1.C2:Chart1.C2 Chart1.C3:Chart1.C5");
+
"/office:document-content/office:body/office:spreadsheet/table:table[2]/"
+
"table:table-row[7]/table:table-cell[2]/draw:frame/draw:object",
+ "notify-on-update-of-ranges",
+ "Chart1.B3:Chart1.B5 Chart1.C2:Chart1.C2 Chart1.C3:Chart1.C5");
xShell->DoClose();
}
@@ -2363,9 +2541,9 @@ void ScExportTest::testEmbeddedChartXLS()
CPPUNIT_ASSERT_MESSAGE("Failed to retrieve a chart object from the 2nd
sheet.", pOleObj);
ScRangeList aRanges = getChartRanges(rDoc, *pOleObj);
- CPPUNIT_ASSERT_MESSAGE("Label range (B3:B5) not found.",
aRanges.In(ScRange(1,2,1,1,4,1)));
- CPPUNIT_ASSERT_MESSAGE("Data label (C2) not found.",
aRanges.In(ScAddress(2,1,1)));
- CPPUNIT_ASSERT_MESSAGE("Data range (C3:C5) not found.",
aRanges.In(ScRange(2,2,1,2,4,1)));
+ CPPUNIT_ASSERT_MESSAGE("Label range (B3:B5) not found.",
aRanges.In(ScRange(1, 2, 1, 1, 4, 1)));
+ CPPUNIT_ASSERT_MESSAGE("Data label (C2) not found.",
aRanges.In(ScAddress(2, 1, 1)));
+ CPPUNIT_ASSERT_MESSAGE("Data range (C3:C5) not found.",
aRanges.In(ScRange(2, 2, 1, 2, 4, 1)));
xDocSh->DoClose();
}
@@ -2385,15 +2563,14 @@ void ScExportTest::testCellAnchoredGroupXLS()
SdrPage* pPage = pDrawLayer->GetPage(0);
CPPUNIT_ASSERT_MESSAGE("draw page for sheet 1 should exist.", pPage);
const size_t nCount = pPage->GetObjCount();
- CPPUNIT_ASSERT_EQUAL_MESSAGE(
- "There should be 1 objects.", static_cast<size_t>(1), nCount);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be 1 objects.",
static_cast<size_t>(1), nCount);
SdrObject* pObj = pPage->GetObj(0);
CPPUNIT_ASSERT_MESSAGE("Failed to get drawing object.", pObj);
ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj);
CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.",
pData);
CPPUNIT_ASSERT_MESSAGE("Upper left of bounding rectangle should be
nonnegative.",
- pData->getShapeRect().Left() >= 0 || pData->getShapeRect().Top() >= 0);
+ pData->getShapeRect().Left() >= 0 ||
pData->getShapeRect().Top() >= 0);
xDocSh->DoClose();
}
@@ -2408,14 +2585,16 @@ void ScExportTest::testFormulaReferenceXLS()
ScDocument& rDoc = xDocSh->GetDocument();
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,1,0), "$A$2+$B$2+$C$2", "Wrong
formula in D2");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,2,0), "A3+B3+C3", "Wrong formula in
D3");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,5,0), "SUM($A$6:$C$6)", "Wrong
formula in D6");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,6,0), "SUM(A7:C7)", "Wrong formula
in D7");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,9,0),
"$Two.$A$2+$Two.$B$2+$Two.$C$2", "Wrong formula in D10");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,10,0), "$Two.A3+$Two.B3+$Two.C3",
"Wrong formula in D11");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,13,0), "MIN($Two.$A$2:$C$2)",
"Wrong formula in D14");
- ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3,14,0), "MAX($Two.A3:C3)", "Wrong
formula in D15");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 1, 0), "$A$2+$B$2+$C$2", "Wrong
formula in D2");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 2, 0), "A3+B3+C3", "Wrong formula
in D3");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 5, 0), "SUM($A$6:$C$6)", "Wrong
formula in D6");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 6, 0), "SUM(A7:C7)", "Wrong
formula in D7");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 9, 0),
"$Two.$A$2+$Two.$B$2+$Two.$C$2",
+ "Wrong formula in D10");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 10, 0), "$Two.A3+$Two.B3+$Two.C3",
+ "Wrong formula in D11");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 13, 0), "MIN($Two.$A$2:$C$2)",
"Wrong formula in D14");
+ ASSERT_FORMULA_EQUAL(rDoc, ScAddress(3, 14, 0), "MAX($Two.A3:C3)", "Wrong
formula in D15");
xDocSh->DoClose();
}
@@ -2439,8 +2618,8 @@ void ScExportTest::testSheetProtectionXLSX()
CPPUNIT_ASSERT_EQUAL(sal_uInt8(61), static_cast<sal_uInt8>(aHash[1]));
}
// we could flesh out this check I guess
- CPPUNIT_ASSERT ( !pTabProtect->isOptionEnabled( ScTableProtection::OBJECTS
) );
- CPPUNIT_ASSERT ( !pTabProtect->isOptionEnabled(
ScTableProtection::SCENARIOS ) );
+ CPPUNIT_ASSERT(!pTabProtect->isOptionEnabled(ScTableProtection::OBJECTS));
+
CPPUNIT_ASSERT(!pTabProtect->isOptionEnabled(ScTableProtection::SCENARIOS));
xDocSh->DoClose();
}
@@ -2455,34 +2634,39 @@ void ScExportTest::testSheetProtectionXLSB()
ScDocument& rDoc = xDocSh->GetDocument();
const ScTableProtection* pTabProtect = rDoc.GetTabProtection(0);
CPPUNIT_ASSERT(pTabProtect);
- CPPUNIT_ASSERT(pTabProtect->isOptionEnabled(
ScTableProtection::SELECT_UNLOCKED_CELLS ));
- CPPUNIT_ASSERT(!pTabProtect->isOptionEnabled(
ScTableProtection::SELECT_LOCKED_CELLS ));
+
CPPUNIT_ASSERT(pTabProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS));
+
CPPUNIT_ASSERT(!pTabProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS));
xDocSh->DoClose();
}
-namespace {
-
-const char* toBorderName( SvxBorderLineStyle eStyle )
+namespace
+{
+const char* toBorderName(SvxBorderLineStyle eStyle)
{
switch (eStyle)
{
- case SvxBorderLineStyle::SOLID: return "SOLID";
- case SvxBorderLineStyle::DOTTED: return "DOTTED";
- case SvxBorderLineStyle::DASHED: return "DASHED";
- case SvxBorderLineStyle::DASH_DOT: return "DASH_DOT";
- case SvxBorderLineStyle::DASH_DOT_DOT: return "DASH_DOT_DOT";
- case SvxBorderLineStyle::DOUBLE_THIN: return "DOUBLE_THIN";
- case SvxBorderLineStyle::FINE_DASHED: return "FINE_DASHED";
- default:
- ;
+ case SvxBorderLineStyle::SOLID:
+ return "SOLID";
+ case SvxBorderLineStyle::DOTTED:
+ return "DOTTED";
+ case SvxBorderLineStyle::DASHED:
+ return "DASHED";
+ case SvxBorderLineStyle::DASH_DOT:
+ return "DASH_DOT";
+ case SvxBorderLineStyle::DASH_DOT_DOT:
+ return "DASH_DOT_DOT";
+ case SvxBorderLineStyle::DOUBLE_THIN:
+ return "DOUBLE_THIN";
+ case SvxBorderLineStyle::FINE_DASHED:
+ return "FINE_DASHED";
+ default:;
}
return "";
}
-
}
-void ScExportTest::testExcelCellBorders( sal_uLong nFormatType )
+void ScExportTest::testExcelCellBorders(sal_uLong nFormatType)
{
static const struct
{
@@ -2490,18 +2674,18 @@ void ScExportTest::testExcelCellBorders( sal_uLong
nFormatType )
SvxBorderLineStyle mnStyle;
tools::Long mnWidth;
} aChecks[] = {
- { 1, SvxBorderLineStyle::SOLID, 1 }, // hair
- { 3, SvxBorderLineStyle::DOTTED, 15 }, // dotted
- { 5, SvxBorderLineStyle::DASH_DOT_DOT, 15 }, // dash dot dot
- { 7, SvxBorderLineStyle::DASH_DOT, 15 }, // dash dot
- { 9, SvxBorderLineStyle::FINE_DASHED, 15 }, // dashed
- { 11, SvxBorderLineStyle::SOLID, 15 }, // thin
+ { 1, SvxBorderLineStyle::SOLID, 1 }, // hair
+ { 3, SvxBorderLineStyle::DOTTED, 15 }, // dotted
+ { 5, SvxBorderLineStyle::DASH_DOT_DOT, 15 }, // dash dot dot
+ { 7, SvxBorderLineStyle::DASH_DOT, 15 }, // dash dot
+ { 9, SvxBorderLineStyle::FINE_DASHED, 15 }, // dashed
+ { 11, SvxBorderLineStyle::SOLID, 15 }, // thin
{ 13, SvxBorderLineStyle::DASH_DOT_DOT, 35 }, // medium dash dot dot
- { 17, SvxBorderLineStyle::DASH_DOT, 35 }, // medium dash dot
- { 19, SvxBorderLineStyle::DASHED, 35 }, // medium dashed
- { 21, SvxBorderLineStyle::SOLID, 35 }, // medium
- { 23, SvxBorderLineStyle::SOLID, 50 }, // thick
- { 25, SvxBorderLineStyle::DOUBLE_THIN, -1 }, // double (don't check
width)
+ { 17, SvxBorderLineStyle::DASH_DOT, 35 }, // medium dash dot
+ { 19, SvxBorderLineStyle::DASHED, 35 }, // medium dashed
+ { 21, SvxBorderLineStyle::SOLID, 35 }, // medium
+ { 23, SvxBorderLineStyle::SOLID, 50 }, // thick
+ { 25, SvxBorderLineStyle::DOUBLE_THIN, -1 }, // double (don't check
width)
};
ScDocShellRef xDocSh = loadDoc(u"cell-borders.", nFormatType);
@@ -2514,7 +2698,8 @@ void ScExportTest::testExcelCellBorders( sal_uLong
nFormatType )
const editeng::SvxBorderLine* pLine = nullptr;
rDoc.GetBorderLines(2, aChecks[i].mnRow, 0, nullptr, &pLine,
nullptr, nullptr);
CPPUNIT_ASSERT(pLine);
- CPPUNIT_ASSERT_EQUAL(toBorderName(aChecks[i].mnStyle),
toBorderName(pLine->GetBorderLineStyle()));
+ CPPUNIT_ASSERT_EQUAL(toBorderName(aChecks[i].mnStyle),
+ toBorderName(pLine->GetBorderLineStyle()));
if (aChecks[i].mnWidth >= 0)
CPPUNIT_ASSERT_EQUAL(aChecks[i].mnWidth, pLine->GetWidth());
}
@@ -2528,7 +2713,8 @@ void ScExportTest::testExcelCellBorders( sal_uLong
nFormatType )
const editeng::SvxBorderLine* pLine = nullptr;
rDoc.GetBorderLines(2, aChecks[i].mnRow, 0, nullptr, &pLine, nullptr,
nullptr);
CPPUNIT_ASSERT(pLine);
- CPPUNIT_ASSERT_EQUAL(toBorderName(aChecks[i].mnStyle),
toBorderName(pLine->GetBorderLineStyle()));
+ CPPUNIT_ASSERT_EQUAL(toBorderName(aChecks[i].mnStyle),
+ toBorderName(pLine->GetBorderLineStyle()));
if (aChecks[i].mnWidth >= 0)
CPPUNIT_ASSERT_EQUAL(aChecks[i].mnWidth, pLine->GetWidth());
}
@@ -2536,27 +2722,21 @@ void ScExportTest::testExcelCellBorders( sal_uLong
nFormatType )
xNewDocSh->DoClose();
}
-void ScExportTest::testCellBordersXLS()
-{
- testExcelCellBorders(FORMAT_XLS);
-}
+void ScExportTest::testCellBordersXLS() { testExcelCellBorders(FORMAT_XLS); }
-void ScExportTest::testCellBordersXLSX()
-{
- testExcelCellBorders(FORMAT_XLSX);
-}
+void ScExportTest::testCellBordersXLSX() { testExcelCellBorders(FORMAT_XLSX); }
void ScExportTest::testBordersExchangeXLSX()
{
// Document: sc/qa/unit/data/README.cellborders
// short name for the table
- const SvxBorderLineStyle None = SvxBorderLineStyle::NONE;
- const SvxBorderLineStyle Solid = SvxBorderLineStyle::SOLID;
- const SvxBorderLineStyle Dotted = SvxBorderLineStyle::DOTTED;
- const SvxBorderLineStyle Dashed = SvxBorderLineStyle::DASHED;
+ const SvxBorderLineStyle None = SvxBorderLineStyle::NONE;
+ const SvxBorderLineStyle Solid = SvxBorderLineStyle::SOLID;
+ const SvxBorderLineStyle Dotted = SvxBorderLineStyle::DOTTED;
+ const SvxBorderLineStyle Dashed = SvxBorderLineStyle::DASHED;
const SvxBorderLineStyle FineDash = SvxBorderLineStyle::FINE_DASHED;
- const SvxBorderLineStyle DashDot = SvxBorderLineStyle::DASH_DOT;
+ const SvxBorderLineStyle DashDot = SvxBorderLineStyle::DASH_DOT;
const SvxBorderLineStyle DashDoDo = SvxBorderLineStyle::DASH_DOT_DOT;
const SvxBorderLineStyle DoubThin = SvxBorderLineStyle::DOUBLE_THIN;
@@ -2566,50 +2746,175 @@ void ScExportTest::testBordersExchangeXLSX()
static struct
{
SvxBorderLineStyle BorderStyleTop, BorderStyleBottom;
- tools::Long WidthTop, WidthBottom;
- } aCheckBorderWidth[nMaxCol][nMaxRow] =
- {
-/* Line 1 2
3 4 5
6 7
- SOLID DOTTED
DASHED FINE_DASHED DASH_DOT
DASH_DOT_DOT DOUBLE_THIN */
-/*Width */
-/* 0,05 */ {{Solid , Solid , 1, 1}, {Dotted , Dotted , 15, 15},
{Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash,
FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {None , None , 0, 0}},
-/* 0,25 */ {{Solid , Solid , 1, 1}, {Dotted , Dotted , 15, 15},
{Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash,
FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {None , None , 0, 0}},
-/* 0,50 */ {{Solid , Solid , 1, 1}, {Dotted , Dotted , 15, 15},
{Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash,
FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {None , None , 0, 0}},
-/* 0,75 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15},
{FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot
, 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}},
-/* 1,00 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15},
{FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot
, 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}},
-/* 1,25 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15},
{FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot
, 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}},
-/* 1,50 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15},
{FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot
, 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}},
-
-/* 1,75 */ {{Solid , Solid , 35, 35}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
-/* 2,00 */ {{Solid , Solid , 35, 35}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
-/* 2,25 */ {{Solid , Solid , 35, 35}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
-
-/* 2,50 */ {{Solid , Solid , 50, 50}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
-/* 2,75 */ {{Solid , Solid , 50, 50}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
-/* 3,00 */ {{Solid , Solid , 50, 50}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
-/* 3,50 */ {{Solid , Solid , 50, 50}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
-/* 4,00 */ {{Solid , Solid , 50, 50}, {FineDash, FineDash, 35, 35},
{Dashed , Dashed , 35, 35}, {FineDash, FineDash, 35, 35}, {DashDot , DashDot
, 35, 35}, {DashDoDo, DashDoDo, 35, 35}, {DoubThin, DoubThin, 35, 35}},
... etc. - the rest is truncated
