[PATCH 22/31] Replace ScfRef with boost in xiroot.hxx

[Nigel Hawkins]

---
 sc/source/filter/inc/xiroot.hxx |   45 ++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index 68e39a1..1b4153e 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -30,13 +30,14 @@
 #define SC_XIROOT_HXX
 
 #include "xlroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 // Forward declarations of objects in public use ==============================
 
 class XclImpStream;
 class XclImpString;
 
-typedef ScfRef< XclImpString > XclImpStringRef;
+typedef boost::shared_ptr< XclImpString > XclImpStringRef;
 
 // Global data ================================================================
 
@@ -70,28 +71,28 @@ class ExcelToSc;
 /** Stores global buffers and data needed for Excel import filter. */
 struct XclImpRootData : public XclRootData
 {
-    typedef ScfRef< XclImpAddressConverter >    XclImpAddrConvRef;
-    typedef ScfRef< XclImpFormulaCompiler >     XclImpFmlaCompRef;
-
-    typedef ScfRef< XclImpSst >                 XclImpSstRef;
-    typedef ScfRef< XclImpPalette >             XclImpPaletteRef;
-    typedef ScfRef< XclImpFontBuffer >          XclImpFontBfrRef;
-    typedef ScfRef< XclImpNumFmtBuffer >        XclImpNumFmtBfrRef;
-    typedef ScfRef< XclImpXFBuffer >            XclImpXFBfrRef;
-    typedef ScfRef< XclImpXFRangeBuffer >       XclImpXFRangeBfrRef;
-    typedef ScfRef< XclImpTabInfo >             XclImpTabInfoRef;
-    typedef ScfRef< XclImpNameManager >         XclImpNameMgrRef;
-    typedef ScfRef< XclImpLinkManager >         XclImpLinkMgrRef;
-    typedef ScfRef< XclImpObjectManager >       XclImpObjectMgrRef;
-    typedef ScfRef< XclImpCondFormatManager >   XclImpCondFmtMgrRef;
-    typedef ScfRef< XclImpValidationManager >   XclImpValidationMgrRef;
-    typedef ScfRef< XclImpWebQueryBuffer >      XclImpWebQueryBfrRef;
-    typedef ScfRef< XclImpPivotTableManager >   XclImpPTableMgrRef;
-    typedef ScfRef< XclImpPageSettings >        XclImpPageSettRef;
-    typedef ScfRef< XclImpDocViewSettings >     XclImpDocViewSettRef;
-    typedef ScfRef< XclImpTabViewSettings >     XclImpTabViewSettRef;
-    typedef ScfRef< XclImpSheetProtectBuffer >  XclImpTabProtectRef;
-    typedef ScfRef< XclImpDocProtectBuffer >    XclImpDocProtectRef;
+    typedef boost::shared_ptr< XclImpAddressConverter >    XclImpAddrConvRef;
+    typedef boost::shared_ptr< XclImpFormulaCompiler >     XclImpFmlaCompRef;
+
+    typedef boost::shared_ptr< XclImpSst >                 XclImpSstRef;
+    typedef boost::shared_ptr< XclImpPalette >             XclImpPaletteRef;
+    typedef boost::shared_ptr< XclImpFontBuffer >          XclImpFontBfrRef;
+    typedef boost::shared_ptr< XclImpNumFmtBuffer >        XclImpNumFmtBfrRef;
+    typedef boost::shared_ptr< XclImpXFBuffer >            XclImpXFBfrRef;
+    typedef boost::shared_ptr< XclImpXFRangeBuffer >       XclImpXFRangeBfrRef;
+    typedef boost::shared_ptr< XclImpTabInfo >             XclImpTabInfoRef;
+    typedef boost::shared_ptr< XclImpNameManager >         XclImpNameMgrRef;
+    typedef boost::shared_ptr< XclImpLinkManager >         XclImpLinkMgrRef;
+    typedef boost::shared_ptr< XclImpObjectManager >       XclImpObjectMgrRef;
+    typedef boost::shared_ptr< XclImpCondFormatManager >   XclImpCondFmtMgrRef;
+    typedef boost::shared_ptr< XclImpValidationManager >   XclImpValidationMgrRef;
+    typedef boost::shared_ptr< XclImpWebQueryBuffer >      XclImpWebQueryBfrRef;
+    typedef boost::shared_ptr< XclImpPivotTableManager >   XclImpPTableMgrRef;
+    typedef boost::shared_ptr< XclImpPageSettings >        XclImpPageSettRef;
+    typedef boost::shared_ptr< XclImpDocViewSettings >     XclImpDocViewSettRef;
+    typedef boost::shared_ptr< XclImpTabViewSettings >     XclImpTabViewSettRef;
+    typedef boost::shared_ptr< XclImpSheetProtectBuffer >  XclImpTabProtectRef;
+    typedef boost::shared_ptr< XclImpDocProtectBuffer >    XclImpDocProtectRef;
 
     XclImpAddrConvRef   mxAddrConv;         /// The address converter.
     XclImpFmlaCompRef   mxFmlaComp;         /// The formula compiler.
-- 
1.7.0.4


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