diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-17 16:15:09 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-21 08:24:01 +0200 |
commit | d256dbede60533369d1aac64cca34721183f6a8a (patch) | |
tree | de87948686ad1bd88165efe0139bb081517a872e /sc/source/filter/inc | |
parent | f2bc5c6229e8e72feb3dd887b6d509e52d666c0c (diff) |
fdo#46808, Convert chart2::Title service to new style
API CHANGE: The chart2::XTitled interface now takes and returns
a XTitle2 instead of an XTitle.
Change-Id: I96c35909d3a13f1abb544296a782a0b6a7a58ec6
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r-- | sc/source/filter/inc/xichart.hxx | 7 | ||||
-rw-r--r-- | sc/source/filter/inc/xlchart.hxx | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index c1a2cbcc57fe..6be2572d1b02 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -61,6 +61,7 @@ namespace com { namespace sun { namespace star { class XAxis; class XLegend; class XTitle; + class XTitle2; class XFormattedString; namespace data { @@ -487,9 +488,6 @@ typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef; class XclImpChText : public XclImpChGroupBase, public XclImpChFontBase, protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > XTitleRef; - -public: explicit XclImpChText( const XclImpChRoot& rRoot ); /** Reads the CHTEXT record (called by base class). */ @@ -531,7 +529,8 @@ public: /** Converts and writes all contained data to the passed data point label property set. */ void ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeInfo& rTypeInfo ) const; /** Creates a title text object. */ - XTitleRef CreateTitle() const; + css::uno::Reference< css::chart2::XTitle2 > + CreateTitle() const; /** Converts the manual position of the specified title */ void ConvertTitlePosition( const XclChTextKey& rTitleKey ) const; diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 2c3a594ed9c7..4e3eb948b522 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -58,7 +58,6 @@ class XclRoot; #define SERVICE_CHART2_LINEARREGCURVE "com.sun.star.chart2.LinearRegressionCurve" #define SERVICE_CHART2_LOGREGCURVE "com.sun.star.chart2.LogarithmicRegressionCurve" #define SERVICE_CHART2_POTREGCURVE "com.sun.star.chart2.PotentialRegressionCurve" -#define SERVICE_CHART2_TITLE "com.sun.star.chart2.Title" // property names #define EXC_CHPROP_ADDITIONALSHAPES "AdditionalShapes" |