[PATCH 17/31] Replace ScfRef with boost in xichart.hxx

Nigel Hawkins n.hawkins at gmx.com
Thu Nov 18 12:06:58 PST 2010 

---
 sc/source/filter/inc/xichart.hxx |   63 +++++++++++++++++++------------------
 1 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 72b3e89..0ebf51c 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -42,6 +42,7 @@
 #include "xlstyle.hxx"
 #include "xiescher.hxx"
 #include "xistring.hxx"
+#include <boost/shared_ptr.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace awt
@@ -168,7 +169,7 @@ public:
                             sal_uInt16 nAngle );
 
 private:
-    typedef ScfRef< XclImpChRootData > XclImpChRootDataRef;
+    typedef boost::shared_ptr< XclImpChRootData > XclImpChRootDataRef;
     XclImpChRootDataRef mxChData;           /// Reference to the root data object.
 };
 
@@ -215,7 +216,7 @@ private:
     XclChFramePos       maData;             /// Position of the frame.
 };
 
-typedef ScfRef< XclImpChFramePos > XclImpChFramePosRef;
+typedef boost::shared_ptr< XclImpChFramePos > XclImpChFramePosRef;
 
 // ----------------------------------------------------------------------------
 
@@ -249,7 +250,7 @@ private:
     XclChLineFormat     maData;             /// Contents of the CHLINEFORMAT record.
 };
 
-typedef ScfRef< XclImpChLineFormat > XclImpChLineFormatRef;
+typedef boost::shared_ptr< XclImpChLineFormat > XclImpChLineFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -279,7 +280,7 @@ private:
     XclChAreaFormat     maData;             /// Contents of the CHAREAFORMAT record.
 };
 
-typedef ScfRef< XclImpChAreaFormat > XclImpChAreaFormatRef;
+typedef boost::shared_ptr< XclImpChAreaFormat > XclImpChAreaFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -303,7 +304,7 @@ private:
     XclChPicFormat      maPicFmt;           /// Image options, e.g. stretched, stacked (CHPICFORMAT record).
 };
 
-typedef ScfRef< XclImpChEscherFormat > XclImpChEscherFormatRef;
+typedef boost::shared_ptr< XclImpChEscherFormat > XclImpChEscherFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -385,7 +386,7 @@ private:
     XclChObjectType     meObjType;          /// Type of the represented object.
 };
 
-typedef ScfRef< XclImpChFrame > XclImpChFrameRef;
+typedef boost::shared_ptr< XclImpChFrame > XclImpChFrameRef;
 
 // Source links ===============================================================
 
@@ -433,10 +434,10 @@ public:
 private:
     XclChSourceLink     maData;             /// Contents of the CHSOURCELINK record.
     XclImpStringRef     mxString;           /// Text data (CHSTRING record).
-    ScfRef< ScTokenArray> mxTokenArray;     /// Token array representing the data ranges.
+    boost::shared_ptr< ScTokenArray> mxTokenArray;     /// Token array representing the data ranges.
 };
 
-typedef ScfRef< XclImpChSourceLink > XclImpChSourceLinkRef;
+typedef boost::shared_ptr< XclImpChSourceLink > XclImpChSourceLinkRef;
 
 // Text =======================================================================
 
@@ -476,7 +477,7 @@ private:
     sal_uInt16          mnFontIdx;          /// Index into font buffer.
 };
 
-typedef ScfRef< XclImpChFont > XclImpChFontRef;
+typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef;
 
 // ----------------------------------------------------------------------------
 
@@ -543,7 +544,7 @@ private:
     void                ReadChFrLabelProps( XclImpStream& rStrm );
 
 private:
-    typedef ScfRef< XclChFrLabelProps > XclChFrLabelPropsRef;
+    typedef boost::shared_ptr< XclChFrLabelProps > XclChFrLabelPropsRef;
 
     XclChText           maData;             /// Contents of the CHTEXT record.
     XclChObjectLink     maObjLink;          /// Link target for this text object.
@@ -555,7 +556,7 @@ private:
     XclChFrLabelPropsRef mxLabelProps;      /// Extended data label properties (CHFRLABELPROPS record).
 };
 
-typedef ScfRef< XclImpChText > XclImpChTextRef;
+typedef boost::shared_ptr< XclImpChText > XclImpChTextRef;
 
 // Data series ================================================================
 
@@ -580,7 +581,7 @@ private:
     XclChMarkerFormat   maData;             /// Contents of the CHMARKERFORMAT record.
 };
 
-typedef ScfRef< XclImpChMarkerFormat > XclImpChMarkerFormatRef;
+typedef boost::shared_ptr< XclImpChMarkerFormat > XclImpChMarkerFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -598,7 +599,7 @@ private:
     sal_uInt16          mnPieDist;          /// Pie distance to diagram center.
 };
 
-typedef ScfRef< XclImpChPieFormat > XclImpChPieFormatRef;
+typedef boost::shared_ptr< XclImpChPieFormat > XclImpChPieFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -616,7 +617,7 @@ private:
     sal_uInt16          mnFlags;            /// Additional flags.
 };
 
-typedef ScfRef< XclImpChSeriesFormat > XclImpChSeriesFormatRef;
+typedef boost::shared_ptr< XclImpChSeriesFormat > XclImpChSeriesFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -633,7 +634,7 @@ private:
     XclCh3dDataFormat   maData;             /// Contents of the CH3DDATAFORMAT record.
 };
 
