diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-23 15:49:11 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-26 16:26:08 -0400 |
commit | 48f31a924280a418046f0c816f8a7d20b672dac6 (patch) | |
tree | 9f662bd1747b20c16868a77df1090aebacfffb5a /include/oox | |
parent | f1531cdaaebe706d909dc6ddde439ccb5f4ad36d (diff) |
bnc#885825: OOXML import and export of data label borders.
Diffstat (limited to 'include/oox')
-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 b6bafddd78cb..2c4fcec3b480 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 |