sd/qa/unit/export-tests-ooxml1.cxx | 31 ++---------
sd/qa/unit/export-tests-ooxml2.cxx | 31 ++---------
sd/qa/unit/export-tests-ooxml3.cxx | 5 -
sd/qa/unit/export-tests.cxx | 96 ++++++++-----------------------------
sd/qa/unit/import-tests.cxx | 18 +-----
sd/qa/unit/sdmodeltestbase.hxx | 6 --
6 files changed, 39 insertions(+), 148 deletions(-)
New commits:
commit a4da4dc147df0f753a08a6bd302c86d3bc591229
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Oct 31 13:16:56 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Oct 31 21:36:13 2022 +0100
sd: Simplify code
Change-Id: I507064c9543729473fed41f1463e09146e31a715
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142074
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index 276d8d4d5cb5..93234b2bb794 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -450,10 +450,7 @@ void SdOOXMLExportTest1::testTdf142648()
{
loadFromURL(u"pptx/tdf142648.pptx");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDPS(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDPS(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPages> xDrawPages(xDPS->getDrawPages(),
uno::UNO_SET_THROW);
uno::Reference<drawing::XDrawPage> xDrawPage;
xDrawPages->getByIndex(0) >>= xDrawPage;
@@ -1318,10 +1315,7 @@ void SdOOXMLExportTest1::testTdf94238()
// Load document and export it to a temporary file.
loadFromURL(u"pptx/tdf94238.pptx");
utl::TempFileNamed tempFile = save("Impress Office Open XML");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
@@ -1354,10 +1348,7 @@ void SdOOXMLExportTest1::testPictureTransparency()
// Load document and export it to a temporary file.
loadFromURL(u"odp/image_transparency.odp");
utl::TempFileNamed tempFile = save("Impress Office Open XML");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
@@ -1389,10 +1380,7 @@ void SdOOXMLExportTest1::testRoundtripOwnLineStyles()
{
// Load odp document and read the LineDash values.
loadFromURL(u"odp/LineStylesOwn.odp");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDocodp(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDocodp(mxComponent,
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDocodp.is());
uno::Reference<drawing::XDrawPage>
xPageodp(xDocodp->getDrawPages()->getByIndex(0),
uno::UNO_QUERY);
@@ -1407,10 +1395,7 @@ void SdOOXMLExportTest1::testRoundtripOwnLineStyles()
// Save to pptx, reload and compare the LineDash values
utl::TempFileNamed tempFile = save("Impress Office Open XML");
- pXImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDocpptx(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDocpptx(mxComponent,
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDocpptx.is());
uno::Reference<drawing::XDrawPage>
xPagepptx(xDocpptx->getDrawPages()->getByIndex(0),
uno::UNO_QUERY);
@@ -1451,13 +1436,9 @@ void SdOOXMLExportTest1::testRoundtripPrstDash()
CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong prstDash", sOriginal[i], sResaved);
}
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
-
// tdf#126746: Make sure that dash-dot pattern starts with the longer
dash, as defined in OOXML
// Make sure Style is drawing::DashStyle_RECTRELATIVE
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xPage.is());
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 493d6be5b64c..900a4040c0df 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -465,11 +465,7 @@ void SdOOXMLExportTest2::testTdf126324()
{
loadFromURL(u"pptx/tdf126324.pptx");
saveAndReload("Impress Office Open XML");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
-
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xPage.is());
uno::Reference<beans::XPropertySet> xShape(getShape(0, xPage));
@@ -613,10 +609,7 @@ void SdOOXMLExportTest2::testExportTransitionsPPTX()
{
loadFromURL(u"AllTransitions.odp");
saveAndReload("Impress Office Open XML");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
// WIPE TRANSITIONS
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 01, TransitionType::BARWIPE,
@@ -800,11 +793,8 @@ 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.
loadFromURL(u"empty.fodp");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
uno::Reference<drawing::XDrawPage> xPage1(getPage(0));
- uno::Reference<css::lang::XMultiServiceFactory>
xFactory(pDoc->getUnoModel(), uno::UNO_QUERY);
+ uno::Reference<css::lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
uno::Reference<drawing::XShape> xShape1(
xFactory->createInstance("com.sun.star.drawing.CustomShape"),
uno::UNO_QUERY);
xPage1->add(xShape1);
@@ -818,10 +808,7 @@ void SdOOXMLExportTest2::testTdf92527()
saveAndReload("Impress Office Open XML");
- pXImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc2(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc2(mxComponent,
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);
@@ -1071,10 +1058,7 @@ void SdOOXMLExportTest2::testPageBitmapWithTransparency()
loadFromURL(u"pptx/page_transparent_bitmap.pptx");
saveAndReload("impress8");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be exactly one page",
static_cast<sal_Int32>(1),
xDoc->getDrawPages()->getCount());
@@ -1915,10 +1899,7 @@ void SdOOXMLExportTest2::testTdf59323_slideFooters()
utl::TempFileNamed tempFile = save("Impress Office Open XML");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDoc->getDrawPages()->getCount());
for (int nPageIndex = 0; nPageIndex < 3; nPageIndex++)
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx
b/sd/qa/unit/export-tests-ooxml3.cxx
index 9f4aec9ad41d..a4e5d882d8e6 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -1399,10 +1399,7 @@ void SdOOXMLExportTest3::testTdf127379()
{
loadFromURL(u"odp/tdf127379.odp");
saveAndReload("Impress Office Open XML");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDoc->getDrawPages()->getCount());
uno::Reference<drawing::XDrawPage> xPage(getPage(0));
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 61cfab3288bd..14fe41e2099f 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -157,15 +157,16 @@ public:
{
XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
}
+
+private:
+ uno::Reference<awt::XBitmap> getBitmapFromTable(OUString const& rName);
};
-namespace
-{
-uno::Reference<awt::XBitmap> getBitmapFromTable(SdDrawDocument* pDoc, OUString
const& rName)
+uno::Reference<awt::XBitmap> SdExportTest::getBitmapFromTable(OUString const&
rName)
{
uno::Reference<awt::XBitmap> xBitmap;
- uno::Reference<css::lang::XMultiServiceFactory>
xFactory(pDoc->getUnoModel(), uno::UNO_QUERY);
+ uno::Reference<css::lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
try
{
@@ -183,7 +184,6 @@ uno::Reference<awt::XBitmap>
getBitmapFromTable(SdDrawDocument* pDoc, OUString c
return xBitmap;
}
-}
void SdExportTest::testBackgroundImage()
{
@@ -196,11 +196,7 @@ void SdExportTest::testBackgroundImage()
// Check that imported background image from PPTX exists
{
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE("not exactly one page",
static_cast<sal_Int32>(1),
xDoc->getDrawPages()->getCount());
uno::Reference<drawing::XDrawPage> xPage(getPage(0));
@@ -217,7 +213,7 @@ void SdExportTest::testBackgroundImage()
CPPUNIT_ASSERT_EQUAL_MESSAGE("Slide Background is not imported from
PPTX correctly",
OUString("msFillBitmap 1"), bgImageName);
- uno::Reference<awt::XBitmap> xBitmap = getBitmapFromTable(pDoc,
bgImageName);
+ uno::Reference<awt::XBitmap> xBitmap = getBitmapFromTable(bgImageName);
CPPUNIT_ASSERT_MESSAGE("Slide Background Bitmap is missing when
imported from PPTX",
xBitmap.is());
}
@@ -225,11 +221,7 @@ void SdExportTest::testBackgroundImage()
// Save as PPTX, reload and check again so we make sure exporting to PPTX
is working correctly
{
saveAndReload("Impress Office Open XML");
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE("not exactly one page",
static_cast<sal_Int32>(1),
xDoc->getDrawPages()->getCount());
uno::Reference<drawing::XDrawPage> xPage(getPage(0));
@@ -246,7 +238,7 @@ void SdExportTest::testBackgroundImage()
CPPUNIT_ASSERT_EQUAL_MESSAGE("Slide Background is not exported from
PPTX correctly",
OUString("msFillBitmap 1"), bgImageName);
- uno::Reference<awt::XBitmap> xBitmap = getBitmapFromTable(pDoc,
bgImageName);
+ uno::Reference<awt::XBitmap> xBitmap = getBitmapFromTable(bgImageName);
CPPUNIT_ASSERT_MESSAGE("Slide Background Bitmap is missing when
exported from PPTX",
xBitmap.is());
}
@@ -254,11 +246,7 @@ void SdExportTest::testBackgroundImage()
// Save as ODP, reload and check again so we make sure exporting and
importing to ODP is working correctly
{
saveAndReload("impress8");
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE("not exactly one page",
static_cast<sal_Int32>(1),
xDoc->getDrawPages()->getCount());
uno::Reference<drawing::XDrawPage> xPage(getPage(0));
@@ -276,7 +264,7 @@ void SdExportTest::testBackgroundImage()
"Slide Background is not exported or imported from ODP correctly",
OUString("msFillBitmap 1"), bgImageName);
- uno::Reference<awt::XBitmap> xBitmap = getBitmapFromTable(pDoc,
bgImageName);
+ uno::Reference<awt::XBitmap> xBitmap = getBitmapFromTable(bgImageName);
CPPUNIT_ASSERT_MESSAGE(
"Slide Background Bitmap is missing when exported or imported from
ODP", xBitmap.is());
}
@@ -544,11 +532,7 @@ void SdExportTest::testSwappedOutImageExport()
saveAndReload(vFormat[i]);
// Check whether graphic exported well after it was swapped out
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(pDoc->getUnoModel(),
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_cast<sal_Int32>(2),
xDrawPagesSupplier->getDrawPages()->getCount());
@@ -688,11 +672,7 @@ void SdExportTest::testTdf80020()
{
loadFromURL(u"odp/tdf80020.odp");
{
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- sd::DrawDocShell* pDocShell = pXImpressDocument->GetDocShell();
- uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(pDocShell->GetModel(),
+ uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XNameAccess> xStyleFamilies
= xStyleFamiliesSupplier->getStyleFamilies();
@@ -702,10 +682,7 @@ void SdExportTest::testTdf80020()
CPPUNIT_ASSERT_EQUAL(OUString("text"), xStyle->getParentStyle());
saveAndReload("impress8");
}
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- sd::DrawDocShell* pDocShell = pXImpressDocument->GetDocShell();
- uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(pDocShell->GetModel(),
+ uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XNameAccess> xStyleFamilies
= xStyleFamiliesSupplier->getStyleFamilies();
@@ -719,11 +696,7 @@ void SdExportTest::testTdf128985()
{
loadFromURL(u"odp/tdf128985.odp");
{
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- sd::DrawDocShell* pDocShell = pXImpressDocument->GetDocShell();
- uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(pDocShell->GetModel(),
+ uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XNameAccess> xStyleFamilies
= xStyleFamiliesSupplier->getStyleFamilies();
@@ -740,11 +713,7 @@ void SdExportTest::testTdf128985()
saveAndReload("impress8");
}
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- sd::DrawDocShell* pDocShell = pXImpressDocument->GetDocShell();
-
- uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(pDocShell->GetModel(),
+ uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XNameAccess> xStyleFamilies
= xStyleFamiliesSupplier->getStyleFamilies();
@@ -874,11 +843,7 @@ void SdExportTest::testImageWithSpecialID()
saveAndReload(vFormat[i]);
// Check whether graphic was exported well
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(pDoc->getUnoModel(),
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_cast<sal_Int32>(2),
xDrawPagesSupplier->getDrawPages()->getCount());
@@ -1111,10 +1076,7 @@ void SdExportTest::testPageWithTransparentBackground()
loadFromURL(u"odp/page_transparent_background.odp");
saveAndReload("impress8");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be exactly one page",
static_cast<sal_Int32>(1),
xDoc->getDrawPages()->getCount());
@@ -1546,10 +1508,7 @@ void SdExportTest::testMasterPageBackgroundFullSize()
// BackgroundFullSize exists on master pages only
// (note: this document can't be created with the UI because UI keeps
// page margins and the flag synchronized across all master pages)
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XMasterPagesSupplier> xMPS(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XMasterPagesSupplier> xMPS(mxComponent,
uno::UNO_QUERY);
uno::Reference<drawing::XDrawPages> xMPs(xMPS->getMasterPages());
Color nFillColor;
{
@@ -1625,10 +1584,7 @@ void SdExportTest::testMasterPageBackgroundFullSize()
utl::TempFileNamed tempFile = saveAndReload("impress8");
- pXImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- pDoc = pXImpressDocument->GetDoc();
- xMPS.set(pDoc->getUnoModel(), uno::UNO_QUERY);
+ xMPS.set(mxComponent, uno::UNO_QUERY);
xMPs.set(xMPS->getMasterPages());
{
uno::Reference<beans::XPropertySet> xMP(xMPs->getByIndex(0),
uno::UNO_QUERY);
@@ -1737,11 +1693,7 @@ void SdExportTest::testColumnsODG()
loadFromURL(u"odg/two_columns.odg");
{
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(pDoc->getUnoModel(),
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPages> xPages =
xDrawPagesSupplier->getDrawPages();
uno::Reference<drawing::XDrawPage> xPage(xPages->getByIndex(0),
uno::UNO_QUERY_THROW);
@@ -1765,11 +1717,7 @@ void SdExportTest::testColumnsODG()
utl::TempFileNamed tempFile = saveAndReload("draw8");
{
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(pDoc->getUnoModel(),
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPages> xPages =
xDrawPagesSupplier->getDrawPages();
uno::Reference<drawing::XDrawPage> xPage(xPages->getByIndex(0),
uno::UNO_QUERY_THROW);
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index a751c8729991..8f36b016a75b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -1098,9 +1098,6 @@ void SdImportTest::testTdf97808()
{
loadFromURL(u"tdf97808.fodp");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- sd::DrawDocShell* pDocShell = pXImpressDocument->GetDocShell();
uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XNameAccess> xStyleFamilies
@@ -1114,8 +1111,7 @@ void SdImportTest::testTdf97808()
CPPUNIT_ASSERT_EQUAL(OUString("Arrow"), lineend);
// the draw:marker-end="" did not override the style
- uno::Reference<drawing::XDrawPagesSupplier>
xDoc(pDocShell->GetDoc()->getUnoModel(),
- uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(0),
uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xLine(xPage->getByIndex(0),
uno::UNO_QUERY_THROW);
@@ -1709,11 +1705,7 @@ void SdImportTest::testPDFImportShared()
void SdImportTest::testPDFImport()
{
loadFromURL(u"pdf/txtpic.pdf");
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier>
xDoc(xDocShRef->GetDoc()->getUnoModel(),
- uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(0),
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE("no exactly two shapes",
static_cast<sal_Int32>(2),
@@ -1731,11 +1723,7 @@ void SdImportTest::testPDFImportSkipImages()
pParams->Put(SfxStringItem(SID_FILE_FILTEROPTIONS, "SkipImages"));
loadFromURL(u"pdf/txtpic.pdf"), PDF, pParams);
- SdXImpressDocument* pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier>
xDoc(xDocShRef->GetDoc()->getUnoModel(),
- uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(0),
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL_MESSAGE("no exactly one shape",
static_cast<sal_Int32>(1),
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 00d4eb317554..e71cae25b153 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -53,11 +53,7 @@ public:
uno::Reference<drawing::XDrawPage> getPage(int nPage)
{
- SdXImpressDocument* pXImpressDocument
- = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
- CPPUNIT_ASSERT(pXImpressDocument);
- SdDrawDocument* pDoc = pXImpressDocument->GetDoc();
- uno::Reference<drawing::XDrawPagesSupplier> xDoc(pDoc->getUnoModel(),
uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
uno::Reference<drawing::XDrawPage>
xPage(xDoc->getDrawPages()->getByIndex(nPage),
uno::UNO_QUERY_THROW);