-typedef ScfRef< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef;
+typedef boost::shared_ptr< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -651,7 +652,7 @@ private:
     sal_uInt16          mnFlags;            /// Additional flags.
 };
 
-typedef ScfRef< XclImpChAttachedLabel > XclImpChAttLabelRef;
+typedef boost::shared_ptr< XclImpChAttachedLabel > XclImpChAttLabelRef;
 
 // ----------------------------------------------------------------------------
 
@@ -719,7 +720,7 @@ private:
     XclImpChTextRef     mxLabel;            /// Data point label formatting (CHTEXT group).
 };
 
-typedef ScfRef< XclImpChDataFormat > XclImpChDataFormatRef;
+typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -745,7 +746,7 @@ private:
     XclImpChDataFormatRef mxDataFmt;        /// Formatting settings of the trend line.
 };
 
-typedef ScfRef< XclImpChSerTrendLine > XclImpChSerTrendLineRef;
+typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef;
 
 // ----------------------------------------------------------------------------
 
@@ -782,7 +783,7 @@ private:
     XclImpChDataFormatRef mxDataFmt;        /// Formatting settings of the error bars.
 };
 
-typedef ScfRef< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
+typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
 
 // ----------------------------------------------------------------------------
 
@@ -888,7 +889,7 @@ private:
     sal_uInt16          mnParentIdx;        /// 0-based index of parent series (trend lines and error bars).
 };
 
-typedef ScfRef< XclImpChSeries > XclImpChSeriesRef;
+typedef boost::shared_ptr< XclImpChSeries > XclImpChSeriesRef;
 
 // Chart type groups ==========================================================
 
@@ -946,7 +947,7 @@ private:
     XclChChart3d        maData;             /// Contents of the CHCHART3D record.
 };
 
-typedef ScfRef< XclImpChChart3d > XclImpChChart3dRef;
+typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef;
 
 // ----------------------------------------------------------------------------
 
@@ -980,7 +981,7 @@ private:
     XclImpChFrameRef    mxFrame;            /// Legend frame format (CHFRAME group).
 };
 
-typedef ScfRef< XclImpChLegend > XclImpChLegendRef;
+typedef boost::shared_ptr< XclImpChLegend > XclImpChLegendRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1005,7 +1006,7 @@ private:
     sal_uInt16          mnBarDist;          /// Distance between bars (CHDROPBAR record).
 };
 
-typedef ScfRef< XclImpChDropBar > XclImpChDropBarRef;
+typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1122,7 +1123,7 @@ private:
     UInt16Set           maUnusedFormats;    /// Contains unused format indexes for automatic colors.
 };
 
-typedef ScfRef< XclImpChTypeGroup > XclImpChTypeGroupRef;
+typedef boost::shared_ptr< XclImpChTypeGroup > XclImpChTypeGroupRef;
 
 // Axes =======================================================================
 
@@ -1144,7 +1145,7 @@ private:
     XclChLabelRange     maData;             /// Contents of the CHLABELRANGE record.
 };
 
-typedef ScfRef< XclImpChLabelRange > XclImpChLabelRangeRef;
+typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1166,7 +1167,7 @@ private:
     XclChValueRange     maData;             /// Contents of the CHVALUERANGE record.
 };
 
-typedef ScfRef< XclImpChValueRange > XclImpChValueRangeRef;
+typedef boost::shared_ptr< XclImpChValueRange > XclImpChValueRangeRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1191,7 +1192,7 @@ private:
     XclChTick           maData;             /// Contents of the CHTICK record.
 };
 
-typedef ScfRef< XclImpChTick > XclImpChTickRef;
+typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1262,7 +1263,7 @@ private:
     sal_uInt16          mnNumFmtIdx;        /// Index into number format buffer (CHFORMAT record).
 };
 
-typedef ScfRef< XclImpChAxis > XclImpChAxisRef;
+typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1350,7 +1351,7 @@ private:
     XclImpChTypeGroupMap maTypeGroups;      /// Chart type groups (CHTYPEGROUP group).
 };
 
-typedef ScfRef< XclImpChAxesSet > XclImpChAxesSetRef;
+typedef boost::shared_ptr< XclImpChAxesSet > XclImpChAxesSetRef;
 
 // The chart object ===========================================================
 
@@ -1436,7 +1437,7 @@ private:
     XclImpChLegendRef   mxLegend;           /// Chart legend (CHLEGEND group).
 };
 
-typedef ScfRef< XclImpChChart > XclImpChChartRef;
+typedef boost::shared_ptr< XclImpChChart > XclImpChChartRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1501,7 +1502,7 @@ private:
     void                ReadChChart( XclImpStream& rStrm );
 
 private:
-    typedef ScfRef< XclImpChartDrawing > XclImpChartDrawingRef;
+    typedef boost::shared_ptr< XclImpChartDrawing > XclImpChartDrawingRef;
 
     XclImpChChartRef    mxChartData;        /// The chart data (CHCHART group).
     XclImpChartDrawingRef mxChartDrawing;   /// Drawing container for embedded shapes.
-- 
1.7.0.4


--=-qLwfU1BKYMIcJNs5pkFI
Content-Disposition: attachment; filename="0018-Replace-ScfRef-with-boost-in-xiescher.cxx.patch"
Content-Type: text/x-patch; name="0018-Replace-ScfRef-with-boost-in-xiescher.cxx.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit

More information about the LibreOffice mailing list