boost->std

Change-Id: Icae6b6f07ad8dbd287fdfc689739187883a07775

15 files changed, 26 insertions, 27 deletions

diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
index b2d48df71b65..654bc9a7a73f 100644
--- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
@@ -73,7 +73,7 @@ private:
     bool                mbRelSize;          /// True = relative size, false = absolute size.
 };
 
-typedef ::boost::shared_ptr< ShapeAnchor > ShapeAnchorRef;
+typedef std::shared_ptr< ShapeAnchor > ShapeAnchorRef;
 
 
 
diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx
index f414b6290fbe..bf3f7b5a303e 100644
--- a/oox/inc/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/chart/converterbase.hxx
@@ -95,7 +95,7 @@ protected:
     void                convertTitlePositions();
 
 private:
-    ::boost::shared_ptr< ConverterData > mxData;
+    std::shared_ptr< ConverterData > mxData;
 };
 
 
diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx
index d3a6a6d1668c..731b1501fcb8 100644
--- a/oox/inc/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/drawingml/chart/objectformatter.hxx
@@ -144,7 +144,7 @@ public:
     static bool         isAutomaticFill( const ModelRef< Shape >& rxShapeProp );
 
 private:
-    ::boost::shared_ptr< ObjectFormatterData > mxData;
+    std::shared_ptr< ObjectFormatterData > mxData;
 };
 
 
diff --git a/oox/inc/drawingml/table/tablestylelist.hxx b/oox/inc/drawingml/table/tablestylelist.hxx
index 624a453ded19..bf7243e69cdd 100644
--- a/oox/inc/drawingml/table/tablestylelist.hxx
+++ b/oox/inc/drawingml/table/tablestylelist.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
 
 #include <rtl/ustring.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 
 namespace oox { namespace drawingml { namespace table {
@@ -45,7 +45,7 @@ private:
 
 };
 
-typedef boost::shared_ptr< TableStyleList > TableStyleListPtr;
+typedef std::shared_ptr< TableStyleList > TableStyleListPtr;
 
 } } }
 
diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx
index 80ac53f0e7f2..9fd0d641a725 100644
--- a/oox/inc/drawingml/textfield.hxx
+++ b/oox/inc/drawingml/textfield.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX
 
-#include <boost/shared_ptr.hpp>
-
 #include <drawingml/textrun.hxx>
 #include <drawingml/textparagraphproperties.hxx>
+#include <memory>
 
 namespace oox { namespace drawingml {
 
@@ -54,7 +53,7 @@ private:
     OUString msUuid;
 };
 
-typedef boost::shared_ptr< TextField > TextFieldPtr;
+typedef std::shared_ptr< TextField > TextFieldPtr;
 
 } }
 
diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx
index c419a65d8cff..d3e93d431023 100644
--- a/oox/inc/drawingml/textparagraph.hxx
+++ b/oox/inc/drawingml/textparagraph.hxx
@@ -63,7 +63,7 @@ private:
     TextRunVector               maRuns;
 };
 
-typedef boost::shared_ptr< TextParagraph > TextParagraphPtr;
+typedef std::shared_ptr< TextParagraph > TextParagraphPtr;
 
 } }
 
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index e6ba58987bd3..c864d2c0fbaf 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -36,7 +36,7 @@ namespace oox { namespace drawingml {
 
 class TextParagraphProperties;
 
-typedef boost::shared_ptr< TextParagraphProperties > TextParagraphPropertiesPtr;
+typedef std::shared_ptr< TextParagraphProperties > TextParagraphPropertiesPtr;
 
 class BulletList
 {
diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
index 6f5fbc5983ed..cf666a4d260c 100644
--- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx
+++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
@@ -44,8 +44,8 @@ protected:
     TextParagraphProperties& mrTextParagraphProperties;
     TextSpacing     maLineSpacing;
     BulletList&     mrBulletList;
-    ::std::list< ::com::sun::star::style::TabStop >  maTabList;
-    ::boost::shared_ptr< BlipFillProperties > mxBlipProps;
+    std::list< ::com::sun::star::style::TabStop >  maTabList;
+    std::shared_ptr< BlipFillProperties > mxBlipProps;
 };
 
 } }
diff --git a/oox/inc/drawingml/textrun.hxx b/oox/inc/drawingml/textrun.hxx
index 1b77465f08ed..cba32da1baaa 100644
--- a/oox/inc/drawingml/textrun.hxx
+++ b/oox/inc/drawingml/textrun.hxx
@@ -54,7 +54,7 @@ private:
     bool                        mbIsLineBreak;
 };
 
-typedef boost::shared_ptr< TextRun > TextRunPtr;
+typedef std::shared_ptr< TextRun > TextRunPtr;
 
 } }
 
diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
index 2281d0423041..ea6f7a0647c5 100644
--- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
+++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
@@ -48,7 +48,7 @@ TableBackgroundStyleContext::onCreateContext( ::sal_Int32 aElementToken, const A
         // EG_ThemeableFillStyle (choice)
         case A_TOKEN( fill ):       // CT_FillProperties
             {
-                boost::shared_ptr< FillProperties >& rxFillProperties = mrTableStyle.getBackgroundFillProperties();
+                std::shared_ptr< FillProperties >& rxFillProperties = mrTableStyle.getBackgroundFillProperties();
                 rxFillProperties.reset( new FillProperties );
                 return new FillPropertiesContext( *this, *rxFillProperties );
             }
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 45486fd16377..2d8dfb8ad7b7 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -365,7 +365,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
 
     Color aBgColor;
     sal_Int32 nPhClr = API_RGB_TRANSPARENT;
-    boost::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
+    std::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
     ::oox::drawingml::ShapeStyleRef& rBackgroundFillStyle( rTable.getBackgroundFillStyleRef() );
     if (rBackgroundFillPropertiesPtr.get())
         aBgColor = rBackgroundFillPropertiesPtr->getBestSolidColor();
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 404bd9f5d07c..8ff5972183b7 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1359,7 +1359,7 @@ void SharedConfigData::createShortList( const OUString& rData )
         sal_Int64 nStartKey;
         if( StringHelper::convertStringToInt( nStartKey, aDataVec[ 1 ] ) )
         {
-            ::boost::shared_ptr< MultiList > xList = createNameList< MultiList >( aDataVec[ 0 ] );
+            std::shared_ptr< MultiList > xList = createNameList< MultiList >( aDataVec[ 0 ] );
             if( xList.get() )
             {
                 aDataVec.erase( aDataVec.begin(), aDataVec.begin() + 2 );
@@ -1382,7 +1382,7 @@ void SharedConfigData::createUnitConverter( const OUString& rData )
         double fFactor;
         if( StringHelper::convertStringToDouble( fFactor, aFactor ) && (fFactor != 0.0) )
         {
-            ::boost::shared_ptr< UnitConverter > xList = createNameList< UnitConverter >( aDataVec[ 0 ] );
+            std::shared_ptr< UnitConverter > xList = createNameList< UnitConverter >( aDataVec[ 0 ] );
             if( xList.get() )
             {
                 xList->setFactor( bRecip ? (1.0 / fFactor) : fFactor );
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index b59094f916f0..82bc27d9606f 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -419,7 +419,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla
                     BinaryXInputStream aXStrm( rStrg.openInputStream( "x" ), true );
                     pMultiPage->importPageAndMultiPageProperties( aXStrm, maControls.size() );
                 }
-                typedef std::unordered_map< sal_uInt32, ::boost::shared_ptr< VbaFormControl > > IdToPageMap;
+                typedef std::unordered_map< sal_uInt32, std::shared_ptr< VbaFormControl > > IdToPageMap;
                 IdToPageMap idToPage;
                 VbaFormControlVector::iterator it = maControls.begin();
                 VbaFormControlVector::iterator it_end = maControls.end();
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index aed94381a41b..e4910ad037d0 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -28,8 +28,8 @@
 #include "oox/vml/vmldrawingfragment.hxx"
 #include "oox/vml/vmlshape.hxx"
 #include "oox/drawingml/themefragmenthandler.hxx"
-#include <boost/scoped_ptr.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <memory>
 
 namespace oox { namespace shape {
 
@@ -105,7 +105,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getChartShape
         {
             case XML_chart:
             {
-                boost::scoped_ptr<ContextHandler2Helper> pFragmentHandler(
+                std::unique_ptr<ContextHandler2Helper> pFragmentHandler(
                         new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
                 mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" ));
                 mxChartShapeContext.set(new ChartGraphicDataContext(*pFragmentHandler, mpShape, true));
@@ -170,7 +170,7 @@ ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element )
 {
     if (! mxGraphicShapeContext.is())
     {
-        boost::shared_ptr<ContextHandler2Helper> pFragmentHandler
+        std::shared_ptr<ContextHandler2Helper> pFragmentHandler
             (new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
         ShapePtr pMasterShape;
 
@@ -226,7 +226,7 @@ ShapeContextHandler::getDiagramShapeContext()
 {
     if (!mxDiagramShapeContext.is())
     {
-        boost::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
+        std::shared_ptr<ContextHandler2Helper> pFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
         mpShape.reset(new Shape());
         mxDiagramShapeContext.set(new DiagramGraphicDataContext(*pFragmentHandler, mpShape));
     }
@@ -428,7 +428,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
         if ( getContextHandler() == getDrawingShapeContext() )
         {
             mpDrawing->finalizeFragmentImport();
-            if( boost::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() )
+            if( std::shared_ptr< vml::ShapeBase > pShape = mpDrawing->getShapes().takeLastShape() )
                 xResult = pShape->convertAndInsert( xShapes );
             // Only now remove the recursion mark, because getShape() is called in writerfilter
             // after endFastElement().
diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx
index 3b40e56c4d2e..a7fbb785ab20 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -61,7 +61,7 @@ ShapeContainer::~ShapeContainer()
 
 ShapeType& ShapeContainer::createShapeType()
 {
-    ::boost::shared_ptr< ShapeType > xShape( new ShapeType( mrDrawing ) );
+    std::shared_ptr< ShapeType > xShape( new ShapeType( mrDrawing ) );
     maTypes.push_back( xShape );
     return *xShape;
 }
@@ -103,13 +103,13 @@ const ShapeBase* ShapeContainer::getShapeById( const OUString& rShapeId, bool bD
    return 0;
 }
 
-boost::shared_ptr< ShapeBase > ShapeContainer::takeLastShape()
+std::shared_ptr< ShapeBase > ShapeContainer::takeLastShape()
 {
     OSL_ENSURE( mrDrawing.getType() == VMLDRAWING_WORD, "ShapeContainer::takeLastShape - illegal call, Word filter only" );
     assert( !markStack.empty());
     if( markStack.top() >= maShapes.size())
-        return boost::shared_ptr< ShapeBase >();
-    boost::shared_ptr< ShapeBase > ret = maShapes.back();
+        return std::shared_ptr< ShapeBase >();
+    std::shared_ptr< ShapeBase > ret = maShapes.back();
     maShapes.pop_back();
     return ret;
 }