diff options
| author | Ingrid Halama <iha@openoffice.org> | 2009-11-20 11:58:22 +0100 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2009-11-20 11:58:22 +0100 |
| commit | 0a5e2fc8e92ac2775e10530ae230db69556f5047 (patch) | |
| tree | 72e9fdb6fc0572a87cf90c9a44f45360e69a5601 /chart2/source/inc/chartview | |
| parent | Create DEV300_m63 milestone tag from trunk@277194 (diff) | |
| download | core-0a5e2fc8e92ac2775e10530ae230db69556f5047.tar.gz core-0a5e2fc8e92ac2775e10530ae230db69556f5047.zip | |
chartpositioning: #i100778# chart positioning excluding labels
Diffstat (limited to 'chart2/source/inc/chartview')
| -rw-r--r-- | chart2/source/inc/chartview/ChartSfxItemIds.hxx | 11 | ||||
| -rw-r--r-- | chart2/source/inc/chartview/ExplicitValueProvider.hxx | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index e4afc0d9efbd..637a0f3b757d 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -58,7 +58,16 @@ #define SCHATTR_LEGEND_POS SCHATTR_LEGEND_START #define SCHATTR_LEGEND_END SCHATTR_LEGEND_POS -#define SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1) +#define SCHATTR_DIAGRAM_START (SCHATTR_LEGEND_END + 1) +#define SCHATTR_DIAGRAM_POS_MODE SCHATTR_DIAGRAM_START +#define SCHATTR_DIAGRAM_RECT_TO_USE SCHATTR_DIAGRAM_START + 1 +#define SCHATTR_DIAGRAM_RECT_INCLUDING SCHATTR_DIAGRAM_START + 2 +#define SCHATTR_DIAGRAM_RECT_EXCLUDING SCHATTR_DIAGRAM_START + 3 +#define SCHATTR_DIAGRAM_RECT_MAX SCHATTR_DIAGRAM_START + 4 +#define SCHATTR_DIAGRAM_UI_SCALE SCHATTR_DIAGRAM_START + 5 +#define SCHATTR_DIAGRAM_END SCHATTR_DIAGRAM_UI_SCALE + +#define SCHATTR_TEXT_START (SCHATTR_DIAGRAM_END + 1) // #define SCHATTR_TEXT_ORIENT SCHATTR_TEXT_START // name changed: #define SCHATTR_TEXT_STACKED SCHATTR_TEXT_START diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index ab94e7e1c337..ecd95fdcd5b8 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -71,6 +71,8 @@ public: virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false )=0; + virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes()=0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getShapeForCID( const rtl::OUString& rObjectCID )=0; @@ -80,12 +82,12 @@ public: static ExplicitValueProvider* getExplicitValueProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChartView ); static ::com::sun::star::awt::Rectangle - calculateDiagramPositionAndSizeInclusiveTitle( + calculateDiagramPositionAndSizeIncludingTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChartView - , const ::com::sun::star::awt::Rectangle& rExclusivePositionAndSize ); + , const ::com::sun::star::awt::Rectangle& rExcludingPositionAndSize ); static sal_Int32 getExplicitNumberFormatKeyForAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis |