[Libreoffice-commits] core.git: Branch 'feature/chart-sidebar' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/controller/sidebar/ChartAreaPanel.cxx |   16 +++++++++++++++-
 chart2/source/tools/FillProperties.cxx              |    7 +++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit d4850a2fd3d509b138ada911dfcc7d737993ce8e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jul 25 01:55:36 2015 +0200

    handle chart wall correctly in area panel
    
    Change-Id: Iacd9498884a20357f217e1165a3422b6f1e2aa81

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 9343499..7f5077f 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -42,7 +42,21 @@ css::uno::Reference<css::beans::XPropertySet> getPropSet(
         css::uno::Reference<css::frame::XModel> xModel)
 {
     OUString aCID = getCID(xModel);
-    return ObjectIdentifier::getObjectPropertySet(aCID, xModel);
+    css::uno::Reference<css::beans::XPropertySet> xPropSet =
+        ObjectIdentifier::getObjectPropertySet(aCID, xModel);
+
+    ObjectType eType = ObjectIdentifier::getObjectType(aCID);
+    if (eType == OBJECTTYPE_DIAGRAM)
+    {
+        css::uno::Reference<css::chart2::XDiagram> xDiagram(
+                xPropSet, css::uno::UNO_QUERY);
+        if (!xDiagram.is())
+            return xPropSet;
+
+        xPropSet.set(xDiagram->getWall());
+    }
+
+    return xPropSet;
 }
 
 ChartController* getController(css::uno::Reference<css::frame::XModel> xModel)
commit 5a43c5402664bafc4f3ff2d78aa8438cdb279262
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jul 25 01:31:50 2015 +0200

    provide a few more common property names
    
    Change-Id: I574af7999f8a76457dd61e66854db191b8876dfa

diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 123275f..37b4a8f 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -60,6 +60,13 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
+        Property( "Transparency",
+                  FillProperties::PROP_FILL_TRANSPARENCE,
+                  cppu::UnoType<sal_Int16>::get(),
+                  beans::PropertyAttribute::BOUND
+                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+    rOutProperties.push_back(
         Property( "FillTransparence",
                   FillProperties::PROP_FILL_TRANSPARENCE,
                   cppu::UnoType<sal_Int16>::get(),