From 9b45ae57735ee9f7a64ceb7cac8b23e322a63bfc Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 25 Sep 2015 01:06:31 +0200
Subject: [PATCH 158/398] desktop: make LibLibreOffice_Impl visible to
 testcases

(cherry picked from commit 14a9a7d52074104afa24278a7a350f05d6df572a)

Change-Id: I345a6cab57cc594614e348700bb3c1c9a0673989
---
 desktop/inc/lib/init.hxx    | 12 +++++++++++
 desktop/source/lib/init.cxx | 51 +++++++++++++++++----------------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index b17f82566daf..81e7eb61664e 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -11,6 +11,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <boost/shared_ptr.hpp>
 #include "../../source/inc/desktopdllapi.h"
+#include <osl/thread.h>
 
 using namespace css;
 using namespace boost;
@@ -24,4 +25,15 @@ namespace desktop {
         explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent);
         ~LibLODocument_Impl();
     };
+
+    struct DESKTOP_DLLPUBLIC LibLibreOffice_Impl : public _LibreOfficeKit
+    {
+        OUString maLastExceptionMsg;
+        std::shared_ptr< LibreOfficeKitClass > m_pOfficeClass;
+        oslThread maThread;
+        LibreOfficeKitCallback mpCallback;
+        void *mpCallbackData;
+
+        LibLibreOffice_Impl();
+    };
 }
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 57697fabce4c..8e4c0f3ab4e5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -86,10 +86,6 @@ 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;
@@ -322,36 +318,27 @@ static void                    lo_registerCallback (LibreOfficeKit* pThis,
                                                     void* pData);
 static char* lo_getFilterTypes(LibreOfficeKit* pThis);
 
-struct LibLibreOffice_Impl : public _LibreOfficeKit
+LibLibreOffice_Impl::LibLibreOffice_Impl()
+    : maThread(0)
+    , mpCallback(nullptr)
+    , mpCallbackData(nullptr)
 {
-    OUString maLastExceptionMsg;
-    shared_ptr< LibreOfficeKitClass > m_pOfficeClass;
-    oslThread maThread;
-    LibreOfficeKitCallback mpCallback;
-    void *mpCallbackData;
-
-    LibLibreOffice_Impl()
-        : maThread(0)
-        , mpCallback(nullptr)
-        , mpCallbackData(nullptr)
-    {
-        if(!(m_pOfficeClass = gOfficeClass.lock())) {
-            m_pOfficeClass.reset(new LibreOfficeKitClass);
-            m_pOfficeClass->nSize = sizeof(LibreOfficeKitClass);
-
-            m_pOfficeClass->destroy = lo_destroy;
-            m_pOfficeClass->documentLoad = lo_documentLoad;
-            m_pOfficeClass->getError = lo_getError;
-            m_pOfficeClass->documentLoadWithOptions = lo_documentLoadWithOptions;
-            m_pOfficeClass->registerCallback = lo_registerCallback;
-            m_pOfficeClass->getFilterTypes = lo_getFilterTypes;
-
-            gOfficeClass = m_pOfficeClass;
-        }
-
-        pClass = m_pOfficeClass.get();
+    if(!(m_pOfficeClass = gOfficeClass.lock())) {
+        m_pOfficeClass.reset(new LibreOfficeKitClass);
+        m_pOfficeClass->nSize = sizeof(LibreOfficeKitClass);
+
+        m_pOfficeClass->destroy = lo_destroy;
+        m_pOfficeClass->documentLoad = lo_documentLoad;
+        m_pOfficeClass->getError = lo_getError;
+        m_pOfficeClass->documentLoadWithOptions = lo_documentLoadWithOptions;
+        m_pOfficeClass->registerCallback = lo_registerCallback;
+        m_pOfficeClass->getFilterTypes = lo_getFilterTypes;
+
+        gOfficeClass = m_pOfficeClass;
     }
-};
+
+    pClass = m_pOfficeClass.get();
+}
 
 namespace
 {
-- 
2.12.0