diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2016-06-28 23:34:34 +0200 |
|---|---|---|
| committer | Laurent BP <laurent.balland-poirier@laposte.net> | 2016-08-16 20:54:54 +0000 |
| commit | 428711f03c31802e339e57384b9f925a0e4dcc12 (patch) | |
| tree | a7c5d08b20a56890943df67bd82e12021aaee4ee /chart2/source/inc | |
| parent | 84d9a3642c62d930f4064536659c76a48b9f337e (diff) | |
Start tdf#100547 Trendline equation: customize X, Y names
Change trend line UI to add fields: X name and Y name
to change "x" and "f(x)" in equation representation
Next to be done: save it to ODF file
Change-Id: I0680ee1bbfbbb74016ecc858917e10d6790ac63a
Reviewed-on: https://gerrit.libreoffice.org/27069
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
Diffstat (limited to 'chart2/source/inc')
| -rw-r--r-- | chart2/source/inc/RegressionCurveCalculator.hxx | 5 | ||||
| -rw-r--r-- | chart2/source/inc/chartview/ChartSfxItemIds.hxx | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 4f8e2604f87f..422c39b3ed55 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -60,6 +60,7 @@ protected: bool mForceIntercept; double mInterceptValue; sal_Int32 mPeriod; + OUString mXName, mYName; // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL setRegressionProperties( @@ -98,6 +99,10 @@ protected: const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumFmtSupplier, sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) throw (css::uno::RuntimeException, std::exception) override; + + virtual void SAL_CALL setXYNames( + const OUString& aXName, const OUString& aYName ) + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace chart diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index 3bce731ebdce..d2b873cf80a0 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -169,7 +169,9 @@ #define SCHATTR_REGRESSION_SET_INTERCEPT (SCHATTR_REGRESSION_START + 7) #define SCHATTR_REGRESSION_INTERCEPT_VALUE (SCHATTR_REGRESSION_START + 8) #define SCHATTR_REGRESSION_CURVE_NAME (SCHATTR_REGRESSION_START + 9) -#define SCHATTR_REGRESSION_END SCHATTR_REGRESSION_CURVE_NAME +#define SCHATTR_REGRESSION_XNAME (SCHATTR_REGRESSION_START + 10) +#define SCHATTR_REGRESSION_YNAME (SCHATTR_REGRESSION_START + 11) +#define SCHATTR_REGRESSION_END SCHATTR_REGRESSION_YNAME #define SCHATTR_END SCHATTR_REGRESSION_END |