diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-25 11:54:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-25 11:55:54 +0100 |
| commit | 46a0c8761e07226389bb2afef54817f51879e27d (patch) | |
| tree | 148bf0f7c4bf27bbee62c5de3e080428a40f177f /sd/qa | |
| parent | eb9c04ed215f9b12584c6e254c36303c6b3865ed (diff) | |
Revert "tdf#90174 FILESAVE: export of bullet color for pptx"
This reverts commit 8707670cb39f5777cd54f8b180ec342416ef259f (plus follow-up
53e89ab25c0cd7df1b900a2e1048cfa402ea4353 "WaE: uninitialized nBulletColor") as
it broke CppunitTest_sd_export_tests.
Change-Id: Ib7433ba6e43b2f90767b0333dceb0f732d6659df
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/data/pptx/bulletColor.pptx | bin | 32946 -> 0 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 28 |
2 files changed, 0 insertions, 28 deletions
diff --git a/sd/qa/unit/data/pptx/bulletColor.pptx b/sd/qa/unit/data/pptx/bulletColor.pptx Binary files differdeleted file mode 100644 index 61bb834e4a6c..000000000000 --- a/sd/qa/unit/data/pptx/bulletColor.pptx +++ /dev/null diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 938615901b1d..d6645dd809e1 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -84,7 +84,6 @@ public: void testLinkedGraphicRT(); void testImageWithSpecialID(); void testTableCellFillProperties(); - void testBulletColor(); #if !defined WNT void testBnc822341(); #endif @@ -108,7 +107,6 @@ public: CPPUNIT_TEST(testLinkedGraphicRT); CPPUNIT_TEST(testImageWithSpecialID); CPPUNIT_TEST(testTableCellFillProperties); - CPPUNIT_TEST(testBulletColor); #if !defined WNT CPPUNIT_TEST(testBnc822341); #endif @@ -822,32 +820,6 @@ void SdExportTest::testBnc822341() #endif -void SdExportTest::testBulletColor() -{ - ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/pptx/bulletColor.pptx"), PPTX ); - - xDocShRef = saveAndReload( xDocShRef, PPTX ); - - uno::Reference< drawing::XDrawPagesSupplier > xDoc( - xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); - - uno::Reference< drawing::XDrawPage > xPage( - xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); - SdDrawDocument *pDoc = xDocShRef->GetDoc(); - CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL ); - - const SdrPage *pPage = pDoc->GetPage(1); - CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL ); - - SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>( pPage->GetObj(0) ); - CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != NULL); - - const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject(); - const SvxNumBulletItem *pNumFmt = dynamic_cast<const SvxNumBulletItem *>(aEdit.GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET)); - CPPUNIT_ASSERT(pNumFmt); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's color is wrong!", sal_uInt32(0xff0000),pNumFmt->GetNumRule()->GetLevel(0).GetBulletColor().GetColor()); -} - CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); |