liblibo: better init code.

Change-Id: I8757739960cb1c764a5a66bd67d34731e3dfbf31

desktop/inc/liblibreoffice.hxx

@@ -10,16 +10,15 @@
 #ifndef _LIBLIBREOFFICE_HXX
 #define _LIBLIBREOFFICE_HXX
 
-typedef int loboolean;
 typedef struct _LODocument LODocument;
 
 class LibLibreOffice
 {
 public:
-    virtual loboolean initialize (const char *installPath) = 0;
+    virtual bool initialize (const char *installPath) = 0;
 
     virtual LODocument *documentLoad (const char *url) = 0;
-    virtual loboolean   documentSave (const char *url) = 0;
+    virtual bool   documentSave (const char *url) = 0;
 
     virtual ~LibLibreOffice () {};
 };

desktop/inc/liblibreoffice_impl.hxx

@@ -12,16 +12,13 @@
 
 #include "liblibreoffice.hxx"
 
-typedef int loboolean;
-typedef struct _LODocument LODocument;
-
 class LibLibreOffice_Impl : public LibLibreOffice
 {
 public:
-    virtual loboolean initialize (const char *installPath);
+    virtual bool        initialize (const char *installPath);
 
     virtual LODocument *documentLoad (const char *url);
-    virtual loboolean   documentSave (const char *url);
+    virtual bool        documentSave (const char *url);
 
     virtual ~LibLibreOffice_Impl ();
 };

desktop/source/lib/init.cxx

-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -42,7 +42,7 @@ LibLibreOffice_Impl::documentLoad( const char *docUrl )
     return NULL;
 }
 
-loboolean
+bool
 LibLibreOffice_Impl::documentSave( const char * )
 {
     return 1;
@@ -73,16 +73,18 @@ aBasicErrorFunc( const OUString &rErr, const OUString &rAction )
 static void
 initialize_uno( const rtl::OUString &aUserProfileURL )
 {
+    xContext = cppu::defaultBootstrap_InitialComponentContext();
+    fprintf( stderr, "Uno initialized %d\n", xContext.is() );
+    xFactory = xContext->getServiceManager();
+    xSFactory = uno::Reference<lang::XMultiServiceFactory>(xFactory, uno::UNO_QUERY_THROW);
+    comphelper::setProcessServiceFactory(xSFactory);
+
     // set UserInstallation to user profile dir in test/user-template
     rtl::Bootstrap aDefaultVars;
     aDefaultVars.set(rtl::OUString("UserInstallation"), aUserProfileURL );
-
-    xContext = comphelper::getProcessComponentContext();
-    xFactory = xContext->getServiceManager();
-    xSFactory = uno::Reference<lang::XMultiServiceFactory>(xFactory, uno::UNO_QUERY_THROW);
 }
 
-loboolean
+bool
 LibLibreOffice_Impl::initialize( const char *app_path )
 {
     static bool bInitialized = false;
@@ -122,6 +124,7 @@ extern "C" {
 
 LibLibreOffice *liblibreoffice_hook(void)
 {
+    fprintf( stderr, "create libreoffice object\n" );
     return new LibLibreOffice_Impl();
 }
 

desktop/source/lib/shim.cxx

@@ -41,13 +41,14 @@ SAL_DLLPUBLIC_EXPORT LibLibreOffice *lo_init( const char *install_path )
         fprintf( stderr, "failed to open library '%s'\n", imp_lib );
         return NULL;
     }
-    free( imp_lib );
 
     HookFunction *pSym = (HookFunction *) dlsym( dlhandle, "liblibreoffice_hook" );
     if( !pSym ) {
         fprintf( stderr, "failed to find hook in library '%s'\n", imp_lib );
         return NULL;
     }
+
+    free( imp_lib );
     return pSym();
 }
 

smoketest/CppunitTest_liblibreoffice.mk

@@ -15,29 +15,16 @@ $(eval $(call gb_CppunitTest_add_exception_objects,liblibreoffice,\
 	smoketest/libtest \
 ))
 
-$(eval $(call gb_CppunitTest_use_external,liblibreoffice,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_api,liblibreoffice,\
-	offapi \
-	udkapi \
-))
-
 $(eval $(call gb_CppunitTest_use_libraries,liblibreoffice,\
-	cppu \
-	cppuhelper \
 	libreoffice \
-	sal \
-	unotest \
 ))
 
 ifeq ($(OS),MACOSX)
-liblibreoffice_SOFFICE_INST := path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS
+liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS
 else
-liblibreoffice_SOFFICE_INST := path:$(DEVINSTALLDIR)/opt/program
+liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/program
 endif
 
-$(eval $(call gb_CppunitTest_use_ure,liblibreoffice))
-
 $(eval $(call gb_CppunitTest_add_arguments,liblibreoffice,\
 	-env:arg-soffice=$(liblibreoffice_SOFFICE_INST) \
 ))

smoketest/libtest.cxx

@@ -46,7 +46,11 @@ void Test::test()
     rtl::Bootstrap::get( rtl::OUString( "arg-soffice" ), aArgSoffice );
     OString aInstall = OUStringToOString( aArgSoffice, RTL_TEXTENCODING_UTF8 );
     fprintf( stderr, "liblibreoffice test: '%s'\n", aInstall.getStr() );
-    assert (lo_init( aInstall.getStr() ));
+    LibLibreOffice *pOffice = lo_init( aInstall.getStr() );
+    CPPUNIT_ASSERT( pOffice != NULL );
+
+    bool bInited = pOffice->initialize( aInstall.getStr() );
+    CPPUNIT_ASSERT( bInited );
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);