From df5e24fa7d085508a0929c9213a515af344485e2 Mon Sep 17 00:00:00 2001
From: Ingrid Halama <iha@openoffice.org>
Date: Tue, 16 Nov 2010 15:03:23 +0100
Subject: chart52: #28670# make the legend within charts resizeable - part 1 -
 patch from hackfest2010

---
 chart2/source/model/main/Legend.cxx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'chart2/source/model/main/Legend.cxx')

diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index c1143ecdf77a..9949f768a642 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart2/LegendExpansion.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
+#include <com/sun/star/chart2/RelativeSize.hpp>
 
 #include <algorithm>
 
@@ -66,7 +67,8 @@ enum
     PROP_LEGEND_PREFERRED_EXPANSION,
     PROP_LEGEND_SHOW,
     PROP_LEGEND_REF_PAGE_SIZE,
-    PROP_LEGEND_REL_POS
+    PROP_LEGEND_REL_POS,
+    PROP_LEGEND_REL_SIZE
 };
 
 void lcl_AddPropertiesToVector(
@@ -105,6 +107,15 @@ void lcl_AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
+
+
+    rOutProperties.push_back(
+        Property( C2U( "RelativeSize" ),
+                  PROP_LEGEND_REL_SIZE,
+                  ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)),
+                  beans::PropertyAttribute::BOUND
+                  | beans::PropertyAttribute::MAYBEVOID ));
+
 }
 
 void lcl_AddDefaultsToMap(
-- 
cgit 


From 0e685f0d9f64e57367cbc0a369885dad894d41d5 Mon Sep 17 00:00:00 2001
From: "Ingrid Halama [iha]" <Ingrid.Halama@oracle.com>
Date: Mon, 24 Jan 2011 17:44:18 +0100
Subject: chart52: #28670# make the legend within charts resizeable - part 2

---
 chart2/source/model/main/Legend.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'chart2/source/model/main/Legend.cxx')

diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 9949f768a642..1408bcb91012 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/chart2/LegendPosition.hpp>
-#include <com/sun/star/chart2/LegendExpansion.hpp>
+#include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
 
@@ -64,7 +64,7 @@ static const OUString lcl_aServiceName(
 enum
 {
     PROP_LEGEND_ANCHOR_POSITION,
-    PROP_LEGEND_PREFERRED_EXPANSION,
+    PROP_LEGEND_EXPANSION,
     PROP_LEGEND_SHOW,
     PROP_LEGEND_REF_PAGE_SIZE,
     PROP_LEGEND_REL_POS,
@@ -83,8 +83,8 @@ void lcl_AddPropertiesToVector(
 
     rOutProperties.push_back(
         Property( C2U( "Expansion" ),
-                  PROP_LEGEND_PREFERRED_EXPANSION,
-                  ::getCppuType( reinterpret_cast< const chart2::LegendExpansion * >(0)),
+                  PROP_LEGEND_EXPANSION,
+                  ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartLegendExpansion * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
@@ -122,7 +122,7 @@ void lcl_AddDefaultsToMap(
     ::chart::tPropertyValueMap & rOutMap )
 {
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_ANCHOR_POSITION, chart2::LegendPosition_LINE_END );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_PREFERRED_EXPANSION, chart2::LegendExpansion_HIGH );
+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_EXPANSION, ::com::sun::star::chart::ChartLegendExpansion_HIGH );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LEGEND_SHOW, true );
 
     float fDefaultCharHeight = 10.0;
-- 
cgit