[Libreoffice-commits] core.git: oox/source sd/qa

[Stephan Bergmann]

 dev/null                        |binary
 oox/source/export/drawingml.cxx |   12 ------------
 sd/qa/unit/export-tests.cxx     |   28 ----------------------------
 3 files changed, 40 deletions(-)

New commits:
commit 46a0c8761e07226389bb2afef54817f51879e27d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 25 11:54:44 2015 +0100

    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

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2deda44..0c732fd 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1610,7 +1610,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
     bool bHasFontDesc = false;
     OUString aGraphicURL;
     sal_Int16 nBulletRelSize = 0;
-    sal_Int32 nBulletColor = 0;
 
     for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
     {
@@ -1635,10 +1634,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
                 else if( *(OUString*)pValue == ")")
                     bPBehind = true;
             }
-            else if(aPropName == "BulletColor")
-            {
-                nBulletColor = *( (sal_Int32*)pValue );
-            }
             else if ( aPropName == "BulletChar" )
             {
                 aBulletChar = OUString ( *( (OUString*)pValue ) )[ 0 ];
@@ -1693,13 +1688,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
     }
     else
     {
-        if (nBulletColor)
-        {
-               mpFS->startElementNS( XML_a, XML_buClr, FSEND );
-               WriteColor( nBulletColor );
-               mpFS->endElementNS( XML_a, XML_buClr );
-        }
-
         if( nBulletRelSize && nBulletRelSize != 100 )
             mpFS->singleElementNS( XML_a, XML_buSzPct,
                                    XML_val, IS( std::max( (sal_Int32)25000, std::min( (sal_Int32)400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND );
diff --git a/sd/qa/unit/data/pptx/bulletColor.pptx b/sd/qa/unit/data/pptx/bulletColor.pptx
deleted file mode 100644
index 61bb834..0000000
Binary files a/sd/qa/unit/data/pptx/bulletColor.pptx and /dev/null differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 9386159..d6645dd 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();