sd/qa/unit/export-tests-ooxml2.cxx | 1285 +++++++++++++++++++++++--------------
solenv/clang-format/excludelist | 1
2 files changed, 801 insertions(+), 485 deletions(-)
New commits:
commit ba994b6ce2af211cdb89f8f7d91b3ae64ecfb5cd
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Oct 27 19:11:14 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Oct 27 22:23:56 2022 +0200
CppunitTest_sd_export_tests-ooxml2: use clang-format
Do it before changing the inheritance
Change-Id: Ic2f94977cb8d777023c88612b337e6a060bea422
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141941
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 6b7e934a176f..fcb6b3653f27 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -31,35 +31,36 @@
using namespace css;
using namespace css::animations;
-namespace {
-
+namespace
+{
bool checkBeginWithNumber(std::u16string_view aStr)
{
sal_Unicode aChar = (aStr.size() > 1) ? aStr[0] : '\0';
return aChar == '.' || aChar == '-' || rtl::isAsciiDigit(aChar);
}
-
}
-#define CPPUNIT_ASSERT_MOTIONPATH(expect, actual) \
- assertMotionPath(expect, actual, CPPUNIT_SOURCELINE())
+#define CPPUNIT_ASSERT_MOTIONPATH(expect, actual)
\
+ assertMotionPath(expect, actual, CPPUNIT_SOURCELINE())
-static void assertMotionPath(std::u16string_view rStr1, std::u16string_view
rStr2, const CppUnit::SourceLine &rSourceLine)
+static void assertMotionPath(std::u16string_view rStr1, std::u16string_view
rStr2,
+ const CppUnit::SourceLine& rSourceLine)
{
sal_Int32 nIdx1 = 0;
sal_Int32 nIdx2 = 0;
- OString sMessage = "Motion path values mismatch.\nExpect: " +
- OUStringToOString(rStr1, RTL_TEXTENCODING_UTF8) +
- "\nActual: " + OUStringToOString(rStr2, RTL_TEXTENCODING_UTF8);
+ OString sMessage
+ = "Motion path values mismatch.\nExpect: " + OUStringToOString(rStr1,
RTL_TEXTENCODING_UTF8)
+ + "\nActual: " + OUStringToOString(rStr2, RTL_TEXTENCODING_UTF8);
- while(nIdx1 != -1 && nIdx2 != -1)
+ while (nIdx1 != -1 && nIdx2 != -1)
{
- OUString aToken1( o3tl::getToken(rStr1, 0, ' ', nIdx1) );
- OUString aToken2( o3tl::getToken(rStr2, 0, ' ', nIdx2) );
+ OUString aToken1(o3tl::getToken(rStr1, 0, ' ', nIdx1));
+ OUString aToken2(o3tl::getToken(rStr2, 0, ' ', nIdx2));
if (checkBeginWithNumber(aToken1) && checkBeginWithNumber(aToken2))
- assertDoubleEquals(aToken1.toDouble(), aToken2.toDouble(),
DBL_EPSILON, rSourceLine, sMessage.getStr());
+ assertDoubleEquals(aToken1.toDouble(), aToken2.toDouble(),
DBL_EPSILON, rSourceLine,
+ sMessage.getStr());
else
assertEquals(aToken1, aToken2, rSourceLine, sMessage.getStr());
}
@@ -238,17 +239,17 @@ void SdOOXMLExportTest2::testTdf149697()
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:cxnSp[1]/p:nvCxnSpPr/p:cNvCxnSpPr/a:stCxn",
- "idx", "5");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:cxnSp[1]/p:nvCxnSpPr/p:cNvCxnSpPr/a:stCxn", "idx",
"5");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:cxnSp[1]/p:nvCxnSpPr/p:cNvCxnSpPr/a:endCxn",
- "idx", "4");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:cxnSp[1]/p:nvCxnSpPr/p:cNvCxnSpPr/a:endCxn", "idx",
"4");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:cxnSp[2]/p:nvCxnSpPr/p:cNvCxnSpPr/a:stCxn",
- "idx", "3");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:cxnSp[2]/p:nvCxnSpPr/p:cNvCxnSpPr/a:stCxn", "idx",
"3");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:cxnSp[2]/p:nvCxnSpPr/p:cNvCxnSpPr/a:endCxn",
- "idx", "1");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:cxnSp[2]/p:nvCxnSpPr/p:cNvCxnSpPr/a:endCxn", "idx",
"1");
xDocShRef->DoClose();
}
@@ -295,79 +296,79 @@ void SdOOXMLExportTest2::testTdf131905()
void SdOOXMLExportTest2::testTdf93883()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf93883.odp"), ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
- uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0,
xDocShRef ) );
- uno::Reference<text::XTextRange> const xParagraph( getParagraphFromShape(
0, xShape ) );
- uno::Reference< beans::XPropertySet > xPropSet( xParagraph,
uno::UNO_QUERY_THROW );
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf93883.odp"), ODP);
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
+ uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
+ uno::Reference<text::XTextRange> const xParagraph(getParagraphFromShape(0,
xShape));
+ uno::Reference<beans::XPropertySet> xPropSet(xParagraph,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(!xPropSet->getPropertyValue("NumberingLevel").hasValue());
}
void SdOOXMLExportTest2::testBnc822341()
{
// Check import / export of embedded text document
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/bnc822341.odp"), ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/bnc822341.odp"), ODP);
utl::TempFileNamed tempFile1;
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile1 );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile1);
// Export an LO specific ole object (imported from an ODP document)
{
xmlDocUniquePtr pXmlDocCT = parseExport(tempFile1,
"[Content_Types].xml");
assertXPath(pXmlDocCT,
-
"/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.wordprocessingml.document']",
- "PartName",
- "/ppt/embeddings/oleObject1.docx");
+
"/ContentType:Types/ContentType:Override[@ContentType='application/"
+
"vnd.openxmlformats-officedocument.wordprocessingml.document']",
+ "PartName", "/ppt/embeddings/oleObject1.docx");
xmlDocUniquePtr pXmlDocRels = parseExport(tempFile1,
"ppt/slides/_rels/slide1.xml.rels");
- assertXPath(pXmlDocRels,
+ assertXPath(
+ pXmlDocRels,
"/rels:Relationships/rels:Relationship[@Target='../embeddings/oleObject1.docx']",
- "Type",
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";);
+ "Type",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile1,
"ppt/slides/slide1.xml");
assertXPath(pXmlDocContent,
-
"/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/p:oleObj",
- "progId",
- "Word.Document.12");
+
"/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/p:oleObj",
+ "progId", "Word.Document.12");
- const SdrPage *pPage = GetPage( 1, xDocShRef.get() );
+ const SdrPage* pPage = GetPage(1, xDocShRef.get());
const SdrObject* pObj = pPage->GetObj(0);
- CPPUNIT_ASSERT_MESSAGE( "no object", pObj != nullptr);
- CPPUNIT_ASSERT_EQUAL( SdrObjKind::OLE2, pObj->GetObjIdentifier() );
+ CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr);
+ CPPUNIT_ASSERT_EQUAL(SdrObjKind::OLE2, pObj->GetObjIdentifier());
}
utl::TempFileNamed tempFile2;
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile2 );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile2);
// Export an MS specific ole object (imported from a PPTX document)
{
xmlDocUniquePtr pXmlDocCT = parseExport(tempFile2,
"[Content_Types].xml");
assertXPath(pXmlDocCT,
-
"/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.wordprocessingml.document']",
- "PartName",
- "/ppt/embeddings/oleObject1.docx");
+
"/ContentType:Types/ContentType:Override[@ContentType='application/"
+
"vnd.openxmlformats-officedocument.wordprocessingml.document']",
+ "PartName", "/ppt/embeddings/oleObject1.docx");
xmlDocUniquePtr pXmlDocRels = parseExport(tempFile2,
"ppt/slides/_rels/slide1.xml.rels");
- assertXPath(pXmlDocRels,
+ assertXPath(
+ pXmlDocRels,
"/rels:Relationships/rels:Relationship[@Target='../embeddings/oleObject1.docx']",
- "Type",
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";);
+ "Type",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile2,
"ppt/slides/slide1.xml");
assertXPath(pXmlDocContent,
-
"/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/p:oleObj",
- "progId",
- "Word.Document.12");
+
"/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/p:oleObj",
+ "progId", "Word.Document.12");
- SdDrawDocument *pDoc = xDocShRef->GetDoc();
- CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr );
- const SdrPage *pPage = pDoc->GetPage(1);
- CPPUNIT_ASSERT_MESSAGE( "no page", pPage != nullptr );
+ SdDrawDocument* pDoc = xDocShRef->GetDoc();
+ CPPUNIT_ASSERT_MESSAGE("no document", pDoc != nullptr);
+ const SdrPage* pPage = pDoc->GetPage(1);
+ CPPUNIT_ASSERT_MESSAGE("no page", pPage != nullptr);
const SdrObject* pObj = pPage->GetObj(0);
- CPPUNIT_ASSERT_MESSAGE( "no object", pObj != nullptr);
- CPPUNIT_ASSERT_EQUAL( SdrObjKind::OLE2, pObj->GetObjIdentifier() );
+ CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr);
+ CPPUNIT_ASSERT_EQUAL(SdrObjKind::OLE2, pObj->GetObjIdentifier());
}
xDocShRef->DoClose();
@@ -376,42 +377,41 @@ void SdOOXMLExportTest2::testBnc822341()
void SdOOXMLExportTest2::testMathObject()
{
// Check import / export of math object
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/math.odp"), ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/math.odp"), ODP);
utl::TempFileNamed tempFile1;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile1);
// Export an LO specific ole object (imported from an ODP document)
{
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile1,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
- "/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice",
- "Requires",
- "a14");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice",
+ "Requires", "a14");
assertXPathContent(pXmlDocContent,
-
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/a14:m/m:oMath/m:r[1]/m:t",
- "a");
+
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/"
+ "a14:m/m:oMath/m:r[1]/m:t",
+ "a");
- const SdrPage *pPage = GetPage(1, xDocShRef);
+ const SdrPage* pPage = GetPage(1, xDocShRef);
const SdrObject* pObj = pPage->GetObj(0);
CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr);
CPPUNIT_ASSERT_EQUAL(SdrObjKind::OLE2, pObj->GetObjIdentifier());
}
utl::TempFileNamed tempFile2;
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile2 );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile2);
// Export an MS specific ole object (imported from a PPTX document)
{
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile1,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
- "/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice",
- "Requires",
- "a14");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice",
+ "Requires", "a14");
assertXPathContent(pXmlDocContent,
-
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/a14:m/m:oMath/m:r[1]/m:t",
- "a");
+
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/"
+ "a14:m/m:oMath/m:r[1]/m:t",
+ "a");
- const SdrPage *pPage = GetPage(1, xDocShRef);
+ const SdrPage* pPage = GetPage(1, xDocShRef);
const SdrObject* pObj = pPage->GetObj(0);
CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr);
CPPUNIT_ASSERT_EQUAL(SdrObjKind::OLE2, pObj->GetObjIdentifier());
@@ -423,22 +423,22 @@ void SdOOXMLExportTest2::testMathObject()
void SdOOXMLExportTest2::testMathObjectPPT2010()
{
// Check import / export of math object
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/Math.pptx"), PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/Math.pptx"), PPTX);
utl::TempFileNamed tempFile1;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile1);
// Export an MS specific ole object (imported from a PPTX document)
{
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile1,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
- "/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice",
- "Requires",
- "a14");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice",
+ "Requires", "a14");
assertXPathContent(pXmlDocContent,
-
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/a14:m/m:oMath/m:sSup/m:e/m:r[1]/m:t",
- u"\U0001D44E"); // non-BMP char
+
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/"
+ "a14:m/m:oMath/m:sSup/m:e/m:r[1]/m:t",
+ u"\U0001D44E"); // non-BMP char
- const SdrPage *pPage = GetPage(1, xDocShRef);
+ const SdrPage* pPage = GetPage(1, xDocShRef);
const SdrObject* pObj = pPage->GetObj(0);
CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr);
CPPUNIT_ASSERT_EQUAL(SdrObjKind::OLE2, pObj->GetObjIdentifier());
@@ -451,7 +451,7 @@ void SdOOXMLExportTest2::testTdf119015()
{
::sd::DrawDocShellRef xDocShRef
=
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf119015.pptx"),
PPTX);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
const SdrPage* pPage = GetPage(1, xDocShRef);
@@ -474,7 +474,7 @@ void SdOOXMLExportTest2::testTdf123090()
{
::sd::DrawDocShellRef xDocShRef
=
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf123090.pptx"),
PPTX);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
const SdrPage* pPage = GetPage(1, xDocShRef);
@@ -489,10 +489,10 @@ void SdOOXMLExportTest2::testTdf123090()
CPPUNIT_ASSERT_EQUAL(OUString("aaa"), xTextRange->getString());
sal_Int32 nWidth;
- uno::Reference< css::table::XTableColumns > xColumns(
xTable->getColumns(), uno::UNO_SET_THROW);
- uno::Reference< beans::XPropertySet > xRefColumn( xColumns->getByIndex(1),
uno::UNO_QUERY_THROW );
- xRefColumn->getPropertyValue( "Width" ) >>= nWidth;
- CPPUNIT_ASSERT_EQUAL( sal_Int32(9136), nWidth);
+ uno::Reference<css::table::XTableColumns> xColumns(xTable->getColumns(),
uno::UNO_SET_THROW);
+ uno::Reference<beans::XPropertySet> xRefColumn(xColumns->getByIndex(1),
uno::UNO_QUERY_THROW);
+ xRefColumn->getPropertyValue("Width") >>= nWidth;
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(9136), nWidth);
xDocShRef->DoClose();
}
@@ -501,7 +501,7 @@ void SdOOXMLExportTest2::testTdf126324()
{
sd::DrawDocShellRef xDocShRef
=
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf126324.pptx"),
PPTX);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
uno::Reference<drawing::XDrawPagesSupplier>
xDoc(xDocShRef->GetDoc()->getUnoModel(),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
@@ -509,7 +509,8 @@ void SdOOXMLExportTest2::testTdf126324()
CPPUNIT_ASSERT(xPage.is());
uno::Reference<beans::XPropertySet> xShape(getShape(0, xPage));
CPPUNIT_ASSERT(xShape.is());
- uno::Reference< text::XText > xText = uno::Reference< text::XTextRange>(
xShape, uno::UNO_QUERY_THROW )->getText();
+ uno::Reference<text::XText> xText
+ = uno::Reference<text::XTextRange>(xShape,
uno::UNO_QUERY_THROW)->getText();
CPPUNIT_ASSERT_EQUAL(OUString("17"), xText->getString());
xDocShRef->DoClose();
@@ -517,11 +518,12 @@ void SdOOXMLExportTest2::testTdf126324()
void SdOOXMLExportTest2::testTdf119187()
{
- std::vector< sd::DrawDocShellRef > xDocShRef;
+ std::vector<sd::DrawDocShellRef> xDocShRef;
// load document
-
xDocShRef.push_back(loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf119187.pptx"),
PPTX));
+ xDocShRef.push_back(
+
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf119187.pptx"),
PPTX));
// load resaved document
- xDocShRef.push_back(saveAndReload( xDocShRef.at(0).get(), PPTX ));
+ xDocShRef.push_back(saveAndReload(xDocShRef.at(0).get(), PPTX));
// check documents
for (const sd::DrawDocShellRef& xDoc : xDocShRef)
@@ -531,10 +533,11 @@ void SdOOXMLExportTest2::testTdf119187()
CPPUNIT_ASSERT(pPage);
SdrObject* pObj = pPage->GetObj(0);
CPPUNIT_ASSERT(pObj);
- const sdr::properties::BaseProperties & rProperties =
pObj->GetProperties();
+ const sdr::properties::BaseProperties& rProperties =
pObj->GetProperties();
// check text vertical alignment
- const SdrTextVertAdjustItem& rSdrTextVertAdjustItem =
rProperties.GetItem(SDRATTR_TEXT_VERTADJUST);
+ const SdrTextVertAdjustItem& rSdrTextVertAdjustItem
+ = rProperties.GetItem(SDRATTR_TEXT_VERTADJUST);
const SdrTextVertAdjust eTVA = rSdrTextVertAdjustItem.GetValue();
CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_TOP, eTVA);
}
@@ -542,14 +545,15 @@ void SdOOXMLExportTest2::testTdf119187()
void SdOOXMLExportTest2::testTdf132472()
{
- sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf132472.pptx"), PPTX );
- const SdrPage *pPage = GetPage( 1, xDocShRef );
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf132472.pptx"),
PPTX);
+ const SdrPage* pPage = GetPage(1, xDocShRef);
- sdr::table::SdrTableObj *pTableObj =
dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0));
- CPPUNIT_ASSERT( pTableObj );
+ sdr::table::SdrTableObj* pTableObj =
dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0));
+ CPPUNIT_ASSERT(pTableObj);
- uno::Reference< table::XCellRange > xTable(pTableObj->getTable(),
uno::UNO_QUERY_THROW);
- uno::Reference< beans::XPropertySet > xCell;
+ uno::Reference<table::XCellRange> xTable(pTableObj->getTable(),
uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet> xCell;
Color nColor;
xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
@@ -571,12 +575,13 @@ void SdOOXMLExportTest2::testTdf132472()
void SdOOXMLExportTest2::testTdf80224()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf80224.odp"), ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
- uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0,
xDocShRef ) );
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf80224.odp"), ODP);
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
+ uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
- uno::Reference<text::XTextRange> const xParagraph( getParagraphFromShape(
0, xShape ) );
- uno::Reference< beans::XPropertySet > xPropSet( xParagraph->getStart(),
uno::UNO_QUERY_THROW );
+ uno::Reference<text::XTextRange> const xParagraph(getParagraphFromShape(0,
xShape));
+ uno::Reference<beans::XPropertySet> xPropSet(xParagraph->getStart(),
uno::UNO_QUERY_THROW);
Color nCharColor;
xPropSet->getPropertyValue("CharColor") >>= nCharColor;
@@ -586,33 +591,39 @@ void SdOOXMLExportTest2::testTdf80224()
void SdOOXMLExportTest2::testTdf91378()
{
-
//Check For Import and Export Both
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf91378.pptx"),
PPTX);
- for( sal_uInt32 i=0;i<2;i++)
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf91378.pptx"),
PPTX);
+ for (sal_uInt32 i = 0; i < 2; i++)
{
- SdDrawDocument *pDoc = xDocShRef->GetDoc();
- CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr );
- uno::Reference<document::XDocumentPropertiesSupplier>
xDocumentPropertiesSupplier( xDocShRef->GetModel(), uno::UNO_QUERY );
- uno::Reference<document::XDocumentProperties> xProps =
xDocumentPropertiesSupplier->getDocumentProperties();
- uno::Reference<beans::XPropertySet> xUDProps(
xProps->getUserDefinedProperties(), uno::UNO_QUERY );
- OUString propValue;
- xUDProps->getPropertyValue("Testing") >>= propValue;
- CPPUNIT_ASSERT(propValue.isEmpty());
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ SdDrawDocument* pDoc = xDocShRef->GetDoc();
+ CPPUNIT_ASSERT_MESSAGE("no document", pDoc != nullptr);
+ uno::Reference<document::XDocumentPropertiesSupplier>
xDocumentPropertiesSupplier(
+ xDocShRef->GetModel(), uno::UNO_QUERY);
+ uno::Reference<document::XDocumentProperties> xProps
+ = xDocumentPropertiesSupplier->getDocumentProperties();
+ uno::Reference<beans::XPropertySet>
xUDProps(xProps->getUserDefinedProperties(),
+ uno::UNO_QUERY);
+ OUString propValue;
+ xUDProps->getPropertyValue("Testing") >>= propValue;
+ CPPUNIT_ASSERT(propValue.isEmpty());
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
}
xDocShRef->DoClose();
}
-static bool checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier>
const & xDoc, sal_Int32 nSlideNumber,
- sal_Int16 nExpectedTransitionType, sal_Int16
nExpectedTransitionSubType,
- bool bExpectedDirection = true)
+static bool checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier>
const& xDoc,
+ sal_Int32 nSlideNumber, sal_Int16
nExpectedTransitionType,
+ sal_Int16 nExpectedTransitionSubType,
+ bool bExpectedDirection = true)
{
sal_Int32 nSlideIndex = nSlideNumber - 1;
- CPPUNIT_ASSERT_MESSAGE("Slide/Page index out of range", nSlideIndex <
xDoc->getDrawPages()->getCount());
+ CPPUNIT_ASSERT_MESSAGE("Slide/Page index out of range",
+ nSlideIndex < xDoc->getDrawPages()->getCount());
- uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(nSlideIndex), uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(nSlideIndex),
+ uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropSet(xPage, uno::UNO_QUERY);
sal_Int16 nTransitionType = 0;
@@ -620,7 +631,8 @@ static bool
checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier> co
if (nExpectedTransitionType != nTransitionType)
{
- std::cerr << "Transition type: " << nTransitionType << " " <<
nExpectedTransitionType << std::endl;
+ std::cerr << "Transition type: " << nTransitionType << " " <<
nExpectedTransitionType
+ << std::endl;
return false;
}
@@ -628,7 +640,8 @@ static bool
checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier> co
xPropSet->getPropertyValue("TransitionSubtype") >>= nTransitionSubtype;
if (nExpectedTransitionSubType != nTransitionSubtype)
{
- std::cerr << "Transition Subtype: " << nTransitionSubtype << " " <<
nExpectedTransitionSubType << std::endl;
+ std::cerr << "Transition Subtype: " << nTransitionSubtype << " "
+ << nExpectedTransitionSubType << std::endl;
return false;
}
@@ -637,8 +650,8 @@ static bool
checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier> co
if (bExpectedDirection != bDirection)
{
- std::cerr << "Transition Direction: " << (bExpectedDirection ?
"normal" : "reversed")
- << " " << (bDirection ? "normal" :
"reversed") << std::endl;
+ std::cerr << "Transition Direction: " << (bExpectedDirection ?
"normal" : "reversed") << " "
+ << (bDirection ? "normal" : "reversed") << std::endl;
return false;
}
@@ -647,130 +660,189 @@ static bool
checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier> co
void SdOOXMLExportTest2::testExportTransitionsPPTX()
{
- sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/AllTransitions.odp"),
ODP);
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/AllTransitions.odp"),
ODP);
xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- uno::Reference<drawing::XDrawPagesSupplier>
xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier>
xDoc(xDocShRef->GetDoc()->getUnoModel(),
+ uno::UNO_QUERY_THROW);
// WIPE TRANSITIONS
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 01, TransitionType::BARWIPE,
TransitionSubType::TOPTOBOTTOM, false));
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 02, TransitionType::BARWIPE,
TransitionSubType::LEFTTORIGHT));
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 03, TransitionType::BARWIPE,
TransitionSubType::LEFTTORIGHT, false));
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 04, TransitionType::BARWIPE,
TransitionSubType::TOPTOBOTTOM));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 01, TransitionType::BARWIPE,
+ TransitionSubType::TOPTOBOTTOM,
false));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 02, TransitionType::BARWIPE,
TransitionSubType::LEFTTORIGHT));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 03, TransitionType::BARWIPE,
+ TransitionSubType::LEFTTORIGHT,
false));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 04, TransitionType::BARWIPE,
TransitionSubType::TOPTOBOTTOM));
// CUT THROUGH BLACK
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 31, TransitionType::BARWIPE,
TransitionSubType::FADEOVERCOLOR));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 31, TransitionType::BARWIPE,
TransitionSubType::FADEOVERCOLOR));
// COMB
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 41, TransitionType::PUSHWIPE,
TransitionSubType::COMBHORIZONTAL));
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 42, TransitionType::PUSHWIPE,
TransitionSubType::COMBVERTICAL));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 41, TransitionType::PUSHWIPE,
+ TransitionSubType::COMBHORIZONTAL));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 42, TransitionType::PUSHWIPE,
TransitionSubType::COMBVERTICAL));
// OUTSIDE TURNING CUBE
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 57,
TransitionType::MISCSHAPEWIPE, TransitionSubType::CORNERSOUT));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 57,
TransitionType::MISCSHAPEWIPE,
+ TransitionSubType::CORNERSOUT));
// INSIDE TURNING CUBE
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 60,
TransitionType::MISCSHAPEWIPE, TransitionSubType::CORNERSIN));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 60,
TransitionType::MISCSHAPEWIPE,
+ TransitionSubType::CORNERSIN));
// FALL
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 61,
TransitionType::MISCSHAPEWIPE, TransitionSubType::LEFTTORIGHT));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 61,
TransitionType::MISCSHAPEWIPE,
+ TransitionSubType::LEFTTORIGHT));
// VORTEX
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 70,
TransitionType::MISCSHAPEWIPE, TransitionSubType::VERTICAL));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 70,
TransitionType::MISCSHAPEWIPE,
+ TransitionSubType::VERTICAL));
// RIPPLE
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 71,
TransitionType::MISCSHAPEWIPE, TransitionSubType::HORIZONTAL));
+ CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 71,
TransitionType::MISCSHAPEWIPE,
+ TransitionSubType::HORIZONTAL));
// GLITTER
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 72,
TransitionType::MISCSHAPEWIPE, TransitionSubType::DIAMOND));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 72, TransitionType::MISCSHAPEWIPE,
TransitionSubType::DIAMOND));
// HONEYCOMB
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 73,
TransitionType::MISCSHAPEWIPE, TransitionSubType::HEART));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 73, TransitionType::MISCSHAPEWIPE,
TransitionSubType::HEART));
// NEWSFLASH
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 74, TransitionType::ZOOM,
TransitionSubType::ROTATEIN));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 74, TransitionType::ZOOM,
TransitionSubType::ROTATEIN));
// OVAL VERTICAL - cannot be exported to PPTX so fallback to circle
//CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 76,
TransitionType::ELLIPSEWIPE, TransitionSubType::VERTICAL));
- CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 76,
TransitionType::ELLIPSEWIPE, TransitionSubType::CIRCLE));
+ CPPUNIT_ASSERT(
+ checkTransitionOnPage(xDoc, 76, TransitionType::ELLIPSEWIPE,
TransitionSubType::CIRCLE));
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testPresetShapesExport()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/preset-shapes-export.odp"),
ODP);
- const char *sShapeTypeAndValues[] =
- {
+ ::sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/preset-shapes-export.odp"),
ODP);
+ const char* sShapeTypeAndValues[] = {
"wedgeEllipseCallout",
- "adj1","val 45310",
- "adj2","val 97194",
+ "adj1",
+ "val 45310",
+ "adj2",
+ "val 97194",
"wedgeRoundRectCallout",
- "adj1","val 46694",
- "adj2","val 129726",
- "adj3","val 16667",
+ "adj1",
+ "val 46694",
+ "adj2",
+ "val 129726",
+ "adj3",
+ "val 16667",
"wedgeRectCallout",
- "adj1","val 40037",
- "adj2","val 111694",
+ "adj1",
+ "val 40037",
+ "adj2",
+ "val 111694",
"smileyFace",
- "adj","val -9282",
+ "adj",
+ "val -9282",
"can",
- "adj","val 50000",
+ "adj",
+ "val 50000",
"frame",
- "adj1","val 10490",
+ "adj1",
+ "val 10490",
"donut",
- "adj","val 9601",
+ "adj",
+ "val 9601",
"bevel",
- "adj","val 42592",
+ "adj",
+ "val 42592",
"foldedCorner",
- "adj","val 10750",
+ "adj",
+ "val 10750",
"verticalScroll",
- "adj","val 25000",
+ "adj",
+ "val 25000",
"horizontalScroll",
- "adj","val 25000",
+ "adj",
+ "val 25000",
"cube",
- "adj","val 85129",
+ "adj",
+ "val 85129",
"bracketPair",
- "adj","val 50000",
+ "adj",
+ "val 50000",
"sun",
- "adj","val 12500",
+ "adj",
+ "val 12500",
"bracePair",
- "adj","val 25000",
+ "adj",
+ "val 25000",
"cloudCallout",
- "adj1","val 77611",
- "adj2","val -47819",
+ "adj1",
+ "val 77611",
+ "adj2",
+ "val -47819",
"borderCallout1",
- "adj1","val 18750",
- "adj2","val -8333",
- "adj3","val 170013",
- "adj4","val 143972",
+ "adj1",
+ "val 18750",
+ "adj2",
+ "val -8333",
+ "adj3",
+ "val 170013",
+ "adj4",
+ "val 143972",
"borderCallout2",
- "adj1","val 18750",
- "adj2","val -8333",
- "adj3","val 113768",
- "adj4","val -81930",
- "adj5","val -22375",
- "adj6","val -134550",
+ "adj1",
+ "val 18750",
+ "adj2",
+ "val -8333",
+ "adj3",
+ "val 113768",
+ "adj4",
+ "val -81930",
+ "adj5",
+ "val -22375",
+ "adj6",
+ "val -134550",
"blockArc",
- "adj1","val 12975429",
- "adj2","val 19424571",
- "adj3","val 3770",
+ "adj1",
+ "val 12975429",
+ "adj2",
+ "val 19424571",
+ "adj3",
+ "val 3770",
};
utl::TempFileNamed tempFile;
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocCT = parseExport(tempFile, "ppt/slides/slide1.xml");
- const OString sPattern(
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:prstGeom[@prst='_T_']/a:avLst/a:gd[_N_]"
);
- const OString sT( "_T_" );
- const OString sN( "_N_" );
+ const OString sPattern(
+
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:prstGeom[@prst='_T_']/a:avLst/a:gd[_N_]");
+ const OString sT("_T_");
+ const OString sN("_N_");
const OString sPropertyName("name");
const OString sPropertyFmla("fmla");
size_t i = 0;
- while(i < SAL_N_ELEMENTS( sShapeTypeAndValues )) {
- OString sType( sShapeTypeAndValues[ i++ ] );
- for ( size_t j = 1 ; i < SAL_N_ELEMENTS( sShapeTypeAndValues ) &&
o3tl::starts_with(sShapeTypeAndValues[i], "adj") ; ++j ) {
- OString sXPath= sPattern.replaceFirst( sT, sType).replaceFirst(
sN, OString::number(j) );
- assertXPath(pXmlDocCT, sXPath, sPropertyName ,
OUString::createFromAscii(sShapeTypeAndValues[ i++ ]) );
- assertXPath(pXmlDocCT, sXPath, sPropertyFmla ,
OUString::createFromAscii(sShapeTypeAndValues[ i++ ]) );
+ while (i < SAL_N_ELEMENTS(sShapeTypeAndValues))
+ {
+ OString sType(sShapeTypeAndValues[i++]);
+ for (size_t j = 1; i < SAL_N_ELEMENTS(sShapeTypeAndValues)
+ && o3tl::starts_with(sShapeTypeAndValues[i], "adj");
+ ++j)
+ {
+ OString sXPath = sPattern.replaceFirst(sT, sType).replaceFirst(sN,
OString::number(j));
+ assertXPath(pXmlDocCT, sXPath, sPropertyName,
+ OUString::createFromAscii(sShapeTypeAndValues[i++]));
+ assertXPath(pXmlDocCT, sXPath, sPropertyFmla,
+ OUString::createFromAscii(sShapeTypeAndValues[i++]));
}
}
}
@@ -779,40 +851,47 @@ void SdOOXMLExportTest2::testTdf92527()
{
// We draw a diamond in an empty document.
// If custom shape has name and preset information in OOXML, should be
export as preset shape.
- sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/empty.fodp"), FODG );
- uno::Reference<css::lang::XMultiServiceFactory>
xFactory(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY);
- uno::Reference<drawing::XShape>
xShape1(xFactory->createInstance("com.sun.star.drawing.CustomShape"),
uno::UNO_QUERY);
- uno::Reference<drawing::XDrawPagesSupplier>
xDoc1(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
- uno::Reference<drawing::XDrawPage>
xPage1(xDoc1->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW);
+ sd::DrawDocShellRef xDocShRef
+ = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/empty.fodp"),
FODG);
+ uno::Reference<css::lang::XMultiServiceFactory>
xFactory(xDocShRef->GetDoc()->getUnoModel(),
+ uno::UNO_QUERY);
+ uno::Reference<drawing::XShape> xShape1(
+ xFactory->createInstance("com.sun.star.drawing.CustomShape"),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier>
xDoc1(xDocShRef->GetDoc()->getUnoModel(),
+ uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPage>
xPage1(xDoc1->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY_THROW);
xPage1->add(xShape1);
xShape1->setSize(awt::Size(10000, 10000));
xShape1->setPosition(awt::Point(1000, 1000));
- uno::Sequence<beans::PropertyValue>
aShapeGeometry(comphelper::InitPropertySequence(
- {
- {"Type", uno::Any(OUString("diamond"))},
- }));
+ uno::Sequence<beans::PropertyValue>
aShapeGeometry(comphelper::InitPropertySequence({
+ { "Type", uno::Any(OUString("diamond")) },
+ }));
uno::Reference<beans::XPropertySet> xPropertySet1(xShape1, uno::UNO_QUERY);
xPropertySet1->setPropertyValue("CustomShapeGeometry",
uno::Any(aShapeGeometry));
xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- uno::Reference<drawing::XDrawPagesSupplier>
xDoc2(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
- uno::Reference<drawing::XDrawPage>
xPage2(xDoc2->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier>
xDoc2(xDocShRef->GetDoc()->getUnoModel(),
+ uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPage>
xPage2(xDoc2->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape2(xPage2->getByIndex(0),
uno::UNO_QUERY_THROW);
- uno::Reference< beans::XPropertySet > xPropertySet2( xShape2,
uno::UNO_QUERY_THROW );
+ uno::Reference<beans::XPropertySet> xPropertySet2(xShape2,
uno::UNO_QUERY_THROW);
uno::Sequence<beans::PropertyValue> aProps;
xPropertySet2->getPropertyValue("CustomShapeGeometry") >>= aProps;
uno::Sequence<beans::PropertyValue> aPathProps;
- for (beans::PropertyValue const & rProp : std::as_const(aProps))
+ for (beans::PropertyValue const& rProp : std::as_const(aProps))
{
if (rProp.Name == "Path")
- aPathProps = rProp.Value.get< uno::Sequence<beans::PropertyValue>
>();
+ aPathProps =
rProp.Value.get<uno::Sequence<beans::PropertyValue>>();
}
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> aCoordinates;
- for (beans::PropertyValue const & rProp : std::as_const(aPathProps))
+ for (beans::PropertyValue const& rProp : std::as_const(aPathProps))
{
if (rProp.Name == "Coordinates")
- aCoordinates = rProp.Value.get<
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> >();
+ aCoordinates
+ =
rProp.Value.get<uno::Sequence<drawing::EnhancedCustomShapeParameterPair>>();
}
// 4 coordinate pairs
@@ -820,56 +899,65 @@ void SdOOXMLExportTest2::testTdf92527()
xDocShRef->DoClose();
}
-namespace {
-
-void matchNumberFormat( int nPage, uno::Reference< text::XTextField > const &
xField)
+namespace
{
- uno::Reference< beans::XPropertySet > xPropSet( xField,
uno::UNO_QUERY_THROW );
+void matchNumberFormat(int nPage, uno::Reference<text::XTextField> const&
xField)
+{
+ uno::Reference<beans::XPropertySet> xPropSet(xField, uno::UNO_QUERY_THROW);
sal_Int32 nNumFmt;
xPropSet->getPropertyValue("NumberFormat") >>= nNumFmt;
- switch( nPage )
+ switch (nPage)
{
- case 0: // 13/02/96 (StdSmall)
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date
fields don't match", sal_Int32(SvxDateFormat::StdSmall), nNumFmt);
- break;
- case 1: // 13/02/1996
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date
fields don't match", sal_Int32(SvxDateFormat::B), nNumFmt);
- break;
- case 2: // Tuesday, June 29, 2021 (StdBig)
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date
fields don't match", sal_Int32(SvxDateFormat::StdBig), nNumFmt);
- break;
- case 3: // 13:49:38 (Standard)
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time
fields don't match", sal_Int32(SvxTimeFormat::Standard), nNumFmt);
- break;
- case 4: // 13:49
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time
fields don't match", sal_Int32(SvxTimeFormat::HH24_MM), nNumFmt);
- break;
- case 5: // 01:49 PM
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time
fields don't match", sal_Int32(SvxTimeFormat::HH12_MM), nNumFmt);
- break;
- case 6: // 01:49:38 PM
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time
fields don't match", sal_Int32(SvxTimeFormat::HH12_MM_SS), nNumFmt);
- break;
- case 7: // June 29, 2021
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date
fields don't match", sal_Int32(SvxDateFormat::D), nNumFmt);
- break;
- case 8: // Jun 29, 2021
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date
fields don't match", sal_Int32(SvxDateFormat::C), nNumFmt);
- break;
+ case 0: // 13/02/96 (StdSmall)
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date fields don't
match",
+ sal_Int32(SvxDateFormat::StdSmall),
nNumFmt);
+ break;
+ case 1: // 13/02/1996
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date fields don't
match",
+ sal_Int32(SvxDateFormat::B), nNumFmt);
+ break;
+ case 2: // Tuesday, June 29, 2021 (StdBig)
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date fields don't
match",
+ sal_Int32(SvxDateFormat::StdBig),
nNumFmt);
+ break;
+ case 3: // 13:49:38 (Standard)
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time fields don't
match",
+ sal_Int32(SvxTimeFormat::Standard),
nNumFmt);
+ break;
+ case 4: // 13:49
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time fields don't
match",
+ sal_Int32(SvxTimeFormat::HH24_MM),
nNumFmt);
+ break;
+ case 5: // 01:49 PM
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time fields don't
match",
+ sal_Int32(SvxTimeFormat::HH12_MM),
nNumFmt);
+ break;
+ case 6: // 01:49:38 PM
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Time fields don't
match",
+ sal_Int32(SvxTimeFormat::HH12_MM_SS),
nNumFmt);
+ break;
+ case 7: // June 29, 2021
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date fields don't
match",
+ sal_Int32(SvxDateFormat::D), nNumFmt);
+ break;
+ case 8: // Jun 29, 2021
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Number formats of Date fields don't
match",
+ sal_Int32(SvxDateFormat::C), nNumFmt);
+ break;
}
}
-
}
void SdOOXMLExportTest2::testDatetimeFieldNumberFormat()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/numfmt.odp"), ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/numfmt.odp"), ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- for(sal_uInt16 i = 0; i <= 8; ++i)
+ for (sal_uInt16 i = 0; i <= 8; ++i)
{
- matchNumberFormat( i, getTextFieldFromPage(0, 0, 0, i, xDocShRef) );
+ matchNumberFormat(i, getTextFieldFromPage(0, 0, 0, i, xDocShRef));
}
xDocShRef->DoClose();
@@ -877,13 +965,14 @@ void SdOOXMLExportTest2::testDatetimeFieldNumberFormat()
void SdOOXMLExportTest2::testDatetimeFieldNumberFormatPPTX()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/numfmt.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/numfmt.pptx"),
PPTX);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- for(sal_uInt16 i = 0; i <= 8; ++i)
+ for (sal_uInt16 i = 0; i <= 8; ++i)
{
- matchNumberFormat( i, getTextFieldFromPage(0, 0, 0, i, xDocShRef) );
+ matchNumberFormat(i, getTextFieldFromPage(0, 0, 0, i, xDocShRef));
}
xDocShRef->DoClose();
@@ -891,79 +980,84 @@ void
SdOOXMLExportTest2::testDatetimeFieldNumberFormatPPTX()
void SdOOXMLExportTest2::testSlideNumberField()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidenum_field.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidenum_field.odp"),
ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- uno::Reference< text::XTextField > xField = getTextFieldFromPage(0, 0, 0,
0, xDocShRef);
- CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() );
+ uno::Reference<text::XTextField> xField = getTextFieldFromPage(0, 0, 0, 0,
xDocShRef);
+ CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is());
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testSlideNumberFieldPPTX()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/slidenum_field.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/slidenum_field.pptx"),
PPTX);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- uno::Reference< text::XTextField > xField = getTextFieldFromPage(0, 0, 0,
0, xDocShRef);
- CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() );
+ uno::Reference<text::XTextField> xField = getTextFieldFromPage(0, 0, 0, 0,
xDocShRef);
+ CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is());
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testSlideCountField()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidecount_field.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidecount_field.odp"),
ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- uno::Reference< text::XTextField > xField = getTextFieldFromPage(0, 0, 0,
0, xDocShRef);
- CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() );
+ uno::Reference<text::XTextField> xField = getTextFieldFromPage(0, 0, 0, 0,
xDocShRef);
+ CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is());
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testSlideNameField()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidename_field.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidename_field.odp"),
ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- uno::Reference< text::XTextField > xField = getTextFieldFromPage(0, 0, 0,
0, xDocShRef);
- CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() );
+ uno::Reference<text::XTextField> xField = getTextFieldFromPage(0, 0, 0, 0,
xDocShRef);
+ CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is());
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testExtFileField()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/extfile_field.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/extfile_field.odp"),
ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- for(sal_uInt16 i = 0; i <= 3; ++i)
+ for (sal_uInt16 i = 0; i <= 3; ++i)
{
- uno::Reference< text::XTextField > xField = getTextFieldFromPage(0, 0,
i, 0, xDocShRef);
- CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() );
+ uno::Reference<text::XTextField> xField = getTextFieldFromPage(0, 0,
i, 0, xDocShRef);
+ CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is());
- uno::Reference< beans::XPropertySet > xPropSet( xField,
uno::UNO_QUERY_THROW );
+ uno::Reference<beans::XPropertySet> xPropSet(xField,
uno::UNO_QUERY_THROW);
sal_Int32 nNumFmt;
xPropSet->getPropertyValue("FileFormat") >>= nNumFmt;
- switch( i )
+ switch (i)
{
- case 0: // Path/File name
- CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't
match", sal_Int32(0), nNumFmt);
- break;
- case 1: // Path
- CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't
match", sal_Int32(1), nNumFmt);
- break;
- case 2: // File name without extension
- CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't
match", sal_Int32(2), nNumFmt);
- break;
- case 3: // File name with extension
- CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't
match", sal_Int32(3), nNumFmt);
+ case 0: // Path/File name
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't match",
sal_Int32(0), nNumFmt);
+ break;
+ case 1: // Path
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't match",
sal_Int32(1), nNumFmt);
+ break;
+ case 2: // File name without extension
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't match",
sal_Int32(2), nNumFmt);
+ break;
+ case 3: // File name with extension
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("File formats don't match",
sal_Int32(3), nNumFmt);
}
}
@@ -972,19 +1066,21 @@ void SdOOXMLExportTest2::testExtFileField()
void SdOOXMLExportTest2::testAuthorField()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/author_field.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/author_field.odp"),
ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
- uno::Reference< text::XTextField > xField = getTextFieldFromPage(0, 0, 0,
0, xDocShRef);
- CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() );
+ uno::Reference<text::XTextField> xField = getTextFieldFromPage(0, 0, 0, 0,
xDocShRef);
+ CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is());
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testTdf99224()
{
- sd::DrawDocShellRef xShell =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf99224.odp"), ODP);
+ sd::DrawDocShellRef xShell
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf99224.odp"), ODP);
xShell = saveAndReload(xShell.get(), PPTX);
uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell);
// This was 0: the image with text was lost on export.
@@ -994,7 +1090,8 @@ void SdOOXMLExportTest2::testTdf99224()
void SdOOXMLExportTest2::testTdf92076()
{
- sd::DrawDocShellRef xShell =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf92076.odp"), ODP);
+ sd::DrawDocShellRef xShell
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf92076.odp"), ODP);
xShell = saveAndReload(xShell.get(), PPTX);
uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xPage->getCount());
@@ -1003,7 +1100,8 @@ void SdOOXMLExportTest2::testTdf92076()
void SdOOXMLExportTest2::testTdf59046()
{
- sd::DrawDocShellRef xShell =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf59046.odp"), ODP);
+ sd::DrawDocShellRef xShell
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf59046.odp"), ODP);
utl::TempFileNamed tempFile;
xShell = saveAndReload(xShell.get(), PPTX, &tempFile);
xShell->DoClose();
@@ -1013,7 +1111,8 @@ void SdOOXMLExportTest2::testTdf59046()
void SdOOXMLExportTest2::testTdf133502()
{
- sd::DrawDocShellRef xShell =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf133502.odp"),
ODP);
+ sd::DrawDocShellRef xShell
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf133502.odp"),
ODP);
utl::TempFileNamed tempFile;
xShell = saveAndReload(xShell.get(), PPTX, &tempFile);
xShell->DoClose();
@@ -1029,7 +1128,8 @@ void SdOOXMLExportTest2::testTdf133502()
void SdOOXMLExportTest2::testTdf105739()
{
// Gradient was lost during saving to ODP
- sd::DrawDocShellRef xShell =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf105739.pptx"),
PPTX);
+ sd::DrawDocShellRef xShell
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf105739.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xShell = saveAndReload(xShell.get(), ODP, &tempFile);
uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell);
@@ -1038,7 +1138,7 @@ void SdOOXMLExportTest2::testTdf105739()
CPPUNIT_ASSERT(aAny.hasValue());
if (aAny.hasValue())
{
- uno::Reference< beans::XPropertySet > aXBackgroundPropSet;
+ uno::Reference<beans::XPropertySet> aXBackgroundPropSet;
aAny >>= aXBackgroundPropSet;
// Test fill type
@@ -1059,32 +1159,36 @@ void SdOOXMLExportTest2::testTdf105739()
void SdOOXMLExportTest2::testPageBitmapWithTransparency()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/page_transparent_bitmap.pptx"),
PPTX );
+ ::sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/page_transparent_bitmap.pptx"),
PPTX);
- xDocShRef = saveAndReload( xDocShRef.get(), ODP );
- uno::Reference< drawing::XDrawPagesSupplier > xDoc(
- xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "There should be exactly one page",
static_cast<sal_Int32>(1), xDoc->getDrawPages()->getCount() );
+ xDocShRef = saveAndReload(xDocShRef.get(), ODP);
+ uno::Reference<drawing::XDrawPagesSupplier>
xDoc(xDocShRef->GetDoc()->getUnoModel(),
+ uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be exactly one page",
static_cast<sal_Int32>(1),
+ xDoc->getDrawPages()->getCount());
- uno::Reference< drawing::XDrawPage > xPage( getPage( 0, xDocShRef ) );
+ uno::Reference<drawing::XDrawPage> xPage(getPage(0, xDocShRef));
- uno::Reference< beans::XPropertySet > xPropSet( xPage, uno::UNO_QUERY );
- uno::Any aAny = xPropSet->getPropertyValue( "Background" );
+ uno::Reference<beans::XPropertySet> xPropSet(xPage, uno::UNO_QUERY);
+ uno::Any aAny = xPropSet->getPropertyValue("Background");
CPPUNIT_ASSERT_MESSAGE("Slide background is missing", aAny.hasValue());
- uno::Reference< beans::XPropertySet > aXBackgroundPropSet;
+ uno::Reference<beans::XPropertySet> aXBackgroundPropSet;
aAny >>= aXBackgroundPropSet;
sal_Int32 nTransparence;
- aAny = aXBackgroundPropSet->getPropertyValue( "FillTransparence" );
+ aAny = aXBackgroundPropSet->getPropertyValue("FillTransparence");
aAny >>= nTransparence;
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Slide background transparency is wrong",
sal_Int32(49), nTransparence);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Slide background transparency is wrong",
sal_Int32(49),
+ nTransparence);
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testPptmContentType()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTM, &tempFile);
@@ -1092,39 +1196,31 @@ void SdOOXMLExportTest2::testPptmContentType()
xmlDocUniquePtr pXmlContentType = parseExport(tempFile,
"[Content_Types].xml");
assertXPath(pXmlContentType,
"/ContentType:Types/ContentType:Override[@PartName='/ppt/presentation.xml']",
- "ContentType",
-
"application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml");
+ "ContentType",
"application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml");
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testTdf111798()
{
- sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf111798.odp"),
ODP);
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf111798.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml");
- const OUString data[][11] =
- {
- {
- "2700000", "2458080", "2414880", "1439640", "1440000",
- "gd[1]", "adj1", "val 50000",
- "gd[2]", "adj2", "val 25000"
- },
- {
- "2700000", "6778080", "2414880", "1439640", "1440000",
- "gd[1]", "adj1", "val 50000",
- "gd[2]", "adj2", "val 25006"
- }
- };
+ const OUString data[][11] = { { "2700000", "2458080", "2414880",
"1439640", "1440000", "gd[1]",
+ "adj1", "val 50000", "gd[2]", "adj2", "val
25000" },
+ { "2700000", "6778080", "2414880",
"1439640", "1440000", "gd[1]",
+ "adj1", "val 50000", "gd[2]", "adj2", "val
25006" } };
for (size_t nShapeIndex = 0; nShapeIndex < SAL_N_ELEMENTS(data);
nShapeIndex++)
{
size_t nDataIndex = 0;
- const OString sSpPr = "/p:sld/p:cSld/p:spTree/p:sp[" +
OString::number(nShapeIndex + 1) + "]/p:spPr";
+ const OString sSpPr
+ = "/p:sld/p:cSld/p:spTree/p:sp[" + OString::number(nShapeIndex +
1) + "]/p:spPr";
const OString sXfrm = sSpPr + "/a:xfrm";
assertXPath(pXmlDoc, sXfrm, "rot", data[nShapeIndex][nDataIndex++]);
const OString sOff = sXfrm + "/a:off";
@@ -1136,7 +1232,8 @@ void SdOOXMLExportTest2::testTdf111798()
while (nDataIndex < SAL_N_ELEMENTS(data[nShapeIndex]))
{
- const OString sGd = sSpPr + "/a:prstGeom/a:avLst/a:" +
data[nShapeIndex][nDataIndex++].toUtf8() + "";
+ const OString sGd
+ = sSpPr + "/a:prstGeom/a:avLst/a:" +
data[nShapeIndex][nDataIndex++].toUtf8() + "";
assertXPath(pXmlDoc, sGd, "name", data[nShapeIndex][nDataIndex++]);
assertXPath(pXmlDoc, sGd, "fmla", data[nShapeIndex][nDataIndex++]);
}
@@ -1145,11 +1242,14 @@ void SdOOXMLExportTest2::testTdf111798()
void SdOOXMLExportTest2::testPptmVBAStream()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTM, &tempFile);
- uno::Reference<packages::zip::XZipFileAccess2> xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
tempFile.GetURL());
+ uno::Reference<packages::zip::XZipFileAccess2> xNameAccess
+ =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
+ tempFile.GetURL());
// This failed: VBA stream was not roundtripped
CPPUNIT_ASSERT(xNameAccess->hasByName("ppt/vbaProject.bin"));
@@ -1158,20 +1258,24 @@ void SdOOXMLExportTest2::testPptmVBAStream()
void SdOOXMLExportTest2::testTdf111863()
{
- sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111863.pptx"),
PPTX);
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111863.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
// check that transition attribute didn't change from 'out' to 'in'
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animEffect",
- "transition", "out");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/"
+
"p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animEffect",
+ "transition", "out");
}
void SdOOXMLExportTest2::testTdf111518()
{
- sd::DrawDocShellRef xShell =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf111518.pptx"),
PPTX);
+ sd::DrawDocShellRef xShell
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf111518.pptx"),
PPTX);
utl::TempFileNamed tempFile;
tempFile.EnableKillingFile(false);
xShell = saveAndReload(xShell.get(), PPTX, &tempFile);
@@ -1179,103 +1283,148 @@ void SdOOXMLExportTest2::testTdf111518()
xmlDocUniquePtr pXmlDocRels = parseExport(tempFile,
"ppt/slides/slide1.xml");
OUString sActual = getXPath(pXmlDocRels,
-
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animMotion",
- "path");
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/"
+
"p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/"
+ "p:par/p:cTn/p:childTnLst/p:animMotion",
+ "path");
CPPUNIT_ASSERT_MOTIONPATH(u"M -3.54167E-6 -4.81481E-6 L 0.39037 -0.00069
E", sActual);
}
void SdOOXMLExportTest2::testTdf100387()
{
-
- sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf100387.odp"),
ODP);
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf100387.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn", "dur",
"indefinite");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[1]/p:cTn",
"fill", "hold");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[1]/p:cTn/p:childTnLst/p:par/p:cTn",
"fill", "hold");
-
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[1]"
-
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
"st", "0");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[1]"
-
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
"end", "0");
-
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[2]"
-
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
"st", "1");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[2]"
-
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
"end", "1");
-
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[3]"
-
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
"st", "2");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[3]"
-
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
"end", "2");
+ assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn",
+ "dur", "indefinite");
+ assertXPath(
+ pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[1]/p:cTn",
+ "fill", "hold");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+ "p:par[1]/p:cTn/p:childTnLst/p:par/p:cTn",
+ "fill", "hold");
+
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[1]"
+
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/"
+ "p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
+ "st", "0");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[1]"
+
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/"
+ "p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
+ "end", "0");
+
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[2]"
+
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/"
+ "p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
+ "st", "1");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[2]"
+
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/"
+ "p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
+ "end", "1");
+
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[3]"
+
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/"
+ "p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
+ "st", "2");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par[3]"
+
"/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/"
+ "p:cBhvr/p:tgtEl/p:spTgt/p:txEl/p:pRg",
+ "end", "2");
}
// tdf#126746 Add support for Line Caps import and export
void SdOOXMLExportTest2::testClosingShapesAndLineCaps()
{
- sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/closed-shapes.odp"),
ODP);
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/closed-shapes.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:moveTo/a:pt",
1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt",
1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 1);
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:moveTo/a:pt",
+ 1);
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
+ 1);
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt",
+ 1);
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 1);
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:ln",
"cap", "rnd");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:ln/a:miter", 1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:ln",
"cap", "rnd");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:spPr/a:ln/a:miter", 1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:ln",
"cap", "rnd");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:ln/a:miter", 1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[4]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[4]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[4]/p:spPr/a:ln",
"cap", "sq");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[4]/p:spPr/a:ln/a:round", 1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
- assertXPathNoAttribute(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:ln", "cap"); // by default it is
"flat" cap style
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
+ assertXPathNoAttribute(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:ln",
+ "cap"); // by default it is "flat" cap style
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:ln/a:bevel", 1);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[6]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
- assertXPathNoAttribute(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:ln", "cap"); // by default it is
"flat" cap style
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp[6]/p:spPr/a:custGeom/a:pathLst/a:path/a:close", 0);
+ assertXPathNoAttribute(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[5]/p:spPr/a:ln",
+ "cap"); // by default it is "flat" cap style
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[6]/p:spPr/a:ln/a:round", 1);
}
void SdOOXMLExportTest2::testRotateFlip()
{
- sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/rotate_flip.odp"),
ODP);
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/rotate_flip.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- const OUString data[][4] =
- {// flipH flipV x y
- { "0", "1", "1170000", "1035720" },
- { "1", "1", "7108560", "1036440" },
- { "1", "0", "4140000", "1036440" }
+ const OUString data[][4] = { // flipH flipV x y
+ { "0", "1", "1170000", "1035720" },
+ { "1", "1", "7108560", "1036440" },
+ { "1", "0", "4140000", "1036440" }
};
- const OUString points[][2] = { {"221", "293"}, {"506", "12" },
{"367", "0" }, {"29", "406"}, {"431", "347"}, {"145", "645"},
- {"99", "520"}, {"0", "861"},
{"326", "765"}, {"209", "711"}, {"640", "233"}, {"640", "233"} };
+ const OUString points[][2]
+ = { { "221", "293" }, { "506", "12" }, { "367", "0" }, { "29",
"406" },
+ { "431", "347" }, { "145", "645" }, { "99", "520" }, { "0", "861"
},
+ { "326", "765" }, { "209", "711" }, { "640", "233" }, { "640",
"233" } };
for (size_t nShapeIndex = 0; nShapeIndex < SAL_N_ELEMENTS(data);
nShapeIndex++)
{
size_t nDataIndex = 0;
- const OString sSpPr = "/p:sld/p:cSld/p:spTree/p:sp[" +
OString::number(nShapeIndex + 1) + "]/p:spPr";
+ const OString sSpPr
+ = "/p:sld/p:cSld/p:spTree/p:sp[" + OString::number(nShapeIndex +
1) + "]/p:spPr";
const OString sXfrm = sSpPr + "/a:xfrm";
- if(data[nShapeIndex][nDataIndex++] == "1")
+ if (data[nShapeIndex][nDataIndex++] == "1")
assertXPath(pXmlDocContent, sXfrm, "flipH", "1");
- if(data[nShapeIndex][nDataIndex++] == "1")
+ if (data[nShapeIndex][nDataIndex++] == "1")
assertXPath(pXmlDocContent, sXfrm, "flipV", "1");
assertXPath(pXmlDocContent, sXfrm, "rot", "20400000");
const OString sOff = sXfrm + "/a:off";
@@ -1287,7 +1436,8 @@ void SdOOXMLExportTest2::testRotateFlip()
for (size_t nPointIndex = 0; nPointIndex < SAL_N_ELEMENTS(points);
nPointIndex++)
{
- const OString sPt = sSpPr + "/a:custGeom/a:pathLst/a:path/a:lnTo["
+ OString::number(nPointIndex + 1) + "]/a:pt";
+ const OString sPt = sSpPr + "/a:custGeom/a:pathLst/a:path/a:lnTo["
+ + OString::number(nPointIndex + 1) + "]/a:pt";
assertXPath(pXmlDocContent, sPt, "x", points[nPointIndex][0]);
assertXPath(pXmlDocContent, sPt, "y", points[nPointIndex][1]);
}
@@ -1297,106 +1447,149 @@ void SdOOXMLExportTest2::testRotateFlip()
void SdOOXMLExportTest2::testTdf106867()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf106867.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf106867.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
- const SdrPage *pPage = GetPage(1, xDocShRef.get());
+ const SdrPage* pPage = GetPage(1, xDocShRef.get());
// first check that we have the media object
const SdrMediaObj* pMediaObj =
dynamic_cast<SdrMediaObj*>(pPage->GetObj(2));
CPPUNIT_ASSERT_MESSAGE("no media object", pMediaObj != nullptr);
-
CPPUNIT_ASSERT_EQUAL(OUString("vnd.sun.star.Package:ppt/media/media1.avi"),
pMediaObj->getURL());
+ CPPUNIT_ASSERT_EQUAL(OUString("vnd.sun.star.Package:ppt/media/media1.avi"),
+ pMediaObj->getURL());
xDocShRef->DoClose();
// additional checks of the output file
- uno::Reference<packages::zip::XZipFileAccess2> xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
tempFile.GetURL());
+ uno::Reference<packages::zip::XZipFileAccess2> xNameAccess
+ =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
+ tempFile.GetURL());
// check that the document contains the video stream
CPPUNIT_ASSERT(xNameAccess->hasByName("ppt/media/media1.avi"));
// both the ooxml and the extended markup
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:nvPr/a:videoFile");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:nvPr/p:extLst/p:ext/p14:media");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:nvPr/p:extLst/p:ext/p14:media");
// target the shape with the video in the command
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:cmd/p:cBhvr/p:tgtEl/p:spTgt",
- "spid", "42");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/"
+
"p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:cmd/"
+ "p:cBhvr/p:tgtEl/p:spTgt",
+ "spid", "42");
}
void SdOOXMLExportTest2::testTdf112280()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112280.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112280.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
// check the animRot value
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animRot",
- "by", "21600000");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/"
+
"p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animRot",
+ "by", "21600000");
}
void SdOOXMLExportTest2::testTdf112088()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112088.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112088.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
// check gradient stops
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- assertXPathChildren(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:gradFill/a:gsLst", 2);
+ assertXPathChildren(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:gradFill/a:gsLst",
+ 2);
}
void SdOOXMLExportTest2::testTdf112333()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112333.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112333.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- OUString sTo = getXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set[1]/p:to/p:strVal",
"val");
+ OUString sTo = getXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/"
+
"p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/"
+ "p:cTn/p:childTnLst/p:set[1]/p:to/p:strVal",
+ "val");
CPPUNIT_ASSERT_EQUAL(OUString("solid"), sTo);
- OUString sAttributeName = getXPathContent(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set[1]/p:cBhvr/p:attrNameLst/p:attrName");
+ OUString sAttributeName = getXPathContent(
+ pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/"
+
"p:childTnLst/p:set[1]/p:cBhvr/p:attrNameLst/p:attrName");
CPPUNIT_ASSERT_EQUAL(OUString("fill.type"), sAttributeName);
- sTo = getXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set[2]/p:to/p:strVal",
"val");
+ sTo = getXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/"
+ "p:set[2]/p:to/p:strVal",
+ "val");
CPPUNIT_ASSERT_EQUAL(OUString("true"), sTo);
- sAttributeName = getXPathContent(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set[2]/p:cBhvr/p:attrNameLst/p:attrName");
+ sAttributeName = getXPathContent(
+ pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/"
+
"p:childTnLst/p:set[2]/p:cBhvr/p:attrNameLst/p:attrName");
CPPUNIT_ASSERT_EQUAL(OUString("fill.on"), sAttributeName);
- sTo = getXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animClr/p:to/a:srgbClr",
"val");
+ sTo = getXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/"
+ "p:animClr/p:to/a:srgbClr",
+ "val");
CPPUNIT_ASSERT_EQUAL(OUString("0563c1"), sTo);
- sAttributeName = getXPathContent(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animClr/p:cBhvr/p:attrNameLst/p:attrName");
+ sAttributeName = getXPathContent(
+ pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/"
+
"p:childTnLst/p:animClr/p:cBhvr/p:attrNameLst/p:attrName");
CPPUNIT_ASSERT_EQUAL(OUString("fillcolor"), sAttributeName);
}
void SdOOXMLExportTest2::testTdf112552()
{
// Background fill was not displayed, but it was because of the wrong
geometry
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112552.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112552.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path", "w", "21600");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path", "h", "21600");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
"x", "21600");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
"y", "0");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path",
+ "w", "21600");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path",
+ "h", "21600");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
+ "x", "21600");
+ assertXPath(pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
+ "y", "0");
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testTdf112557()
{
// Subtitle shape should be skipped by export.
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112557.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112557.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
@@ -1407,100 +1600,148 @@ void SdOOXMLExportTest2::testTdf112557()
void SdOOXMLExportTest2::testTdf128049()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf128049.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf128049.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:custGeom", 0);
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:prstGeom", "prst", "noSmoking");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:prstGeom/a:avLst/a:gd", "name", "adj");
- assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:prstGeom/a:avLst/a:gd", "fmla", "val
12500");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:prstGeom", "prst",
+ "noSmoking");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:prstGeom/a:avLst/a:gd",
+ "name", "adj");
+ assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:prstGeom/a:avLst/a:gd",
+ "fmla", "val 12500");
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testTdf106026()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf106026.odp"),
ODP);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf106026.odp"),
ODP);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlMasterContent = parseExport(tempFile,
"ppt/slideMasters/slideMaster1.xml");
- assertXPath(pXmlMasterContent,
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[1]/a:pPr/a:spcBef/a:spcPts",
"val", "1417");
- assertXPath(pXmlMasterContent,
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[2]/a:pPr/a:spcBef/a:spcPts",
"val", "1134");
- assertXPath(pXmlMasterContent,
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[3]/a:pPr/a:spcBef/a:spcPts",
"val", "850");
- assertXPath(pXmlMasterContent,
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[4]/a:pPr/a:spcBef/a:spcPts",
"val", "567");
- assertXPath(pXmlMasterContent,
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[5]/a:pPr/a:spcBef/a:spcPts",
"val", "283");
- assertXPath(pXmlMasterContent,
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[6]/a:pPr/a:spcBef/a:spcPts",
"val", "283");
- assertXPath(pXmlMasterContent,
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[7]/a:pPr/a:spcBef/a:spcPts",
"val", "283");
+ assertXPath(pXmlMasterContent,
+
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[1]/a:pPr/a:spcBef/a:spcPts",
"val",
+ "1417");
+ assertXPath(pXmlMasterContent,
+
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[2]/a:pPr/a:spcBef/a:spcPts",
"val",
+ "1134");
+ assertXPath(pXmlMasterContent,
+
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[3]/a:pPr/a:spcBef/a:spcPts",
"val",
+ "850");
+ assertXPath(pXmlMasterContent,
+
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[4]/a:pPr/a:spcBef/a:spcPts",
"val",
+ "567");
+ assertXPath(pXmlMasterContent,
+
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[5]/a:pPr/a:spcBef/a:spcPts",
"val",
+ "283");
+ assertXPath(pXmlMasterContent,
+
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[6]/a:pPr/a:spcBef/a:spcPts",
"val",
+ "283");
+ assertXPath(pXmlMasterContent,
+
"/p:sldMaster/p:cSld/p:spTree/p:sp/p:txBody/a:p[7]/a:pPr/a:spcBef/a:spcPts",
"val",
+ "283");
xmlDocUniquePtr pXmlSlideContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
assertXPath(pXmlSlideContent,
-
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[1]/a:pPr/a:spcAft/a:spcPts",
"val", "11339");
+
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[1]/a:pPr/a:spcAft/a:spcPts", "val",
+ "11339");
assertXPath(pXmlSlideContent,
-
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[2]/a:pPr/a:spcAft/a:spcPts",
"val", "11339");
+
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[2]/a:pPr/a:spcAft/a:spcPts", "val",
+ "11339");
assertXPath(pXmlSlideContent,
-
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[3]/a:pPr/a:spcAft/a:spcPts",
"val", "11339");
+
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[3]/a:pPr/a:spcAft/a:spcPts", "val",
+ "11339");
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testTdf112334()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112334.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112334.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- OUString sAttributeName = getXPathContent(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animClr[1]/p:cBhvr/p:attrNameLst/p:attrName");
+ OUString sAttributeName = getXPathContent(
+ pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/"
+
"p:childTnLst/p:animClr[1]/p:cBhvr/p:attrNameLst/p:attrName");
CPPUNIT_ASSERT_EQUAL(OUString("style.color"), sAttributeName);
}
void SdOOXMLExportTest2::testTdf112089()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112089.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112089.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- OUString sID = getXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:graphicFrame/p:nvGraphicFramePr/p:cNvPr", "id");
- OUString sTarget = getXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt",
"spid");
+ OUString sID = getXPath(
+ pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:graphicFrame/p:nvGraphicFramePr/p:cNvPr", "id");
+ OUString sTarget = getXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/"
+
"p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:set/p:cBhvr/p:tgtEl/p:spTgt",
+ "spid");
CPPUNIT_ASSERT_EQUAL(sID, sTarget);
}
void SdOOXMLExportTest2::testTdf112086()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112086.pptx"),
PPTX);
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112086.pptx"),
PPTX);
utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- OUString sVal = getXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:anim[2]/p:tavLst/p:tav/p:val/p:fltVal",
"val");
+ OUString sVal = getXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/"
+
"p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/"
+
"p:cTn/p:childTnLst/p:anim[2]/p:tavLst/p:tav/p:val/p:fltVal",
+ "val");
CPPUNIT_ASSERT_EQUAL(OUString("0"), sVal);
- OUString sAttributeName = getXPathContent(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:anim[1]/p:cBhvr/p:attrNameLst/p:attrName");
+ OUString sAttributeName = getXPathContent(
+ pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/"
+
"p:childTnLst/p:anim[1]/p:cBhvr/p:attrNameLst/p:attrName");
CPPUNIT_ASSERT_EQUAL(OUString("ppt_w"), sAttributeName);
- sVal = getXPath(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:anim[2]/p:tavLst/p:tav/p:val/p:fltVal",
"val");
+ sVal = getXPath(pXmlDocContent,
+
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/"
+ "p:anim[2]/p:tavLst/p:tav/p:val/p:fltVal",
+ "val");
CPPUNIT_ASSERT_EQUAL(OUString("0"), sVal);
- sAttributeName = getXPathContent(pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:anim[2]/p:cBhvr/p:attrNameLst/p:attrName");
+ sAttributeName = getXPathContent(
+ pXmlDocContent,
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/"
+
"p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/"
+
"p:childTnLst/p:anim[2]/p:cBhvr/p:attrNameLst/p:attrName");
CPPUNIT_ASSERT_EQUAL(OUString("ppt_h"), sAttributeName);
xDocShRef->DoClose();
}
void SdOOXMLExportTest2::testTdf112647()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112647.odp"), ODP);
- xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
- uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0,
xDocShRef ) );
- uno::Reference<text::XTextRange> xParagraph( getParagraphFromShape( 0,
xShape ) );
- uno::Reference< beans::XPropertySet > xPropSet( xParagraph,
uno::UNO_QUERY_THROW );
+ ::sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112647.odp"),
ODP);
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
+ uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
+ uno::Reference<text::XTextRange> xParagraph(getParagraphFromShape(0,
xShape));
... etc. - the rest is truncated
