diff options
Diffstat (limited to 'chart2/source/view/axes/VAxisProperties.hxx')
| -rw-r--r-- | chart2/source/view/axes/VAxisProperties.hxx | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index fd39c865bd8d..61f2477c7681 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -33,6 +33,10 @@ #include "TickmarkProperties.hxx" #include "PlottingPositionHelper.hxx" #include "LabelAlignment.hxx" + +#include <com/sun/star/chart/ChartAxisLabelPosition.hpp> +#include <com/sun/star/chart/ChartAxisMarkPosition.hpp> +#include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> @@ -99,9 +103,20 @@ struct AxisProperties sal_Int32 m_nDimensionIndex; bool m_bIsMainAxis;//not secondary axis bool m_bSwapXAndY; + + ::com::sun::star::chart::ChartAxisPosition m_eCrossoverType; + ::com::sun::star::chart::ChartAxisLabelPosition m_eLabelPos; + ::com::sun::star::chart::ChartAxisMarkPosition m_eTickmarkPos; + double* m_pfMainLinePositionAtOtherAxis; double* m_pfExrtaLinePositionAtOtherAxis; + bool m_bCrossingAxisHasReverseDirection; + bool m_bCrossingAxisIsCategoryAxes; + bool m_bAxisBetweenCategories; + + //this direction is used to indicate in which direction the labels are to be drawn + double m_fLabelDirectionSign; //this direction is used to indicate in which direction inner tickmarks are to be drawn double m_fInnerDirectionSign; bool m_bLabelsOutside; @@ -110,11 +125,6 @@ struct AxisProperties sal_Int32 m_nNumberFormatKey; - -// enum RelativeLabelPosition { NONE, LEFTORBOTTOM_OF_DIAGRAM, RIGHTORTOP_OF_DIAGRAM, -// LEFTORBOTTOM_OF_AXIS, RIGHTORTOP_OF_AXIS }; -// RelativeLabelPosition m_eRelativeLabelPosition; - /* 0: no tickmarks 1: inner tickmarks 2: outer tickmarks 3: inner and outer tickmarks @@ -143,6 +153,10 @@ struct AxisProperties virtual ~AxisProperties(); virtual void init(bool bCartesian=false);//init from model data (m_xAxisModel) + void initAxisPositioning( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProp ); + + static TickmarkProperties getBiggestTickmarkProperties(); + private: AxisProperties(); |