diff options
Diffstat (limited to 'chart2/source/inc')
-rw-r--r-- | chart2/source/inc/AxisHelper.hxx | 7 | ||||
-rw-r--r-- | chart2/source/inc/ChartTypeTemplate.hxx | 2 | ||||
-rw-r--r-- | chart2/source/inc/DataSourceHelper.hxx | 3 | ||||
-rw-r--r-- | chart2/source/inc/DiagramHelper.hxx | 55 | ||||
-rw-r--r-- | chart2/source/inc/RegressionCurveHelper.hxx | 3 | ||||
-rw-r--r-- | chart2/source/inc/ThreeDHelper.hxx | 34 |
6 files changed, 55 insertions, 49 deletions
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index df3da4c4de5b..61610b5c4b9d 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -40,6 +40,7 @@ namespace chart { class BaseCoordinateSystem; class ChartType; +class Diagram; class OOO_DLLPUBLIC_CHARTTOOLS AxisHelper { @@ -102,7 +103,7 @@ public: static void makeGridInvisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties ); static void hideAxisIfNoDataIsAttached( const css::uno::Reference< css::chart2::XAxis >& xAxis - , const css::uno::Reference< css::chart2::XDiagram >& xDiagram); + , const rtl::Reference< ::chart::Diagram >& xDiagram); SAL_DLLPRIVATE static bool areAxisLabelsVisible( const css::uno::Reference< css::beans::XPropertySet >& xAxisProperties ); static bool isAxisVisible( const css::uno::Reference< css::chart2::XAxis >& xAxis ); @@ -172,7 +173,7 @@ public: getAllGrids( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); static void getAxisOrGridPossibilities( css::uno::Sequence< sal_Bool >& rPossibilityList - , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool bAxis=true ); + , const rtl::Reference< ::chart::Diagram>& xDiagram, bool bAxis=true ); static void getAxisOrGridExistence( css::uno::Sequence< sal_Bool >& rExistenceList , const css::uno::Reference< css::chart2::XDiagram>& xDiagram, bool bAxis=true ); @@ -199,7 +200,7 @@ public: static void setRTLAxisLayout( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); static rtl::Reference< ::chart::ChartType > - getFirstChartTypeWithSeriesAttachedToAxisIndex( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex ); + getFirstChartTypeWithSeriesAttachedToAxisIndex( const rtl::Reference< ::chart::Diagram >& xDiagram, const sal_Int32 nAttachedAxisIndex ); static bool isAxisPositioningEnabled(); }; diff --git a/chart2/source/inc/ChartTypeTemplate.hxx b/chart2/source/inc/ChartTypeTemplate.hxx index e5594c43bdc3..af70bb84ccb3 100644 --- a/chart2/source/inc/ChartTypeTemplate.hxx +++ b/chart2/source/inc/ChartTypeTemplate.hxx @@ -159,7 +159,7 @@ public: <p>The dimension depends on the value returned by getDimension().</p> */ virtual void createCoordinateSystems( - const css::uno::Reference< css::chart2::XCoordinateSystemContainer > & xOutCooSysCnt ); + const rtl::Reference< ::chart::Diagram > & xDiagram ); /** Sets categories at the scales of dimension 0 and the percent stacking at the scales of dimension 1 of all given coordinate systems. diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index 950f66e54927..892412cc8d63 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -35,6 +35,7 @@ namespace com::sun::star::frame { class XModel; } namespace chart { +class Diagram; class OOO_DLLPUBLIC_CHARTTOOLS DataSourceHelper { @@ -79,7 +80,7 @@ public: pressUsedDataIntoRectangularFormat( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc ); SAL_DLLPRIVATE static css::uno::Sequence< OUString > getUsedDataRanges( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + const rtl::Reference< ::chart::Diagram > & xDiagram ); static css::uno::Sequence< OUString > getUsedDataRanges( const rtl::Reference<::chart::ChartModel> & xChartModel ); diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index a05de767d38d..9f40c536e241 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -45,6 +45,7 @@ namespace chart class ChartType; class ChartTypeManager; class ChartTypeTemplate; +class Diagram; enum DiagramPositioningMode { @@ -71,7 +72,7 @@ public: */ static tTemplateWithServiceName getTemplateForDiagram( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, const rtl::Reference< ::chart::ChartTypeManager > & xChartTypeManager); /** Sets the "SwapXAndYAxis" property at all coordinate systems found in the @@ -79,7 +80,7 @@ public: "vertical==true" for bar charts, "vertical==false" for column charts */ - static void setVertical( const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + static void setVertical( const rtl::Reference< ::chart::Diagram > & xDiagram, bool bVertical ); /** Gets the "SwapXAndYAxis" property at all coordinate systems found in the @@ -87,11 +88,11 @@ public: "vertical==true" for bar charts, "vertical==false" for column charts */ - static bool getVertical( const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + static bool getVertical( const rtl::Reference< ::chart::Diagram > & xDiagram, bool& rbOutFoundResult, bool& rbOutAmbiguousResult ); static StackMode getStackMode( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, bool& rbFound, bool& rbAmbiguous ); @@ -102,7 +103,7 @@ public: applies to the first chart type/the bars) */ static void setStackMode( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, StackMode eStackMode ); @@ -125,7 +126,7 @@ public: dimension is not unique, 0 is returned. */ static sal_Int32 getDimension( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + const rtl::Reference< ::chart::Diagram > & xDiagram ); /** Sets the dimension of the diagram given. @@ -135,14 +136,14 @@ public: XCoordinateSystemContainer of the diagram. */ static void setDimension( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, sal_Int32 nNewDimensionCount ); /** Replaces all occurrences of xCooSysToReplace in the tree with xReplacement in the diagram's tree */ SAL_DLLPRIVATE static void replaceCoordinateSystem( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, const css::uno::Reference< css::chart2::XCoordinateSystem > & xCooSysToReplace, const css::uno::Reference< css::chart2::XCoordinateSystem > & xReplacement ); @@ -151,22 +152,22 @@ public: static bool attachSeriesToAxis( bool bMainAxis, const css::uno::Reference< css::chart2::XDataSeries >& xSeries, - const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const rtl::Reference< ::chart::Diagram >& xDiagram, const css::uno::Reference< css::uno::XComponentContext > & xContext, bool bAdaptAxes=true ); static css::uno::Reference< css::chart2::XAxis > getAttachedAxis( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + const rtl::Reference< ::chart::Diagram >& xDiagram ); static rtl::Reference< ChartType > getChartTypeOfSeries( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const rtl::Reference< ::chart::Diagram >& xDiagram, const css::uno::Reference< css::chart2::XDataSeries >& xSeries ); static std::vector< css::uno::Reference< css::chart2::XDataSeries > > getDataSeriesFromDiagram( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + const rtl::Reference< ::chart::Diagram > & xDiagram ); /** return all data series in this diagram grouped by chart-types */ @@ -174,20 +175,20 @@ public: css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > > getDataSeriesGroups( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + const rtl::Reference< ::chart::Diagram > & xDiagram ); static bool isCategoryDiagram( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + const rtl::Reference< ::chart::Diagram >& xDiagram ); static void setCategoriesToDiagram( const css::uno::Reference< css::chart2::data::XLabeledDataSequence >& xCategories, - const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const rtl::Reference< ::chart::Diagram >& xDiagram, bool bSetAxisType = false, // when this flag is true ... bool bCategoryAxis = true);// set the AxisType to CATEGORY or back to REALNUMBER static css::uno::Reference< css::chart2::data::XLabeledDataSequence > getCategoriesFromDiagram( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + const rtl::Reference< ::chart::Diagram > & xDiagram ); static css::uno::Sequence< OUString > getExplicitSimpleCategories( ChartModel& rModel ); @@ -202,7 +203,7 @@ public: static void switchToTextCategories( const rtl::Reference<::chart::ChartModel> & xChartDoc ); - static bool isSupportingDateAxis( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + static bool isSupportingDateAxis( const rtl::Reference< ::chart::Diagram >& xDiagram ); static bool isDateNumberFormat( sal_Int32 nNumberFormat, const css::uno::Reference< css::util::XNumberFormats >& xNumberFormats ); static sal_Int32 getDateNumberFormat( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); static sal_Int32 getDateTimeInputNumberFormat( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, double fNumber ); @@ -211,11 +212,11 @@ public: css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); static rtl::Reference< ChartType > - getChartTypeByIndex( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, sal_Int32 nIndex ); + getChartTypeByIndex( const rtl::Reference< ::chart::Diagram >& xDiagram, sal_Int32 nIndex ); static std::vector< rtl::Reference< ChartType > > getChartTypesFromDiagram( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + const rtl::Reference< ::chart::Diagram > & xDiagram ); SAL_DLLPRIVATE static bool areChartTypesCompatible( const rtl::Reference< ::chart::ChartType >& xFirstType, @@ -237,7 +238,7 @@ public: * */ static bool isSeriesMoveable( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const rtl::Reference< ::chart::Diagram >& xDiagram, const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries, bool bForward ); @@ -257,28 +258,28 @@ public: * */ static bool moveSeries( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram, + const rtl::Reference< ::chart::Diagram >& xDiagram, const css::uno::Reference< css::chart2::XDataSeries >& xGivenDataSeries, bool bForward ); - static bool isSupportingFloorAndWall( const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + static bool isSupportingFloorAndWall( const rtl::Reference< ::chart::Diagram > & xDiagram ); - static bool isPieOrDonutChart( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); + static bool isPieOrDonutChart( const rtl::Reference< ::chart::Diagram >& xDiagram ); static sal_Int32 getGeometry3D( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, bool& rbFound, bool& rbAmbiguous ); static void setGeometry3D( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, sal_Int32 nNewGeometry ); //returns integer from constant group css::chart::MissingValueTreatment static sal_Int32 getCorrectedMissingValueTreatment( - const css::uno::Reference< css::chart2::XDiagram > & xDiagram, + const rtl::Reference< ::chart::Diagram > & xDiagram, const rtl::Reference< ::chart::ChartType >& xChartType ); - static DiagramPositioningMode getDiagramPositioningMode( const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + static DiagramPositioningMode getDiagramPositioningMode( const rtl::Reference< ::chart::Diagram > & xDiagram ); static bool setDiagramPositioning( const rtl::Reference<::chart::ChartModel>& xChartModel, const css::awt::Rectangle& rPosRect /*100th mm*/ ); diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 318b29d7db36..00a70a5aece4 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -33,6 +33,7 @@ namespace com::sun::star::chart2 { class XRegressionCurveContainer; } namespace com::sun::star::chart2::data { class XDataSource; } namespace com::sun::star::frame { class XModel; } namespace chart { class ChartModel; } +namespace chart { class Diagram; } namespace chart::RegressionCurveHelper { @@ -162,7 +163,7 @@ namespace chart::RegressionCurveHelper OOO_DLLPUBLIC_CHARTTOOLS std::vector<css::uno::Reference<css::chart2::XRegressionCurve> > getAllRegressionCurvesNotMeanValueLine( - const css::uno::Reference<css::chart2::XDiagram>& xDiagram ); + const rtl::Reference<::chart::Diagram>& xDiagram ); OOO_DLLPUBLIC_CHARTTOOLS void resetEquationPosition( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 93b1c995f388..b5edf986c26d 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -20,6 +20,7 @@ #pragma once #include <com/sun/star/drawing/CameraGeometry.hpp> +#include <rtl/ref.hxx> #include "charttoolsdllapi.hxx" namespace com::sun::star::beans { class XPropertySet; } @@ -27,6 +28,7 @@ namespace com::sun::star::chart2 { class XDiagram; } namespace chart { +class Diagram; enum class ThreeDLookScheme { @@ -61,14 +63,14 @@ public: const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties , double& rfXAngleRad, double& rfYAngleRad, double& rfZAngleRad ); static void setRotationAngleToDiagram( - const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties + const rtl::Reference< ::chart::Diagram >& xSceneProperties , double fXAngleRad, double fYAngleRad, double fZAngleRad ); static void getRotationFromDiagram( - const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties + const rtl::Reference< ::chart::Diagram >& xSceneProperties , sal_Int32& rnHorizontalAngleDegree, sal_Int32& rnVerticalAngleDegree ); static void setRotationToDiagram( - const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties + const rtl::Reference< ::chart::Diagram >& xSceneProperties , sal_Int32 nHorizontalAngleDegree, sal_Int32 nVerticalYAngleDegree ); static void switchRightAngledAxes( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties @@ -99,29 +101,29 @@ public: static double CameraDistanceToPerspective( double fCameraDistance ); static double PerspectiveToCameraDistance( double fPerspective ); - static void set3DSettingsToDefault( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties ); - static void setDefaultRotation( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties ); - static void setDefaultIllumination( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties ); + static void set3DSettingsToDefault( const rtl::Reference< ::chart::Diagram >& xSceneProperties ); + static void setDefaultRotation( const rtl::Reference< ::chart::Diagram >& xDiagram ); + static void setDefaultIllumination( const rtl::Reference< ::chart::Diagram >& xDiagram ); static void setDefaultRotation( const css::uno::Reference< css::beans::XPropertySet >& xSceneProperties, bool bPieOrDonut ); - static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardLeftWall( const css::uno::Reference< - css::beans::XPropertySet >& xSceneProperties ); - static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBackWall(const css::uno::Reference< - css::beans::XPropertySet >& xSceneProperties ); - static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const css::uno::Reference< - css::beans::XPropertySet >& xSceneProperties ); + static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardLeftWall( const rtl::Reference< + ::chart::Diagram >& xDiagram ); + static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBackWall(const rtl::Reference< + ::chart::Diagram >& xDiagram ); + static CuboidPlanePosition getAutomaticCuboidPlanePositionForStandardBottom(const rtl::Reference< + ::chart::Diagram >& xDiagram ); - static ThreeDLookScheme detectScheme( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); - static void setScheme( const css::uno::Reference< css::chart2::XDiagram >& xDiagram + static ThreeDLookScheme detectScheme( const rtl::Reference< ::chart::Diagram >& xDiagram ); + static void setScheme( const rtl::Reference< ::chart::Diagram >& xDiagram , ThreeDLookScheme aScheme ); //sal_Int32 nRoundedEdges: <0 or >100 -> mixed state //sal_Int32 nObjectLines: 0->no lines; 1->all lines on; other->mixed state - static void getRoundedEdgesAndObjectLines( const css::uno::Reference< css::chart2::XDiagram >& xDiagram + static void getRoundedEdgesAndObjectLines( const rtl::Reference< ::chart::Diagram >& xDiagram , sal_Int32& rnRoundedEdges, sal_Int32& rnObjectLines ); - static void setRoundedEdgesAndObjectLines( const css::uno::Reference< css::chart2::XDiagram >& xDiagram + static void setRoundedEdgesAndObjectLines( const rtl::Reference< ::chart::Diagram >& xDiagram , sal_Int32 nRoundedEdges, sal_Int32 nObjectLines ); }; |