10 files changed, 18 insertions, 19 deletions
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index 4a1909c8b55f..a7204b9642f8 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <cassert>
 #include <climits>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -119,6 +118,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <list>
 #include <map>
+#include <memory>
 #include <osl/conditn.hxx>
 #include <osl/file.h>
 #include <osl/file.hxx>
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 807f2a2a9724..dde2848f35e8 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -23,12 +23,12 @@
 #include <sal/config.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <vector>
 #include "config_map.hxx"
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
@@ -564,7 +564,7 @@ private:
     PropertiesChangeListeners propertiesChangeListeners_;
     bool disposed_;
 
-    boost::shared_ptr<osl::Mutex> lock_;
+    std::shared_ptr<osl::Mutex> lock_;
 
 #if !defined NDEBUG
 protected:
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index ee336fac20e1..2838bbd86c93 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -22,10 +22,9 @@
 
 #include <sal/config.h>
 
+#include <memory>
 #include <vector>
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -137,10 +136,10 @@ private:
     rtl::Reference< Access > parent_; // null if free node
     OUString name_;
     rtl::Reference< Node > node_;
-    boost::scoped_ptr< com::sun::star::uno::Any > changedValue_;
+    std::unique_ptr< com::sun::star::uno::Any > changedValue_;
     bool inTransaction_;
         // to determine if a free node can be inserted underneath some root
-    boost::shared_ptr<osl::Mutex> lock_;
+    std::shared_ptr<osl::Mutex> lock_;
 };
 
 }
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index ddb4d9e2959b..7f3e41c342d2 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -158,7 +158,7 @@ private:
     OUString url_;
     Data const & data_;
     osl::Condition delay_;
-    boost::shared_ptr<osl::Mutex> lock_;
+    std::shared_ptr<osl::Mutex> lock_;
 };
 
 Components::WriteThread::WriteThread(
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 48c1f7a73199..a545914bef19 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -26,7 +26,6 @@
 #include <set>
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ref.hxx>
@@ -164,7 +163,7 @@ private:
     int sharedExtensionLayer_;
     int userExtensionLayer_;
     OUString modificationFileUrl_;
-    boost::shared_ptr<osl::Mutex> lock_;
+    std::shared_ptr<osl::Mutex> lock_;
 };
 
 }
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index b9f7d9b7e44c..31f6cff0618c 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -20,6 +20,7 @@
 #include <sal/config.h>
 
 #include <cassert>
+#include <memory>
 #include <vector>
 
 #include <boost/noncopyable.hpp>
@@ -178,7 +179,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > context_;
     OUString locale_;
     bool default_;
-    boost::shared_ptr<osl::Mutex> lock_;
+    std::shared_ptr<osl::Mutex> lock_;
 };
 
 css::uno::Reference< css::uno::XInterface > Service::createInstance(
diff --git a/configmgr/source/lock.cxx b/configmgr/source/lock.cxx
index 7a20135f95d3..66a2be9eeca6 100644
--- a/configmgr/source/lock.cxx
+++ b/configmgr/source/lock.cxx
@@ -25,9 +25,9 @@
 
 namespace configmgr {
 
-boost::shared_ptr<osl::Mutex> lock()
+std::shared_ptr<osl::Mutex> lock()
 {
-    static boost::shared_ptr<osl::Mutex> theLock;
+    static std::shared_ptr<osl::Mutex> theLock;
     if (!theLock.get())
         theLock.reset(new osl::Mutex);
     return theLock;
diff --git a/configmgr/source/lock.hxx b/configmgr/source/lock.hxx
index 1d5c33e0ac04..d8c050e824e6 100644
--- a/configmgr/source/lock.hxx
+++ b/configmgr/source/lock.hxx
@@ -22,11 +22,11 @@
 
 #include <sal/config.h>
 #include <osl/mutex.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace configmgr {
 
-boost::shared_ptr<osl::Mutex> lock();
+std::shared_ptr<osl::Mutex> lock();
 
 }
 
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 4e300a7ba5c2..4f80907a90db 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -22,6 +22,7 @@
 
 #include <sal/config.h>
 
+#include <memory>
 #include <set>
 #include <vector>
 
@@ -30,7 +31,6 @@
 #include <com/sun/star/util/ChangesSet.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
-#include <boost/shared_ptr.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -148,7 +148,7 @@ private:
     OUString name_;
     ChangesListeners changesListeners_;
 
-    boost::shared_ptr<osl::Mutex> lock_;
+    std::shared_ptr<osl::Mutex> lock_;
 
     bool update_:1;
     bool finalized_:1;
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 616f32fdcda3..7c6371b493a5 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -20,10 +20,10 @@
 #include <sal/config.h>
 
 #include <cassert>
+#include <memory>
 #include <set>
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/configuration/XUpdate.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -91,7 +91,7 @@ private:
         css::uno::Sequence< OUString > const & excludedPaths)
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    boost::shared_ptr<osl::Mutex> lock_;
+    std::shared_ptr<osl::Mutex> lock_;
     css::uno::Reference< css::uno::XComponentContext > context_;
 };