Removed ScSharedTokenRef and replaced it with ScTokenRef.

ScSharedTokenRef was implemented by boost::shared_ptr, only because
SimpleIntrusiveReference which the original ScTokenRef was implemented
by could not be used with STL.

Now that ScTokenRef is implemented by intrusive_ptr, we no longer
need ScSharedTokenRef.

3 files changed, 7 insertions, 7 deletions

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 346bd32acda4..0743321026e1 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -839,7 +839,7 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
     return ScfApiHelper::VectorToSequence( aStringVec );
 }
 
-void XclImpChSourceLink::FillSourceLink( ::std::vector< ScSharedTokenRef >& rTokens ) const
+void XclImpChSourceLink::FillSourceLink( ::std::vector< ScTokenRef >& rTokens ) const
 {
     if( !mxTokenArray )
         // no links to fill.
@@ -848,7 +848,7 @@ void XclImpChSourceLink::FillSourceLink( ::std::vector< ScSharedTokenRef >& rTok
     mxTokenArray->Reset();
     for (FormulaToken* p = mxTokenArray->First(); p; p = mxTokenArray->Next())
     {
-        ScSharedTokenRef pToken(static_cast<ScToken*>(p->Clone()));
+        ScTokenRef pToken(static_cast<ScToken*>(p->Clone()));
         if (ScRefTokenHelper::isRef(pToken))
             // This is a reference token.  Store it.
             ScRefTokenHelper::join(rTokens, pToken);
@@ -1959,7 +1959,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
     return xDataSeries;
 }
 
-void XclImpChSeries::FillAllSourceLinks( ::std::vector< ScSharedTokenRef >& rTokens ) const
+void XclImpChSeries::FillAllSourceLinks( ::std::vector< ScTokenRef >& rTokens ) const
 {
     if( mxValueLink )
         mxValueLink->FillSourceLink( rTokens );
@@ -3834,7 +3834,7 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
     ScDocument& rDoc = GetRoot().GetDoc();
     if( ScChartListenerCollection* pChartCollection = rDoc.GetChartListenerCollection() )
     {
-        ::std::auto_ptr< ::std::vector< ScSharedTokenRef > > xRefTokens( new ::std::vector< ScSharedTokenRef > );
+        ::std::auto_ptr< ::std::vector< ScTokenRef > > xRefTokens( new ::std::vector< ScTokenRef > );
         for( XclImpChSeriesVec::const_iterator aIt = maSeries.begin(), aEnd = maSeries.end(); aIt != aEnd; ++aIt )
             (*aIt)->FillAllSourceLinks( *xRefTokens );
         if( !xRefTokens->empty() )
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 585ce46760be..c731ba48e16f 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -430,7 +430,7 @@ public:
     XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot,
                             sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const;
 
-    void                FillSourceLink(::std::vector<ScSharedTokenRef>& rTokens) const;
+    void                FillSourceLink(::std::vector<ScTokenRef>& rTokens) const;
 
 private:
     XclChSourceLink     maData;             /// Contents of the CHSOURCELINK record.
@@ -843,7 +843,7 @@ public:
     /** Creates a data series object with initialized source links. */
     XDataSeriesRef      CreateDataSeries() const;
 
-    void                FillAllSourceLinks(::std::vector<ScSharedTokenRef>& rTokens) const;
+    void                FillAllSourceLinks(::std::vector<ScTokenRef>& rTokens) const;
 
 private:
     /** Reads a CHSOURCELINK record. */
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 67d0736473c8..6d49693b4663 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -93,7 +93,7 @@ void ScMyShapeResizer::CreateChartListener(ScDocument* pDoc,
     if (!pCollection)
         return;
 
-    auto_ptr< vector<ScSharedTokenRef> > pRefTokens(new vector<ScSharedTokenRef>);
+    auto_ptr< vector<ScTokenRef> > pRefTokens(new vector<ScTokenRef>);
     ScRefTokenHelper::compileRangeRepresentation(*pRefTokens, aRangeStr, pDoc);
     if (!pRefTokens->empty())
     {