[Libreoffice-commits] core.git: 2 commits - chart2/qa oox/source sc/source

[Matúš Kukan]

 chart2/qa/extras/chart2import.cxx              |   15 +++++++++++++++
 chart2/qa/extras/data/pptx/bnc882383.pptx      |binary
 oox/source/drawingml/chart/objectformatter.cxx |    2 +-
 sc/source/filter/oox/workbookhelper.cxx        |    2 --
 4 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 344a596acc29163a9f49e1e6080041a3a9644eee
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Jul 3 14:07:12 2014 +0200

    bnc#882383: Add chart unit test for GradientName property.
    
    It needs to be set, so that the chart has colors. It was grey before.
    The bug was fixed already in aacfd5038d05a02f8b1eade3a5896d3d7e959f3d,
    which got pushed sooner, so this commit only changes
    the property name from 'INVALID' to 'FillTransparenceGradientName'.
    
    Change-Id: If06899258a4307d583480538338480ba5bb830b9

diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index d83e8c2..e0728ed 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -43,6 +43,7 @@ public:
     void testPPTChartSeries();
     void testODPChartSeries();
     void testBnc864396();
+    void testBnc882383();
     void testSimpleStrictXLSX();
     void testDelayedCellImport(); // chart range referencing content on later sheets
     void testFlatODSStackedColumnChart();
@@ -71,6 +72,7 @@ public:
     CPPUNIT_TEST(testPPTXHiddenDataSeries);
     CPPUNIT_TEST(testODPChartSeries);
     CPPUNIT_TEST(testBnc864396);
+    CPPUNIT_TEST(testBnc882383);
     CPPUNIT_TEST(testSimpleStrictXLSX);
     CPPUNIT_TEST(testDelayedCellImport);
     CPPUNIT_TEST(testFlatODSStackedColumnChart);
@@ -388,6 +390,19 @@ void Chart2ImportTest::testBnc864396()
     }
 }
 
+void Chart2ImportTest::testBnc882383()
+{
+    load("/chart2/qa/extras/data/pptx/", "bnc882383.pptx");
+    uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY_THROW);
+    uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
+    CPPUNIT_ASSERT(xDataSeries.is());
+
+    uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+    OUString sGradientName;
+    xPropertySet->getPropertyValue("GradientName") >>= sGradientName;
+    CPPUNIT_ASSERT(!sGradientName.isEmpty());
+}
+
 void Chart2ImportTest::testSimpleStrictXLSX()
 {
     load("/chart2/qa/extras/data/xlsx/", "strict_chart.xlsx");
diff --git a/chart2/qa/extras/data/pptx/bnc882383.pptx b/chart2/qa/extras/data/pptx/bnc882383.pptx
new file mode 100644
index 0000000..18b44f0
Binary files /dev/null and b/chart2/qa/extras/data/pptx/bnc882383.pptx differ
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index dd54c7d..1fe5c75 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -494,7 +494,7 @@ static const sal_Int32 spnFilledPropIds[] =
     PROP_FillStyle,
     PROP_Color,
     PROP_Transparency,
-    PROP_INVALID,
+    PROP_FillTransparenceGradientName,
     PROP_GradientName,
     PROP_FillBitmapName,
     PROP_FillBitmapMode,
commit d3b7252769edb502e33d6b487764ac9d0a9f487d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Fri Jul 4 15:48:02 2014 +0200

    remove unused include
    
    Change-Id: Ia5a12fed570fcfc0db4e8080dd6cf3c2714293ab

diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 3ebf702..048f754 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <osl/thread.h>
-#include <oox/drawingml/theme.hxx>
 #include <oox/helper/progressbar.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/ole/vbaproject.hxx>
@@ -102,7 +101,6 @@ using namespace ::com::sun::star::uno;
 using ::oox::core::FilterBase;
 using ::oox::core::FragmentHandler;
 using ::oox::core::XmlFilterBase;
-using ::oox::drawingml::Theme;
 
 bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rName2 ) const
 {