boost->std

Change-Id: Ic18be8b86727dd1179a7e39c70493d088ed00557

5 files changed, 15 insertions, 17 deletions

diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index 78573fcf08b3..0a6f16fa9ac0 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -37,7 +37,6 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <memory>
 #include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <cassert>
 #include <com/sun/star/animations/AnimationAdditiveMode.hpp>
 #include <com/sun/star/animations/AnimationCalcMode.hpp>
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 2bf25e6a23ea..c85b896a99e4 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/shared_ptr.hpp>
 #include <tools/debug.hxx>
 #include <XMLNumberStylesExport.hxx>
 #include <XMLNumberStylesImport.hxx>
@@ -486,7 +485,7 @@ private:
     bool mbTextual;
     bool mbDecimal02;
     OUString maText;
-    boost::shared_ptr< SvXMLImportContext > mpSlaveContext;
+    std::shared_ptr< SvXMLImportContext > mpSlaveContext;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 51d2c952e5f7..66b82273ccd4 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -113,7 +113,7 @@
 #include "xexptran.hxx"
 #include "XMLBase64Export.hxx"
 #include "XMLImageMapExport.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #include <config_features.h>
 
@@ -585,7 +585,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     sal_Int32 nZIndex = 0;
     uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY );
 
-    boost::scoped_ptr< SvXMLElementExport >  mpHyperlinkElement;
+    std::unique_ptr< SvXMLElementExport >  mpHyperlinkElement;
 
     // export hyperlinks with <a><shape/></a>. Currently only in draw since draw
     // does not support document events
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index de381ceaff65..b408c6a2c261 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <xmloff/xmlimp.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #define XML_LINE_LEFT 0
 #define XML_LINE_RIGHT 1
@@ -50,7 +50,7 @@ PageMasterImportPropertyMapper::~PageMasterImportPropertyMapper()
 
 bool PageMasterImportPropertyMapper::handleSpecialItem(
         XMLPropertyState& rProperty,
-        ::std::vector< XMLPropertyState >& rProperties,
+        std::vector< XMLPropertyState >& rProperties,
         const OUString& rValue,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap ) const
@@ -82,7 +82,7 @@ bool PageMasterImportPropertyMapper::handleSpecialItem(
 }
 
 
-void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const
+void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const
 {
     SvXMLImportPropertyMapper::finished(rProperties, nStartIndex, nEndIndex);
     XMLPropertyState* pAllPaddingProperty = NULL;
@@ -111,22 +111,22 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
     XMLPropertyState* pFooterBorderWidths[4] = { NULL, NULL, NULL, NULL };
     XMLPropertyState* pHeaderHeight = NULL;
     XMLPropertyState* pHeaderMinHeight = NULL;
-    boost::scoped_ptr<XMLPropertyState> xHeaderDynamic;
+    std::unique_ptr<XMLPropertyState> xHeaderDynamic;
     XMLPropertyState* pFooterHeight = NULL;
     XMLPropertyState* pFooterMinHeight = NULL;
-    boost::scoped_ptr<XMLPropertyState> xFooterDynamic;
+    std::unique_ptr<XMLPropertyState> xFooterDynamic;
     XMLPropertyState* pAllMarginProperty = NULL;
     XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
-    ::std::unique_ptr<XMLPropertyState> pNewMargins[4];
+    std::unique_ptr<XMLPropertyState> pNewMargins[4];
     XMLPropertyState* pAllHeaderMarginProperty = NULL;
     XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL };
-    ::std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4];
+    std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4];
     XMLPropertyState* pAllFooterMarginProperty = NULL;
     XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL };
-    ::std::unique_ptr<XMLPropertyState> pNewFooterMargins[4];
+    std::unique_ptr<XMLPropertyState> pNewFooterMargins[4];
 
-    ::std::vector< XMLPropertyState >::iterator aEnd = rProperties.end();
-    for (::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != aEnd; ++aIter)
+    std::vector< XMLPropertyState >::iterator aEnd = rProperties.end();
+    for (std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != aEnd; ++aIter)
     {
         XMLPropertyState *property = &(*aIter);
         sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex);
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 8ca89b6f6507..7ea0ba1e23c2 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -39,8 +39,8 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/XMLEventExport.hxx>
 #include <xmloff/maptype.hxx>
+#include <memory>
 #include <set>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -398,7 +398,7 @@ void XMLStyleExport::exportStyleFamily(
        // If next styles are supported and used styles should be exported only,
     // the next style may be unused but has to be exported, too. In this case
     // the names of all exported styles are remembered.
-    boost::scoped_ptr<std::set<OUString> > pExportedStyles(0);
+    std::unique_ptr<std::set<OUString> > pExportedStyles(nullptr);
     bool bFirstStyle = true;
 
     const uno::Sequence< OUString> aSeq = xStyleCont->getElementNames();