boost->std

Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a

12 files changed, 30 insertions, 36 deletions

diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index f5916c4b5567..b7f297a101c2 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -28,8 +28,6 @@
 #include <drawingml/textliststyle.hxx>
 #include <com/sun/star/table/XCell.hpp>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
 #include <vector>
 #include <map>
 
diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx
index eb3ba78cd017..21550bb56c76 100644
--- a/oox/inc/drawingml/table/tableproperties.hxx
+++ b/oox/inc/drawingml/table/tableproperties.hxx
@@ -25,10 +25,9 @@
 #include <oox/helper/propertymap.hxx>
 #include <oox/drawingml/color.hxx>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-#include <vector>
 #include <map>
+#include <memory>
+#include <vector>
 
 namespace oox { namespace drawingml { namespace table {
 
@@ -43,7 +42,7 @@ public:
     std::vector< TableRow >& getTableRows() { return mvTableRows; };
 
     OUString&                          getStyleId(){ return maStyleId; };
-    boost::shared_ptr< TableStyle >&    getTableStyle(){ return mpTableStyle; };
+    std::shared_ptr< TableStyle >&    getTableStyle(){ return mpTableStyle; };
     bool&                               isRtl(){ return mbRtl; };
     bool&                               isFirstRow(){ return mbFirstRow; };
     bool&                               isFirstCol(){ return mbFirstCol; };
@@ -60,7 +59,7 @@ private:
     const TableStyle&                   getUsedTableStyle(const ::oox::core::XmlFilterBase& rFilterBase, TableStyle*& rTableStyleToDelete);
 
     OUString                            maStyleId;              // either StyleId is available
-    boost::shared_ptr< TableStyle >     mpTableStyle;           // or the complete TableStyle
+    std::shared_ptr< TableStyle >     mpTableStyle;           // or the complete TableStyle
     std::vector< sal_Int32 >            mvTableGrid;
     std::vector< TableRow >             mvTableRows;
 
diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx
index b8e3aeb4a4a0..825192616e0f 100644
--- a/oox/inc/drawingml/texteffectscontext.hxx
+++ b/oox/inc/drawingml/texteffectscontext.hxx
@@ -15,7 +15,7 @@
 
 #include <oox/helper/grabbagstack.hxx>
 #include <oox/core/contexthandler2.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <vector>
 
 namespace oox { namespace drawingml {
@@ -35,7 +35,7 @@ public:
 
 protected:
     std::vector<css::beans::PropertyValue>& mrTextEffectsProperties;
-    boost::scoped_ptr<oox::GrabBagStack> mpGrabBagStack;
+    std::unique_ptr<oox::GrabBagStack> mpGrabBagStack;
     sal_Int32 mnCurrentElement;
 
 private:
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 7b81b907f624..623b19220981 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -34,7 +34,6 @@
 #include <boost/bind.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <cassert>
 #include <com/sun/star/animations/AnimationCalcMode.hpp>
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx
index 177a6aa4c556..602f8fe8f5f0 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx
@@ -49,7 +49,7 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement,
     {
     case DGM_TOKEN( constr ):
     {
-        boost::shared_ptr< ConstraintAtom > pNode( new ConstraintAtom() );
+        std::shared_ptr< ConstraintAtom > pNode( new ConstraintAtom() );
         mpNode->addChild( pNode );
 
         pNode->setFor( rAttribs.getToken( XML_for, XML_none ) );
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 259ca3cb6755..9811c7f01bf1 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAM_HXX
 
 #include <map>
+#include <memory>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-
 #include <rtl/ustring.hxx>
 
 #include "oox/drawingml/shape.hxx"
@@ -150,7 +148,7 @@ typedef std::vector< Point >        Points;
 }
 
 class LayoutNode;
-typedef boost::shared_ptr< LayoutNode > LayoutNodePtr;
+typedef std::shared_ptr< LayoutNode > LayoutNodePtr;
 
 typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > DiagramDomMap;
 typedef css::uno::Sequence< css::uno::Sequence< css::uno::Any > > DiagramRelsMap;
@@ -194,7 +192,7 @@ private:
     StringMap         maPresOfNameMap;
 };
 
-typedef boost::shared_ptr< DiagramData > DiagramDataPtr;
+typedef std::shared_ptr< DiagramData > DiagramDataPtr;
 
 class DiagramLayout
 {
@@ -237,7 +235,7 @@ private:
     // clrData
 };
 
-typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr;
+typedef std::shared_ptr< DiagramLayout > DiagramLayoutPtr;
 
 struct DiagramStyle
 {
@@ -291,7 +289,7 @@ private:
     DiagramRelsMap                 maDataRelsMap;
 };
 
-typedef boost::shared_ptr< Diagram > DiagramPtr;
+typedef std::shared_ptr< Diagram > DiagramPtr;
 
 } }
 
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 5d20256caf6e..b27216a697c1 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -23,7 +23,7 @@
 #include <map>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/array.hpp>
 
 #include <com/sun/star/uno/Any.hxx>
@@ -35,7 +35,7 @@
 namespace oox { namespace drawingml {
 
 class DiagramLayout;
-typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr;
+typedef std::shared_ptr< DiagramLayout > DiagramLayoutPtr;
 
 // AG_IteratorAttributes
 struct IteratorAttr
@@ -69,7 +69,7 @@ struct ConditionAttr
 struct LayoutAtomVisitor;
 class LayoutAtom;
 
-typedef boost::shared_ptr< LayoutAtom > LayoutAtomPtr;
+typedef std::shared_ptr< LayoutAtom > LayoutAtomPtr;
 
 /** abstract Atom for the layout */
 class LayoutAtom
@@ -171,7 +171,7 @@ private:
     ParamMap  maMap;
 };
 
-typedef boost::shared_ptr< AlgAtom > AlgAtomPtr;
+typedef std::shared_ptr< AlgAtom > AlgAtomPtr;
 
 class ForEachAtom
     : public LayoutAtom
@@ -189,7 +189,7 @@ private:
     IteratorAttr maIter;
 };
 
-typedef boost::shared_ptr< ForEachAtom > ForEachAtomPtr;
+typedef std::shared_ptr< ForEachAtom > ForEachAtomPtr;
 
 class ConditionAtom
     : public LayoutAtom
@@ -210,7 +210,7 @@ private:
     std::vector< LayoutAtomPtr > mpElseChildNodes;
 };
 
-typedef boost::shared_ptr< ConditionAtom > ConditionAtomPtr;
+typedef std::shared_ptr< ConditionAtom > ConditionAtomPtr;
 
 /** "choose" statements. Atoms will be tested in order. */
 class ChooseAtom
@@ -269,7 +269,7 @@ private:
     sal_Int32                    mnChildOrder;
 };
 
-typedef boost::shared_ptr< LayoutNode > LayoutNodePtr;
+typedef std::shared_ptr< LayoutNode > LayoutNodePtr;
 
 struct LayoutAtomVisitor
 {
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index c92070648d73..cc3bb6ae87df 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -249,7 +249,7 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
     }
     case DGM_TOKEN( shape ):
     {
-        LayoutNodePtr pNode( boost::dynamic_pointer_cast< LayoutNode >( mpNode ) );
+        LayoutNodePtr pNode(std::dynamic_pointer_cast<LayoutNode>(mpNode));
         if( pNode )
         {
             ShapePtr pShape;
@@ -319,7 +319,7 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
         break;
     case DGM_TOKEN( varLst ):
     {
-        LayoutNodePtr pNode( boost::dynamic_pointer_cast< LayoutNode >( mpNode ) );
+        LayoutNodePtr pNode(std::dynamic_pointer_cast<LayoutNode>(mpNode));
         if( pNode )
         {
             return new LayoutVariablePropertySetContext( *this, pNode->variables() );
diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx
index ac6a8624a40a..30bab795e2b7 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -59,7 +59,7 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList& r
         break;
     case A_TOKEN( tableStyle ):         // CT_TableStyle
         {
-            boost::shared_ptr< TableStyle >& rTableStyle = mrTableProperties.getTableStyle();
+            std::shared_ptr< TableStyle >& rTableStyle = mrTableProperties.getTableStyle();
             rTableStyle.reset( new TableStyle() );
             return new TableStyleContext( *this, rAttribs, *rTableStyle );
         }
diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx
index e996e1a1afe8..28a4b98ff646 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -109,7 +109,7 @@ TextEffectsContext::TextEffectsContext(
                         std::vector<PropertyValue>& rTextEffectsProperties)
     : ContextHandler2(rParent)
     , mrTextEffectsProperties(rTextEffectsProperties)
-    , mpGrabBagStack(NULL)
+    , mpGrabBagStack(nullptr)
     , mnCurrentElement(aElementToken)
 {
 }
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index 72b9f882b384..ca9aecf713e4 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
 #define INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
@@ -37,7 +37,7 @@ namespace oox { namespace shape {
 class ShapeFragmentHandler : public core::FragmentHandler2
 {
 public:
-    typedef boost::shared_ptr<ShapeFragmentHandler> Pointer_t;
+    typedef std::shared_ptr<ShapeFragmentHandler> Pointer_t;
 
     explicit ShapeFragmentHandler(core::XmlFilterBase& rFilter,
                                   const OUString& rFragmentPath )
@@ -153,9 +153,9 @@ private:
 
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
     drawingml::ShapePtr mpShape;
-    ::boost::shared_ptr< vml::Drawing > mpDrawing;
+    std::shared_ptr< vml::Drawing > mpDrawing;
 
-    typedef boost::shared_ptr<drawingml::GraphicShapeContext>
+    typedef std::shared_ptr<drawingml::GraphicShapeContext>
     GraphicShapeContextPtr;
     css::uno::Reference<XFastContextHandler> mxDrawingFragmentHandler;
     css::uno::Reference<XFastContextHandler> mxGraphicShapeContext;
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index 06d4722bd8a4..171e27419a07 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX
 #define INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <rtl/ref.hxx>
 #include "oox/vml/vmldrawing.hxx"
 #include "drawingml/table/tablestylelist.hxx"
@@ -33,7 +33,7 @@ namespace shape {
 class ShapeFilterBase : public core::XmlFilterBase
 {
 public:
-    typedef boost::shared_ptr<ShapeFilterBase> Pointer_t;
+    typedef std::shared_ptr<ShapeFilterBase> Pointer_t;
 
     explicit            ShapeFilterBase(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
@@ -64,7 +64,7 @@ private:
     virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE;
 
-    ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
+    std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
     ::oox::drawingml::ThemePtr mpTheme;
 };