boost->std

Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a

14 files changed, 19 insertions, 36 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>
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 977c65770499..32240d02349b 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XLocalizable.hpp>
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 9cc3ce4a78f5..eeb491342e12 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -24,7 +24,6 @@
 #include "officeipcthread.hxx"
 #include "cmdlineargs.hxx"
 #include "dispatchwatcher.hxx"
-#include <boost/scoped_ptr.hpp>
 #include <stdio.h>
 #include <osl/process.h>
 #include <sal/log.hxx>
@@ -751,7 +750,7 @@ void OfficeIPCThread::execute()
             if (aArguments.isEmpty())
                 continue;
 
-            boost::scoped_ptr< CommandLineArgs > aCmdLineArgs;
+            std::unique_ptr< CommandLineArgs > aCmdLineArgs;
             try
             {
                 Parser p(aArguments);
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 3cb4d394fe14..86cf478cf5ad 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -21,7 +21,6 @@
 
 #include <cassert>
 
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <comphelper/configuration.hxx>
 #include "config_folders.h"
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index fea7d6b0ccec..a9c081199404 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -71,9 +71,8 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <map>
+#include <memory>
 #include <vector>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::system;
@@ -495,7 +494,7 @@ IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void)
         if ( pFact )
         {
             OUString sExtensionId = GetEntryData( nActive )->m_xPackage->getIdentifier().Value;
-            boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateOptionsDialog( this, sExtensionId, OUString() ));
+            std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateOptionsDialog( this, sExtensionId, OUString() ));
 
             pDlg->Execute();
         }
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 39ffeffd37ff..359b46ef0e8c 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -77,8 +77,7 @@
 #include "dp_version.hxx"
 
 #include <queue>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 #ifdef WNT
 #if defined _MSC_VER
@@ -212,7 +211,7 @@ struct ExtensionCmd
           m_vExtensionList( vExtensionList ) {};
 };
 
-typedef ::boost::shared_ptr< ExtensionCmd > TExtensionCmd;
+typedef std::shared_ptr< ExtensionCmd > TExtensionCmd;
 
 
 class ExtensionCmdQueue::Thread: public salhelper::Thread
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index f18cf82d3bde..29b6891bfa25 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dp_gui {
 
@@ -51,7 +51,7 @@ class TheExtensionManager;
 
 struct Entry_Impl;
 
-typedef ::boost::shared_ptr< Entry_Impl > TEntry_Impl;
+typedef std::shared_ptr< Entry_Impl > TEntry_Impl;
 
 struct Entry_Impl
 {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 1f6d5236de94..3b75b8058c5c 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -23,9 +23,6 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <boost/shared_ptr.hpp>
-
-
 namespace com { namespace sun { namespace star { namespace deployment {
         class XPackage;
 }}}}
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 2c0a165d7c5f..1b2132ccd37f 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -42,7 +42,6 @@
 #include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <memory>
-#include <boost/shared_ptr.hpp>
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <salhelper/linkhelper.hxx>
@@ -75,11 +74,11 @@ namespace dp_misc {
 namespace {
 
 struct UnoRc : public rtl::StaticWithInit<
-    boost::shared_ptr<rtl::Bootstrap>, UnoRc> {
-    const boost::shared_ptr<rtl::Bootstrap> operator () () {
+    std::shared_ptr<rtl::Bootstrap>, UnoRc> {
+    const std::shared_ptr<rtl::Bootstrap> operator () () {
         OUString unorc( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("louno") );
         ::rtl::Bootstrap::expandMacros( unorc );
-        ::boost::shared_ptr< ::rtl::Bootstrap > ret(
+        std::shared_ptr< ::rtl::Bootstrap > ret(
             new ::rtl::Bootstrap( unorc ) );
         OSL_ASSERT( ret->getHandle() != 0 );
         return ret;
@@ -110,7 +109,7 @@ const OUString OfficePipeId::operator () ()
         reinterpret_cast<sal_uInt8 const *>(userPath.getStr());
     sal_Size size = (userPath.getLength() * sizeof (sal_Unicode));
     sal_uInt32 md5_key_len = rtl_digest_queryLength( digest );
-    ::std::unique_ptr<sal_uInt8[]> md5_buf( new sal_uInt8 [ md5_key_len ] );
+    std::unique_ptr<sal_uInt8[]> md5_buf( new sal_uInt8 [ md5_key_len ] );
 
     rtl_digest_init( digest, data, static_cast<sal_uInt32>(size) );
     rtl_digest_update( digest, data, static_cast<sal_uInt32>(size) );
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 87471454b5d2..046182330b48 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -13,8 +13,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
 #include <boost/property_tree/json_parser.hpp>
 
 #define LOK_USE_UNSTABLE_API
@@ -83,13 +82,11 @@ using namespace vcl;
 using namespace desktop;
 using namespace utl;
 
-using namespace boost;
-
 struct LibLibreOffice_Impl;
 
 static LibLibreOffice_Impl *gImpl = NULL;
-static weak_ptr< LibreOfficeKitClass > gOfficeClass;
-static weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
+static std::weak_ptr< LibreOfficeKitClass > gOfficeClass;
+static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
 
 typedef struct
 {
@@ -310,7 +307,7 @@ static void                    lo_registerCallback (LibreOfficeKit* pThis,
 struct LibLibreOffice_Impl : public _LibreOfficeKit
 {
     OUString maLastExceptionMsg;
-    shared_ptr< LibreOfficeKitClass > m_pOfficeClass;
+    std::shared_ptr< LibreOfficeKitClass > m_pOfficeClass;
     oslThread maThread;
     LibreOfficeKitCallback mpCallback;
     void *mpCallbackData;