|
 |
f325b2 |
From 22f4b009e889ba9d08244ff3c7b57c2faade3903 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
Date: Sun, 19 Mar 2017 21:16:15 +0100
|
|
|
f325b2 |
Subject: [PATCH 159/398] fix build
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Id1067aef106764484584a30fb55efebb7868f24a
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/inc/lib/init.hxx | 3 +--
|
|
|
f325b2 |
desktop/source/lib/init.cxx | 6 ++----
|
|
|
f325b2 |
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
|
|
|
f325b2 |
index 81e7eb61664e..d3a42fb10bde 100644
|
|
|
f325b2 |
--- a/desktop/inc/lib/init.hxx
|
|
|
f325b2 |
+++ b/desktop/inc/lib/init.hxx
|
|
|
f325b2 |
@@ -14,13 +14,12 @@
|
|
|
f325b2 |
#include <osl/thread.h>
|
|
|
f325b2 |
|
|
|
f325b2 |
using namespace css;
|
|
|
f325b2 |
-using namespace boost;
|
|
|
f325b2 |
|
|
|
f325b2 |
namespace desktop {
|
|
|
f325b2 |
struct DESKTOP_DLLPUBLIC LibLODocument_Impl : public _LibreOfficeKitDocument
|
|
|
f325b2 |
{
|
|
|
f325b2 |
uno::Reference<css::lang::XComponent> mxComponent;
|
|
|
f325b2 |
- shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass;
|
|
|
f325b2 |
+ std::shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass;
|
|
|
f325b2 |
|
|
|
f325b2 |
explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent);
|
|
|
f325b2 |
~LibLODocument_Impl();
|
|
|
f325b2 |
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
index 8e4c0f3ab4e5..5d716abdf8c4 100644
|
|
|
f325b2 |
--- a/desktop/source/lib/init.cxx
|
|
|
f325b2 |
+++ b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
@@ -13,8 +13,6 @@
|
|
|
f325b2 |
#include <string.h>
|
|
|
f325b2 |
#include <stdlib.h>
|
|
|
f325b2 |
|
|
|
f325b2 |
-#include <boost/shared_ptr.hpp>
|
|
|
f325b2 |
-#include <boost/weak_ptr.hpp>
|
|
|
f325b2 |
#include <boost/property_tree/json_parser.hpp>
|
|
|
f325b2 |
|
|
|
f325b2 |
#define LOK_USE_UNSTABLE_API
|
|
|
f325b2 |
@@ -87,8 +85,8 @@ using namespace desktop;
|
|
|
f325b2 |
using namespace utl;
|
|
|
f325b2 |
|
|
|
f325b2 |
static LibLibreOffice_Impl *gImpl = NULL;
|
|
|
f325b2 |
-static weak_ptr< LibreOfficeKitClass > gOfficeClass;
|
|
|
f325b2 |
-static weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
|
|
|
f325b2 |
+static std::weak_ptr< LibreOfficeKitClass > gOfficeClass;
|
|
|
f325b2 |
+static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
|
|
|
f325b2 |
|
|
|
f325b2 |
typedef struct
|
|
|
f325b2 |
{
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|