boost->std

Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a

4 files changed, 6 insertions, 10 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>