CWS-TOOLING: integrate CWS sb129

3 files changed, 45 insertions, 26 deletions

diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index 89609687438c..02483aae83dd 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/makefile.mk
@@ -87,3 +87,11 @@ DO_PHONY=.PHONY
 $(INCCOM)$/introbmpnames.hxx $(DO_PHONY):
     echo const char INTRO_BITMAP_STRINGLIST[]=$(EMQ)"$(INTRO_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@
     echo LASTTIME_INTRO_BITMAPS=$(INTRO_BITMAPS:f) > $(MISC)$/intro_bmp_names.mk
+
+ALLTAR : $(MISC)/spl.component
+
+$(MISC)/spl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        spl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt spl.component
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index 349ec2ec0a78..4b1130c71cdf 100755
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -97,32 +97,6 @@ component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL
-component_writeInfo(
-    void* pServiceManager,
-    void* pRegistryKey)
-{
-    Reference<XMultiServiceFactory> xMan(
-        reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-    Reference<XRegistryKey> xKey(
-        reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
-
-    // iterate over service names and register them...
-    OUString aImpl;
-    const char* pServiceName = NULL;
-    const char* pImplName = NULL;
-    for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) {
-        pServiceName= pServices[i];
-        pImplName = pImplementations[i];
-        aImpl = OUString::createFromAscii("/")
-              + OUString::createFromAscii(pImplName)
-              + OUString::createFromAscii("/UNO/SERVICES");
-        Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl);
-        xNewKey->createKey(OUString::createFromAscii(pServiceName));
-    }
-    return sal_True;
-}
-
 void* SAL_CALL
 component_getFactory(
     const sal_Char* pImplementationName,
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component
new file mode 100644
index 000000000000..2caecf5c0e4b
--- /dev/null
+++ b/desktop/source/splash/spl.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.desktop.FirstStart">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.office.comp.SplashScreen">
+    <service name="com.sun.star.office.SplashScreen"/>
+  </implementation>
+</component>