From 22f4b009e889ba9d08244ff3c7b57c2faade3903 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 19 Mar 2017 21:16:15 +0100
Subject: [PATCH 159/398] fix build
Change-Id: Id1067aef106764484584a30fb55efebb7868f24a
---
desktop/inc/lib/init.hxx | 3 +--
desktop/source/lib/init.cxx | 6 ++----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 81e7eb61664e..d3a42fb10bde 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -14,13 +14,12 @@
#include <osl/thread.h>
using namespace css;
-using namespace boost;
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/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8e4c0f3ab4e5..5d716abdf8c4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -13,8 +13,6 @@
#include <string.h>
#include <stdlib.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <boost/property_tree/json_parser.hpp>
#define LOK_USE_UNSTABLE_API
@@ -87,8 +85,8 @@ using namespace desktop;
using namespace utl;
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
{
--
2.12.0