diff options
| author | Release Engineers <releng@openoffice.org> | 2009-08-26 09:55:20 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-08-26 09:55:20 +0000 |
| commit | d83d12839460b1cd0f5e9d495be3724f336f21a5 (patch) | |
| tree | fb3d246d65fb64cb6e63c16c2091ba50f91935aa /chart2/source/inc | |
| parent | 546fcd1cb956034d0652b4b8a27ca9cab2300bf0 (diff) | |
CWS-TOOLING: integrate CWS fillednetchart
2009-07-22 17:48:07 +0200 oc r274255 : #i103584# new testcase for fillednetchart added
2009-07-22 17:42:41 +0200 oc r274254 : #i103584# Case 8 set to maximum 4 because of new fillednetchart
2009-07-13 17:29:40 +0200 iha r273946 : CWS-TOOLING: rebase CWS fillednetchart to trunk@273858 (milestone: DEV300:m52)
2009-07-03 15:04:36 +0200 dr r273704 : #i102667# import/export of filled radar charts
2009-07-03 09:50:28 +0200 dr r273680 : #i102677# import filled radar charts from MSOOXML
2009-06-11 18:21:05 +0200 iha r272896 : #i64752# filled net chart
2009-06-11 17:30:46 +0200 iha r272892 : #i64752# filled net chart
2009-06-11 17:07:11 +0200 iha r272889 : #i64752# filled net chart
2009-06-11 16:25:01 +0200 iha r272883 : #i64752# filled net chart
2009-06-11 16:15:10 +0200 iha r272878 : #i64752# filled net chart
Diffstat (limited to 'chart2/source/inc')
| -rw-r--r-- | chart2/source/inc/ChartTypeHelper.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/inc/CommonConverters.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/inc/Strings.hrc | 3 | ||||
| -rw-r--r-- | chart2/source/inc/servicenames_charttypes.hxx | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index df43e24a9482..9c5cdafe49f2 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -83,6 +83,8 @@ public: static sal_Int32 getNumberOfDisplayedSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nNumberOfSeries ); SAL_DLLPRIVATE static bool noBordersForSimpleScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static bool isSeriesInFrontOfAxisLine( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static sal_Int32 //one of ::com::sun::star::chart2::AxisType getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType , sal_Int32 nDimensionIndex ); diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index 102ffde71918..493c4d2096e2 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -121,6 +121,10 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::Position3D getPointFromPoly( , sal_Int32 nPointIndex, sal_Int32 nPolyIndex=0 ); //----------------------------------------------------------------------------- +OOO_DLLPUBLIC_CHARTTOOLS +void addPolygon( com::sun::star::drawing::PolyPolygonShape3D& rRet + , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); +//----------------------------------------------------------------------------- /** PolyPolygonShape3D + PolyPolygonShape3D -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index 133f5bcc255b..1092efe6e900 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -33,7 +33,7 @@ // this includes no link dependency #include <svtools/solar.hrc> -//next free is 285 +//next free is 286 //single free is: 134 //#define RID_APP_START 30000 @@ -100,6 +100,7 @@ #define STR_STACKED (RID_APP_START + 11) #define STR_PERCENT (RID_APP_START + 12) #define STR_DEEP (RID_APP_START + 13) +#define STR_FILLED (RID_APP_START + 285) #define STR_DONUT (RID_APP_START + 8) #define STR_TYPE_PIE (RID_APP_START + 187) diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 1c2782de3852..1e824798fa66 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -42,6 +42,7 @@ namespace chart #define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString::createFromAscii("com.sun.star.chart2.ScatterChartType") #define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString::createFromAscii("com.sun.star.chart2.PieChartType") #define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.NetChartType") +#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.FilledNetChartType") #define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType") #define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString::createFromAscii("com.sun.star.chart2.BubbleChartType") |