boost->std

Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a

5 files changed, 4 insertions, 9 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 068c27e64e1c..184c86f42875 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DESKTOP_INC_APP_HXX
 
 #include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
@@ -31,6 +30,7 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <osl/mutex.hxx>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
@@ -176,7 +176,7 @@ class Desktop : public Application
         OUString                m_aBootstrapErrorMessage;
         BootstrapStatus         m_aBootstrapStatus;
 
-        boost::scoped_ptr<Lockfile> m_xLockfile;
+        std::unique_ptr<Lockfile> m_xLockfile;
         Timer                   m_firstRunTimer;
 
         static ResMgr*          pResMgr;
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index b17f82566daf..3f4d680b7aa4 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -9,7 +9,7 @@
 #include <LibreOfficeKit/LibreOfficeKit.h>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include "../../source/inc/desktopdllapi.h"
 
 using namespace css;
@@ -19,7 +19,7 @@ namespace desktop {
     struct DESKTOP_DLLPUBLIC LibLODocument_Impl : public _LibreOfficeKitDocument
     {
         uno::Reference<css::lang::XComponent> mxComponent;
-        shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass;
+        std::shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass;
 
         explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent);
         ~LibLODocument_Impl();
diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx
index b2b593bc3bd6..3c4ae1e19f74 100644
--- a/desktop/inc/pch/precompiled_deploymentgui.hxx
+++ b/desktop/inc/pch/precompiled_deploymentgui.hxx
@@ -17,8 +17,6 @@
 #include <algorithm>
 #include <boost/bind.hpp>
 #include <boost/optional.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Toolkit.hpp>
diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx
index 2eae9cde13fb..f2fcae9cc3ab 100644
--- a/desktop/inc/pch/precompiled_deploymentmisc.hxx
+++ b/desktop/inc/pch/precompiled_deploymentmisc.hxx
@@ -17,7 +17,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <memory>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx
index c4c2e7001d86..40dca8259e6b 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -21,8 +21,6 @@
 #include <algorithm>
 #include <basic/sbstar.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <cassert>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>