diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-23 15:49:11 -0400 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-30 21:46:30 +0000 |
| commit | a7e5fc1485fc3a44a05168910430a57aee2b211e (patch) | |
| tree | 22c1a69231b0bf0c227bd398249b62727b7f4de3 /include | |
| parent | 8e0c92c2ee46e90bdcceb641be267a9468968b0c (diff) | |
bnc#885825: OOXML import and export of data label borders.
(cherry picked from commit 48f31a924280a418046f0c816f8a7d20b672dac6)
Conflicts:
oox/source/export/chartexport.cxx
Change-Id: I0fd808145aaeb0aa36d3ec30d7b977890642dcff
Reviewed-on: https://gerrit.libreoffice.org/10562
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/chartexport.hxx | 4 | ||||
| -rw-r--r-- | include/oox/export/utils.hxx | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 42521350af0c..8d570ecd1229 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -157,9 +157,7 @@ private: void exportDataPoints( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesProperties, sal_Int32 nSeriesLength ); - void exportDataLabels( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesProperties, - sal_Int32 nSeriesLength ); + void exportDataLabels( const css::uno::Reference<css::chart2::XDataSeries>& xSeries, sal_Int32 nSeriesLength ); void exportGrouping( bool isBar = false ); void exportTrendlines( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > xSeries ); void exportMarker( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > xSeries ); diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx index 06ddfe3391e5..588d231a0491 100644 --- a/include/oox/export/utils.hxx +++ b/include/oox/export/utils.hxx @@ -23,6 +23,7 @@ #define I32S(x) OString::number( (sal_Int32) x ).getStr() #define I64S(x) OString::number( (sal_Int64) x ).getStr() #define IS(x) OString::number( x ).getStr() +#define BS(x) (x ? "1":"0") #define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() #ifndef DBG |