[Libreoffice-commits] core.git: desktop/Library_spl.mk desktop/Library_spl_unx.mk desktop/Module_desktop.mk desktop/source desktop/unx postprocess/Rdb_services.mk Repository.mk scp2/source solenv/gbuild
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Thu Nov 21 01:54:19 PST 2013
Repository.mk | 8 -
desktop/Library_spl.mk | 1
desktop/Library_spl_unx.mk | 26 ---
desktop/Module_desktop.mk | 1
desktop/source/splash/services_spl.cxx | 14 +
desktop/source/splash/spl.component | 3
desktop/source/splash/unxsplash.cxx | 153 +++++++++++++++++++++
desktop/source/splash/unxsplash.hxx | 69 +++++++++
desktop/unx/splash/splash.component | 15 --
desktop/unx/splash/unxsplash.cxx | 181 -------------------------
desktop/unx/splash/unxsplash.hxx | 59 --------
postprocess/Rdb_services.mk | 1
scp2/source/ooo/file_library_ooo.scp | 4
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1
14 files changed, 238 insertions(+), 298 deletions(-)
New commits:
commit 668d6ada160438c396849a8309864f5fd33f33ac
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Thu Oct 31 06:30:33 2013 -0200
fdo#60698: Unify spl and spl_unx
Change-Id: Ifd328ff3ce12364e95d05405759df6588b3a86bc
Reviewed-on: https://gerrit.libreoffice.org/6503
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/Repository.mk b/Repository.mk
index b31a809..94ce0ce 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -429,14 +429,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
-ifeq ($(filter MACOSX WNT,$(OS)),)
-
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- spl_unx \
-))
-
-endif
-
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
getuid \
smoketest \
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index 975e033..d2bb2a1 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
$(eval $(call gb_Library_add_exception_objects,spl,\
desktop/source/splash/services_spl \
desktop/source/splash/splash \
+ desktop/source/splash/unxsplash \
))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
deleted file mode 100644
index 5502140..0000000
--- a/desktop/Library_spl_unx.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,spl_unx))
-
-$(eval $(call gb_Library_use_sdk_api,spl_unx))
-
-$(eval $(call gb_Library_use_libraries,spl_unx,\
- cppu \
- cppuhelper \
- sal \
-))
-
-$(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash))
-
-$(eval $(call gb_Library_add_exception_objects,spl_unx,\
- desktop/unx/splash/unxsplash \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index c90de67..20e996b 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -104,7 +104,6 @@ else
$(eval $(call gb_Module_add_targets,desktop,\
Executable_oosplash \
- Library_spl_unx \
))
endif
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index 71155a4..eb45132 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -24,13 +24,23 @@
#include "sal/types.h"
#include "splash.hxx"
+#include "unxsplash.hxx"
namespace {
static cppu::ImplementationEntry const services[] = {
- { &desktop::splash::create, &desktop::splash::getImplementationName,
+ {
+ &desktop::splash::create,
+ &desktop::splash::getImplementationName,
&desktop::splash::getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ UnxSplash_createInstance,
+ UnxSplash_getImplementationName,
+ UnxSplash_getSupportedServiceNames,
+ ::cppu::createSingleComponentFactory, 0, 0
+ },
{ 0, 0, 0, 0, 0, 0 }
};
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component
index c71554c..9a135db 100644
--- a/desktop/source/splash/spl.component
+++ b/desktop/source/splash/spl.component
@@ -25,4 +25,7 @@
<implementation name="com.sun.star.office.comp.SplashScreen">
<service name="com.sun.star.office.SplashScreen"/>
</implementation>
+ <implementation name="com.sun.star.office.comp.PipeSplashScreen">
+ <service name="com.sun.star.office.PipeSplashScreen"/>
+ </implementation>
</component>
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
similarity index 79%
rename from desktop/unx/splash/unxsplash.cxx
rename to desktop/source/splash/unxsplash.cxx
index 6e9dd6b..665a106 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -20,18 +20,13 @@
#include "unxsplash.hxx"
#include <stdio.h>
#include <osl/process.h>
-#include <com/sun/star/registry/XRegistryKey.hpp>
+//#include <com/sun/star/registry/XRegistryKey.hpp>
#include <cppuhelper/implementationentry.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#define PIPE_ARG "--splash-pipe="
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::registry;
-using namespace ::com::sun::star::uno;
-
namespace desktop
{
UnxSplashScreen::UnxSplashScreen( const Reference< uno::XComponentContext >& xCtx )
@@ -130,7 +125,7 @@ using namespace desktop;
// get service instance...
static uno::Reference< uno::XInterface > m_xINSTANCE;
-uno::Reference< uno::XInterface > SAL_CALL UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception )
+uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception )
{
static osl::Mutex m_aMutex;
if ( !m_xINSTANCE.is() )
@@ -148,34 +143,11 @@ OUString UnxSplash_getImplementationName()
return OUString( "com.sun.star.office.comp.PipeSplashScreen" );
}
-uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw()
+uno::Sequence< OUString > UnxSplash_getSupportedServiceNames() throw()
{
const OUString aServiceName( "com.sun.star.office.PipeSplashScreen" );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-::cppu::ImplementationEntry aEntries[] =
-{
- {
- UnxSplash_createInstance, UnxSplash_getImplementationName,
- UnxSplash_getSupportedServiceNames,
- ::cppu::createSingleComponentFactory,
- 0, 0
- },
- { 0, 0, 0, 0, 0, 0 }
-};
-
-extern "C"
-{
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL splash_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
-{
- return ::cppu::component_getFactoryHelper( pImplName, pServiceManager,
- pRegistryKey, aEntries );
-}
-
-} // extern "C"
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/unx/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
similarity index 81%
rename from desktop/unx/splash/unxsplash.hxx
rename to desktop/source/splash/unxsplash.hxx
index ecf78a67..a1282bb 100644
--- a/desktop/unx/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -13,6 +13,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <cppuhelper/implbase2.hxx>
@@ -21,6 +22,11 @@
#include <osl/mutex.hxx>
#include <rtl/bootstrap.hxx>
+using namespace ::rtl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::registry;
+using namespace ::com::sun::star::uno;
+
namespace desktop {
class UnxSplashScreen : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator, css::lang::XInitialization >
@@ -56,4 +62,8 @@ public:
}
+uno::Reference< uno::XInterface > SAL_CALL UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception );
+OUString UnxSplash_getImplementationName();
+com::sun::star::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw ();
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/unx/splash/splash.component b/desktop/unx/splash/splash.component
deleted file mode 100644
index bf2f503..0000000
--- a/desktop/unx/splash/splash.component
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
--->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="splash"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.office.comp.PipeSplashScreen">
- <service name="com.sun.star.office.PipeSplashScreen"/>
- </implementation>
-</component>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 6157e25..8cf2847 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -333,7 +333,6 @@ $(eval $(call gb_Rdb_add_components,services,\
shell/source/unix/exec/syssh \
) \
$(if $(filter-out MACOSX WNT,$(OS)), \
- desktop/unx/splash/splash \
$(if $(ENABLE_HEADLESS),, \
shell/source/backends/desktopbe/desktopbe1 \
vcl/vcl.unx \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c01b777..557e152 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -287,10 +287,6 @@ End
#endif
-#if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
-#endif
-
#if ! defined UNX
File gid_File_Lib_Sysdtrans
PACKED_LIB_FILE_BODY;
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 4ff78bb..11628ef 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -85,7 +85,6 @@ gb_EXTRAMERGEDLIBS := \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
$(if $(filter unx,$(GUIBASE)),spa) \
spell \
- $(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),spl_unx) \
svgfilter \
swd \
t602filter \
More information about the Libreoffice-commits
mailing list