summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/xechart.cxx8
-rw-r--r--sc/source/filter/inc/xechart.hxx119
-rw-r--r--sc/source/filter/inc/xeescher.hxx8
-rw-r--r--sc/source/filter/inc/xichart.hxx135
-rw-r--r--sc/source/filter/inc/xlchart.hxx20
5 files changed, 112 insertions, 178 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 4b6c300cd4a0..c33de19331a0 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -329,7 +329,7 @@ const XclChFormatInfo& XclExpChRoot::GetFormatInfo( XclChObjectType eObjType ) c
return mxChData->mxFmtInfoProv->GetFormatInfo( eObjType );
}
-void XclExpChRoot::InitConversion( XChartDocRef xChartDoc, const Rectangle& rChartRect ) const
+void XclExpChRoot::InitConversion( css::uno::Reference< css::chart2::XChartDocument > xChartDoc, const Rectangle& rChartRect ) const
{
mxChData->InitConversion( GetRoot(), xChartDoc, rChartRect );
}
@@ -1962,7 +1962,7 @@ bool XclExpChSeries::ConvertDataSeries(
return bOk;
}
-bool XclExpChSeries::ConvertStockSeries( XDataSeriesRef xDataSeries,
+bool XclExpChSeries::ConvertStockSeries( css::uno::Reference< css::chart2::XDataSeries > xDataSeries,
const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol )
{
bool bOk = false;
@@ -2070,7 +2070,7 @@ void XclExpChSeries::InitFromParent( const XclExpChSeries& rParent )
maData.mnValueCount = rParent.maData.mnValueCount;
}
-void XclExpChSeries::CreateTrendLines( XDataSeriesRef xDataSeries )
+void XclExpChSeries::CreateTrendLines( css::uno::Reference< css::chart2::XDataSeries > xDataSeries )
{
Reference< XRegressionCurveContainer > xRegCurveCont( xDataSeries, UNO_QUERY );
if( xRegCurveCont.is() )
@@ -3020,7 +3020,7 @@ void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossi
}
}
-void XclExpChAxis::ConvertWall( XDiagramRef xDiagram )
+void XclExpChAxis::ConvertWall( css::uno::Reference< css::chart2::XDiagram > xDiagram )
{
if( xDiagram.is() ) switch( GetAxisType() )
{
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index e6adff59b61e..4de16588ed5e 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -79,16 +79,14 @@ class XclExpChChart;
class XclExpChRoot : public XclExpRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > XChartDocRef;
-
-public:
explicit XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData );
virtual ~XclExpChRoot();
/** Returns this root instance - for code readability in derived classes. */
inline const XclExpChRoot& GetChRoot() const { return *this; }
/** Returns the API Chart document model. */
- XChartDocRef GetChartDocument() const;
+ css::uno::Reference< css::chart2::XChartDocument >
+ GetChartDocument() const;
/** Returns a reference to the parent chart data object. */
XclExpChChart& GetChartData() const;
/** Returns chart type info for a unique chart type identifier. */
@@ -100,7 +98,8 @@ public:
const XclChFormatInfo& GetFormatInfo( XclChObjectType eObjType ) const;
/** Starts the API chart document conversion. Must be called once before all API conversion. */
- void InitConversion( XChartDocRef xChartDoc, const Rectangle& rChartRect ) const;
+ void InitConversion( css::uno::Reference< css::chart2::XChartDocument > xChartDoc,
+ const Rectangle& rChartRect ) const;
/** Finishes the API chart document conversion. Must be called once after all API conversion. */
void FinishConversion() const;
@@ -385,18 +384,14 @@ typedef std::shared_ptr< XclExpChFrame > XclExpChFrameRef;
class XclExpChSourceLink : public XclExpRecord, protected XclExpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > XDataSequenceRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > XFormattedStringRef;
- typedef ::com::sun::star::uno::Sequence< XFormattedStringRef > XFormattedStringSeq;
-
-public:
explicit XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType );
void ConvertString( const OUString& aString );
/** Converts the passed source link, returns the number of linked values. */
- sal_uInt16 ConvertDataSequence( XDataSequenceRef xDataSeq, bool bSplitToColumns, sal_uInt16 nDefCount = 0 );
+ sal_uInt16 ConvertDataSequence( css::uno::Reference< css::chart2::data::XDataSequence > xDataSeq,
+ bool bSplitToColumns, sal_uInt16 nDefCount = 0 );
/** Converts the passed sequence of formatted string objects, returns leading font index. */
- sal_uInt16 ConvertStringSequence( const XFormattedStringSeq& rStringSeq );
+ sal_uInt16 ConvertStringSequence( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& rStringSeq );
/** Converts the number format from the passed property set. */
void ConvertNumFmt( const ScfPropertySet& rPropSet, bool bPercent );
@@ -493,10 +488,6 @@ public:
class XclExpChText : public XclExpChGroupBase, public XclExpChFontBase
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > XTitleRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef;
-
-public:
explicit XclExpChText( const XclExpChRoot& rRoot );
/** Sets font color and color identifier to internal data structures. */
@@ -505,7 +496,7 @@ public:
virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE;
/** Converts all text settings of the passed title text object. */
- void ConvertTitle( XTitleRef xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL );
+ void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL );
/** Converts all text settings of the passed legend. */
void ConvertLegend( const ScfPropertySet& rPropSet );
/** Converts all settings of the passed data point caption text object. */
@@ -656,13 +647,11 @@ typedef std::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef;
class XclExpChSerTrendLine : public XclExpRecord, protected XclExpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef;
-
-public:
explicit XclExpChSerTrendLine( const XclExpChRoot& rRoot );
/** Converts the passed trend line, returns true if trend line type is supported. */
- bool Convert( XRegressionCurveRef xRegCurve, sal_uInt16 nSeriesIdx );
+ bool Convert( css::uno::Reference< css::chart2::XRegressionCurve > xRegCurve,
+ sal_uInt16 nSeriesIdx );
/** Returns formatting information of the trend line, created in Convert(). */
inline XclExpChDataFormatRef GetDataFormat() const { return mxDataFmt; }
@@ -707,30 +696,26 @@ typedef std::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef;
class XclExpChSeries : public XclExpChGroupBase
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef;
-
-public:
explicit XclExpChSeries( const XclExpChRoot& rRoot, sal_uInt16 nSeriesIdx );
/** Converts the passed data series (source links and formatting). */
bool ConvertDataSeries(
- XDiagramRef xDiagram, XDataSeriesRef xDataSeries,
+ css::uno::Reference< css::chart2::XDiagram > xDiagram,
+ css::uno::Reference< css::chart2::XDataSeries > xDataSeries,
const XclChExtTypeInfo& rTypeInfo,
sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx );
/** Converts the passed data series for stock charts. */
bool ConvertStockSeries(
- XDataSeriesRef xDataSeries,
+ css::uno::Reference< css::chart2::XDataSeries > xDataSeries,
const OUString& rValueRole,
sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol );
/** Converts the passed error bar settings (called at trend line child series). */
- bool ConvertTrendLine( const XclExpChSeries& rParent, XRegressionCurveRef xRegCurve );
+ bool ConvertTrendLine( const XclExpChSeries& rParent,
+ css::uno::Reference< css::chart2::XRegressionCurve > xRegCurve );
/** Converts the passed error bar settings (called at error bar child series). */
bool ConvertErrorBar( const XclExpChSeries& rParent, const ScfPropertySet& rPropSet, sal_uInt8 nBarId );
/** Converts and inserts category ranges for all inserted series. */
- void ConvertCategSequence( XLabeledDataSeqRef xCategSeq );
+ void ConvertCategSequence( css::uno::Reference< css::chart2::data::XLabeledDataSequence > xCategSeq );
/** Writes all embedded records. */
virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE;
@@ -739,7 +724,7 @@ private:
/** Initializes members of this series to represent a child of the passed series. */
void InitFromParent( const XclExpChSeries& rParent );
/** Tries to create trend line series objects (called at parent series). */
- void CreateTrendLines( XDataSeriesRef xDataSeries );
+ void CreateTrendLines( css::uno::Reference< css::chart2::XDataSeries > xDataSeries );
/** Tries to create positive and negative error bar series objects (called at parent series). */
void CreateErrorBars( const ScfPropertySet& rPropSet,
const OUString& rBarPropName,
@@ -776,15 +761,12 @@ typedef std::shared_ptr< XclExpChSeries > XclExpChSeriesRef;
class XclExpChType : public XclExpRecord, protected XclExpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef;
-
-public:
explicit XclExpChType( const XclExpChRoot& rRoot );
/** Converts the passed chart type and the contained data series. */
- void Convert( XDiagramRef xDiagram, XChartTypeRef xChartType,
- sal_Int32 nApiAxesSetIdx, bool bSwappedAxesSet, bool bHasXLabels );
+ void Convert( css::uno::Reference< css::chart2::XDiagram > xDiagram,
+ css::uno::Reference< css::chart2::XChartType > xChartType,
+ sal_Int32 nApiAxesSetIdx, bool bSwappedAxesSet, bool bHasXLabels );
/** Sets stacking mode (standard or percent) for the series in this chart type group. */
void SetStacked( bool bPercent );
@@ -888,22 +870,18 @@ typedef std::shared_ptr< XclExpChDropBar > XclExpChDropBarRef;
class XclExpChTypeGroup : public XclExpChGroupBase
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef;
-
-public:
explicit XclExpChTypeGroup( const XclExpChRoot& rRoot, sal_uInt16 nGroupIdx );
/** Converts the passed chart type to Excel type settings. */
- void ConvertType( XDiagramRef xDiagram, XChartTypeRef xChartType,
+ void ConvertType( css::uno::Reference< css::chart2::XDiagram > xDiagram,
+ css::uno::Reference< css::chart2::XChartType > xChartType,
sal_Int32 nApiAxesSetIdx, bool b3dChart, bool bSwappedAxesSet, bool bHasXLabels );
/** Converts and inserts all series from the passed chart type. */
- void ConvertSeries( XDiagramRef xDiagram, XChartTypeRef xChartType,
+ void ConvertSeries( css::uno::Reference< css::chart2::XDiagram > xDiagram,
+ css::uno::Reference< css::chart2::XChartType > xChartType,
sal_Int32 nGroupAxesSetIdx, bool bPercent, bool bConnectorLines );
/** Converts and inserts category ranges for all inserted series. */
- void ConvertCategSequence( XLabeledDataSeqRef xCategSeq );
+ void ConvertCategSequence( css::uno::Reference< css::chart2::data::XLabeledDataSequence > xCategSeq );
/** Creates a legend object and converts all legend settings. */
void ConvertLegend( const ScfPropertySet& rPropSet );
@@ -929,13 +907,13 @@ private:
/** Returns an unused format index to be used for the next created series. */
sal_uInt16 GetFreeFormatIdx() const;
/** Creates all data series of any chart type except stock charts. */
- void CreateDataSeries( XDiagramRef xDiagram,
- XDataSeriesRef xDataSeries );
+ void CreateDataSeries( css::uno::Reference< css::chart2::XDiagram > xDiagram,
+ css::uno::Reference< css::chart2::XDataSeries > xDataSeries );
/** Creates all data series of a stock chart. */
- void CreateAllStockSeries( XChartTypeRef xChartType,
- XDataSeriesRef xDataSeries );
+ void CreateAllStockSeries( css::uno::Reference< css::chart2::XChartType > xChartType,
+ css::uno::Reference< css::chart2::XDataSeries > xDataSeries );
/** Creates a single data series of a stock chart. */
- bool CreateStockSeries( XDataSeriesRef xDataSeries,
+ bool CreateStockSeries( css::uno::Reference< css::chart2::XDataSeries > xDataSeries,
const OUString& rValueRole, bool bCloseSymbol );
virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE;
@@ -1034,11 +1012,6 @@ typedef std::shared_ptr< XclExpChTick > XclExpChTickRef;
class XclExpChAxis : public XclExpChGroupBase, public XclExpChFontBase
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > XAxisRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > XChart1AxisRef;
-
-public:
explicit XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType );
/** Sets font color and color identifier to internal data structures. */
@@ -1047,10 +1020,12 @@ public:
virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE;
/** Converts formatting and scaling settings from the passed axis. */
- void Convert( XAxisRef xAxis, XAxisRef xCrossingAxis,
- XChart1AxisRef xChart1Axis, const XclChExtTypeInfo& rTypeInfo );
+ void Convert( css::uno::Reference< css::chart2::XAxis > xAxis,
+ css::uno::Reference< css::chart2::XAxis > xCrossingAxis,
+ css::uno::Reference< css::chart::XAxis > xChart1Axis,
+ const XclChExtTypeInfo& rTypeInfo );
/** Converts and writes 3D wall/floor properties from the passed diagram. */
- void ConvertWall( XDiagramRef xDiagram );
+ void ConvertWall( css::uno::Reference< css::chart2::XDiagram > xDiagram );
/** Returns the type of this axis. */
inline sal_uInt16 GetAxisType() const { return maData.mnType; }
@@ -1087,15 +1062,12 @@ typedef std::shared_ptr< XclExpChAxis > XclExpChAxisRef;
class XclExpChAxesSet : public XclExpChGroupBase
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef;
-
-public:
explicit XclExpChAxesSet( const XclExpChRoot& rRoot, sal_uInt16 nAxesSetId );
/** Converts the passed diagram to chart record data.
@return First unused chart type group index. */
- sal_uInt16 Convert( XDiagramRef xDiagram, sal_uInt16 nFirstGroupIdx );
+ sal_uInt16 Convert( css::uno::Reference< css::chart2::XDiagram > xDiagram,
+ sal_uInt16 nFirstGroupIdx );
/** Returns true, if this axes set exists (returns false if this is a dummy object). */
inline bool IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); }
@@ -1118,7 +1090,8 @@ private:
/** Converts a complete axis object including axis title. */
void ConvertAxis( XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
- XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo,
+ css::uno::Reference< css::chart2::XCoordinateSystem > xCoordSystem,
+ const XclChExtTypeInfo& rTypeInfo,
sal_Int32 nCrossingAxisDim );
virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE;
@@ -1151,11 +1124,9 @@ typedef std::shared_ptr< XclExpChAxesSet > XclExpChAxesSetRef;
class XclExpChChart : public XclExpChGroupBase
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > XChartDocRef;
-
-public:
explicit XclExpChChart( const XclExpRoot& rRoot,
- XChartDocRef xChartDoc, const Rectangle& rChartRect );
+ css::uno::Reference< css::chart2::XChartDocument > xChartDoc,
+ const Rectangle& rChartRect );
/** Creates, registers and returns a new data series object. */
XclExpChSeriesRef CreateSeries();
@@ -1194,7 +1165,7 @@ class XclExpChartDrawing : public XclExpRecordBase, protected XclExpRoot
public:
explicit XclExpChartDrawing(
const XclExpRoot& rRoot,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel,
+ const ::com::sun::star::uno::Reference< css::frame::XModel >& rxModel,
const Size& rChartSize );
virtual ~XclExpChartDrawing();
@@ -1209,11 +1180,9 @@ private:
class XclExpChart : public XclExpSubStream, protected XclExpRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > XModelRef;
-
-public:
explicit XclExpChart( const XclExpRoot& rRoot,
- XModelRef xModel, const Rectangle& rChartRect );
+ css::uno::Reference< css::frame::XModel > xModel,
+ const Rectangle& rChartRect );
};
#endif
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 0feaa3bb4048..a20bdd962947 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -289,8 +289,6 @@ class XclExpChart;
class XclExpChartObj : public XclObj, protected XclExpRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > XChartDocRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > XShapeRef;
explicit XclExpChartObj(
XclExpObjectManager& rObjMgr,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape,
@@ -305,9 +303,9 @@ public:
private:
typedef std::shared_ptr< XclExpChart > XclExpChartRef;
- XclExpChartRef mxChart; /// The chart itself (BOF/EOF substream data).
- XShapeRef mxShape;
- XChartDocRef mxChartDoc;
+ XclExpChartRef mxChart; /// The chart itself (BOF/EOF substream data).
+ css::uno::Reference< css::drawing::XShape > mxShape;
+ css::uno::Reference< css::chart::XChartDocument > mxChartDoc;
};
/** Represents a NOTE record containing the relevant data of a cell note.
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index b33077465fc3..5e41c3442d5b 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -379,11 +379,6 @@ typedef boost::shared_ptr< XclImpChFrame > XclImpChFrameRef;
class XclImpChSourceLink : protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > XDataSequenceRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > XFormattedStringRef;
- typedef ::com::sun::star::uno::Sequence< XFormattedStringRef > XFormattedStringSeq;
-
-public:
explicit XclImpChSourceLink( const XclImpChRoot& rRoot );
virtual ~XclImpChSourceLink();
@@ -410,9 +405,11 @@ public:
void ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent ) const;
/** Creates a data sequence containing the link into the Calc document. */
- XDataSequenceRef CreateDataSequence( const OUString& rRole ) const;
+ css::uno::Reference< css::chart2::data::XDataSequence >
+ CreateDataSequence( const OUString& rRole ) const;
/** Creates a sequence of formatted string objects. */
- XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot,
+ css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >
+ CreateStringSequence( const XclImpChRoot& rRoot,
sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const;
void FillSourceLink(::std::vector<ScTokenRef>& rTokens) const;
@@ -471,9 +468,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). */
@@ -515,7 +509,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::XTitle >
+ CreateTitle() const;
/** Converts the manual position of the specified title */
void ConvertTitlePosition( const XclChTextKey& rTitleKey ) const;
@@ -698,9 +693,6 @@ typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef;
class XclImpChSerTrendLine : protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef;
-
-public:
explicit XclImpChSerTrendLine( const XclImpChRoot& rRoot );
/** Reads the CHSERTRENDLINE record. */
@@ -711,7 +703,8 @@ public:
inline void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; }
/** Creates an API object representing this trend line. */
- XRegressionCurveRef CreateRegressionCurve() const;
+ css::uno::Reference< css::chart2::XRegressionCurve >
+ CreateRegressionCurve() const;
private:
OUString maTrendLineName;
@@ -725,10 +718,6 @@ typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef;
class XclImpChSerErrorBar : protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > XPropertySetRef;
-
-public:
explicit XclImpChSerErrorBar( const XclImpChRoot& rRoot );
/** Reads the CHSERERRORBAR record. */
@@ -741,10 +730,12 @@ public:
/** Returns the type of this error bar (X/Y, plus/minus). */
inline sal_uInt8 GetBarType() const { return maData.mnBarType; }
/** Creates a labeled data sequence object from value data link. */
- XLabeledDataSeqRef CreateValueSequence() const;
+ css::uno::Reference< css::chart2::data::XLabeledDataSequence >
+ CreateValueSequence() const;
/** Tries to create an error bar API object from the specified Excel error bars. */
- static XPropertySetRef CreateErrorBar(
+ static css::uno::Reference< css::beans::XPropertySet >
+ CreateErrorBar(
const XclImpChSerErrorBar* pPosBar,
const XclImpChSerErrorBar* pNegBar );
@@ -765,11 +756,6 @@ typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
class XclImpChSeries : public XclImpChGroupBase, protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > XPropertySetRef;
-
-public:
explicit XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx );
/** Reads the CHSERIES record (called by base class). */
@@ -805,11 +791,14 @@ public:
inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
/** Creates a labeled data sequence object from value data link. */
- XLabeledDataSeqRef CreateValueSequence( const OUString& rValueRole ) const;
+ css::uno::Reference< css::chart2::data::XLabeledDataSequence >
+ CreateValueSequence( const OUString& rValueRole ) const;
/** Creates a labeled data sequence object from category data link. */
- XLabeledDataSeqRef CreateCategSequence( const OUString& rCategRole ) const;
+ css::uno::Reference< css::chart2::data::XLabeledDataSequence >
+ CreateCategSequence( const OUString& rCategRole ) const;
/** Creates a data series object with initialized source links. */
- XDataSeriesRef CreateDataSeries() const;
+ css::uno::Reference< css::chart2::XDataSeries >
+ CreateDataSeries() const;
void FillAllSourceLinks(::std::vector<ScTokenRef>& rTokens) const;
@@ -829,9 +818,10 @@ private:
XclImpChDataFormatRef CreateDataFormat( sal_uInt16 nPointIdx, sal_uInt16 nFormatIdx );
/** Converts all trend lines and inserts them into the passed API data series object. */
- void ConvertTrendLines( XDataSeriesRef xDataSeries ) const;
+ void ConvertTrendLines( css::uno::Reference< css::chart2::XDataSeries > xDataSeries ) const;
/** Tries to create an error bar API object from the specified Excel error bars. */
- XPropertySetRef CreateErrorBar( sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ) const;
+ css::uno::Reference< css::beans::XPropertySet >
+ CreateErrorBar( sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ) const;
private:
typedef ::std::map<sal_uInt16, XclImpChDataFormatRef> XclImpChDataFormatMap;
@@ -861,11 +851,6 @@ typedef boost::shared_ptr< XclImpChSeries > XclImpChSeriesRef;
class XclImpChType : protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef;
-
-public:
explicit XclImpChType( const XclImpChRoot& rRoot );
/** Reads a chart type record (e.g. CHBAR, CHLINE, CHPIE, ...). */
@@ -885,9 +870,11 @@ public:
bool HasCategoryLabels() const;
/** Creates a coordinate system according to the contained chart type. */
- XCoordSystemRef CreateCoordSystem( bool b3dChart ) const;
+ css::uno::Reference< css::chart2::XCoordinateSystem >
+ CreateCoordSystem( bool b3dChart ) const;
/** Creates and returns an object that represents the contained chart type. */
- XChartTypeRef CreateChartType( XDiagramRef xDiagram, bool b3dChart ) const;
+ css::uno::Reference< css::chart2::XChartType >
+ CreateChartType( css::uno::Reference< css::chart2::XDiagram > xDiagram, bool b3dChart ) const;
private:
XclChType maData; /// Contents of the chart type record.
@@ -920,9 +907,6 @@ typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef;
class XclImpChLegend : public XclImpChGroupBase, protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend > XLegendRef;
-
-public:
explicit XclImpChLegend( const XclImpChRoot& rRoot );
/** Reads the CHLEGEND record (called by base class). */
@@ -933,7 +917,8 @@ public:
void Finalize();
/** Creates a new legend object. */
- XLegendRef CreateLegend() const;
+ css::uno::Reference< css::chart2::XLegend >
+ CreateLegend() const;
private:
XclChLegend maData; /// Contents of the CHLEGEND record.
@@ -978,13 +963,6 @@ typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef;
class XclImpChTypeGroup : public XclImpChGroupBase, protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef;
-
-public:
explicit XclImpChTypeGroup( const XclImpChRoot& rRoot );
/** Reads the CHTYPEGROUP record (called by base class). */
@@ -1034,11 +1012,14 @@ public:
/** Converts and writes all 3D settings to the passed diagram. */
void ConvertChart3d( ScfPropertySet& rPropSet ) const;
/** Creates a coordinate system according to the contained chart type. */
- XCoordSystemRef CreateCoordSystem() const;
+ css::uno::Reference< css::chart2::XCoordinateSystem >
+ CreateCoordSystem() const;
/** Creates and returns an object that represents the contained chart type. */
- XChartTypeRef CreateChartType( XDiagramRef xDiagram, sal_Int32 nApiAxesSetIdx ) const;
+ css::uno::Reference< css::chart2::XChartType >
+ CreateChartType( css::uno::Reference< css::chart2::XDiagram > xDiagram, sal_Int32 nApiAxesSetIdx ) const;
/** Creates a labeled data sequence object for axis categories. */
- XLabeledDataSeqRef CreateCategSequence() const;
+ css::uno::Reference< css::chart2::data::XLabeledDataSequence >
+ CreateCategSequence() const;
private:
/** Reads a CHDROPBAR record group. */
@@ -1054,12 +1035,15 @@ private:
inline bool HasDropBars() const { return !maDropBars.empty(); }
/** Inserts the passed series into the chart type. Adds additional properties to the series. */
- void InsertDataSeries( XChartTypeRef xChartType,
- XDataSeriesRef xSeries, sal_Int32 nApiAxesSetIdx ) const;
+ void InsertDataSeries( css::uno::Reference< css::chart2::XChartType > xChartType,
+ css::uno::Reference< css::chart2::XDataSeries > xSeries,
+ sal_Int32 nApiAxesSetIdx ) const;
/** Creates all data series of any chart type except stock charts. */
- void CreateDataSeries( XChartTypeRef xChartType, sal_Int32 nApiAxesSetIdx ) const;
+ void CreateDataSeries( css::uno::Reference< css::chart2::XChartType > xChartType,
+ sal_Int32 nApiAxesSetIdx ) const;
/** Creates all data series of a stock chart. */
- void CreateStockSeries( XChartTypeRef xChartType, sal_Int32 nApiAxesSetIdx ) const;
+ void CreateStockSeries( css::uno::Reference< css::chart2::XChartType > xChartType,
+ sal_Int32 nApiAxesSetIdx ) const;
private:
typedef ::std::vector< XclImpChSeriesRef > XclImpChSeriesVec;
@@ -1087,16 +1071,13 @@ typedef boost::shared_ptr< XclImpChTypeGroup > XclImpChTypeGroupRef;
class XclImpChLabelRange : protected XclImpChRoot
{
public:
- typedef ::com::sun::star::chart2::ScaleData ScaleData;
-
-public:
explicit XclImpChLabelRange( const XclImpChRoot& rRoot );
/** Reads the CHLABELRANGE record (category axis scaling properties). */
void ReadChLabelRange( XclImpStream& rStrm );
/** Reads the CHDATERANGE record (date axis scaling properties). */
void ReadChDateRange( XclImpStream& rStrm );
/** Converts category axis scaling settings. */
- void Convert( ScfPropertySet& rPropSet, ScaleData& rScaleData, bool bMirrorOrient ) const;
+ void Convert( ScfPropertySet& rPropSet, css::chart2::ScaleData& rScaleData, bool bMirrorOrient ) const;
/** Converts position settings of this axis at a crossing axis. */
void ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3dChart ) const;
@@ -1110,14 +1091,11 @@ typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef;
class XclImpChValueRange : protected XclImpChRoot
{
public:
- typedef ::com::sun::star::chart2::ScaleData ScaleData;
-
-public:
explicit XclImpChValueRange( const XclImpChRoot& rRoot );
/** Reads the CHVALUERANGE record (numeric axis scaling properties). */
void ReadChValueRange( XclImpStream& rStrm );
/** Converts value axis scaling settings. */
- void Convert( ScaleData& rScaleData, bool bMirrorOrient ) const;
+ void Convert( css::chart2::ScaleData& rScaleData, bool bMirrorOrient ) const;
/** Converts position settings of this axis at a crossing axis. */
void ConvertAxisPosition( ScfPropertySet& rPropSet ) const;
@@ -1159,9 +1137,6 @@ typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef;
class XclImpChAxis : public XclImpChGroupBase, public XclImpChFontBase, protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > XAxisRef;
-
-public:
explicit XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType = EXC_CHAXIS_NONE );
/** Reads the CHAXIS record (called by base class). */
@@ -1192,7 +1167,8 @@ public:
inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); }
/** Creates an API axis object. */
- XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;
+ css::uno::Reference< css::chart2::XAxis >
+ CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;
/** Converts and writes 3D wall/floor properties to the passed property set. */
void ConvertWall( ScfPropertySet& rPropSet ) const;
/** Converts position settings of this axis at a crossing axis. */
@@ -1228,11 +1204,6 @@ typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef;
class XclImpChAxesSet : public XclImpChGroupBase, protected XclImpChRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > XAxisRef;
-
-public:
explicit XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId );
/** Reads the CHAXESSET record (called by base class). */
@@ -1261,7 +1232,7 @@ public:
OUString GetSingleSeriesTitle() const;
/** Creates a coordinate system and converts all series and axis settings. */
- void Convert( XDiagramRef xDiagram ) const;
+ void Convert( css::uno::Reference< css::chart2::XDiagram > xDiagram ) const;
/** Converts the manual positions of all axis titles. */
void ConvertTitlePositions() const;
@@ -1279,14 +1250,17 @@ private:
void UpdateAxisTitle( XclImpChTextRef xTitle );
/** Creates a coordinate system that contains all chart types for this axes set. */
- XCoordSystemRef CreateCoordSystem( XDiagramRef xDiagram ) const;
+ css::uno::Reference< css::chart2::XCoordinateSystem >
+ CreateCoordSystem( css::uno::Reference< css::chart2::XDiagram > xDiagram ) const;
/** Creates and inserts an axis into the container and registers the coordinate system. */
void ConvertAxis( XclImpChAxisRef xChAxis, XclImpChTextRef xChAxisTitle,
- XCoordSystemRef xCoordSystem, const XclImpChAxis* pCrossingAxis ) const;
+ css::uno::Reference< css::chart2::XCoordinateSystem > xCoordSystem,
+ const XclImpChAxis* pCrossingAxis ) const;
/** Creates and returns an API axis object. */
- XAxisRef CreateAxis( const XclImpChAxis& rChAxis, const XclImpChAxis* pCrossingAxis ) const;
+ css::uno::Reference< css::chart2::XAxis >
+ CreateAxis( const XclImpChAxis& rChAxis, const XclImpChAxis* pCrossingAxis ) const;
/** Writes all properties of the background area to the passed diagram. */
- void ConvertBackground( XDiagramRef xDiagram ) const;
+ void ConvertBackground( css::uno::Reference< css::chart2::XDiagram > xDiagram ) const;
private:
typedef ::std::map<sal_uInt16, XclImpChTypeGroupRef> XclImpChTypeGroupMap;
@@ -1417,9 +1391,6 @@ private:
class XclImpChart : protected XclImpRoot
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > XModelRef;
-
-public:
/** Constructs a new chart object.
@param bOwnTab True = chart is on an own sheet; false = chart is an embedded object. */
explicit XclImpChart( const XclImpRoot& rRoot, bool bOwnTab );
@@ -1437,7 +1408,7 @@ public:
inline bool IsPivotChart() const { return mbIsPivotChart; }
/** Creates the chart object in the passed component. */
- void Convert( XModelRef xModel,
+ void Convert( css::uno::Reference< css::frame::XModel > xModel,
XclImpDffConverter& rDffConv,
const OUString& rObjName,
const Rectangle& rChartRect ) const;
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 9aebff7db4d0..3156d98157d9 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -1286,23 +1286,19 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
class XclChObjectTable
{
public:
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > XNameContainerRef;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > XServiceFactoryRef;
-
-public:
- explicit XclChObjectTable( XServiceFactoryRef xFactory,
+ explicit XclChObjectTable( css::uno::Reference< css::lang::XMultiServiceFactory > xFactory,
const OUString& rServiceName, const OUString& rObjNameBase );
/** Returns a named formatting object from the chart document. */
- ::com::sun::star::uno::Any GetObject( const OUString& rObjName );
+ css::uno::Any GetObject( const OUString& rObjName );
/** Insertes a named formatting object into the chart document. */
- OUString InsertObject( const ::com::sun::star::uno::Any& rObj );
+ OUString InsertObject( const ::com::sun::star::uno::Any& rObj );
private:
- XServiceFactoryRef mxFactory; /// Factory to create the container.
- XNameContainerRef mxContainer; /// Container for the objects.
- OUString maServiceName; /// Service name to create the container.
- OUString maObjNameBase; /// Base of names for inserted objects.
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; /// Factory to create the container.
+ css::uno::Reference< css::container::XNameContainer > mxContainer; /// Container for the objects.
+ OUString maServiceName; /// Service name to create the container.
+ OUString maObjNameBase; /// Base of names for inserted objects.
sal_Int32 mnIndex; /// Index to create unique identifiers.
};
@@ -1405,7 +1401,7 @@ struct XclChRootData
typedef std::shared_ptr< XclChTypeInfoProvider > XclChTypeProvRef;
typedef std::shared_ptr< XclChFormatInfoProvider > XclChFmtInfoProvRef;
typedef std::shared_ptr< XclChObjectTable > XclChObjectTableRef;
- typedef ::std::map< XclChTextKey, XclChGetShapeFunc > XclChGetShapeFuncMap;
+ typedef std::map< XclChTextKey, XclChGetShapeFunc > XclChGetShapeFuncMap;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
mxChartDoc; /// The chart document.
generated by cgit (git 2.34.1) at 2024-08-06 06:23:58 +0000