From 9551bf5a1ee5c9275a26f8ec4021e0b7f5665176 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 10 Sep 2010 13:10:07 +0200
Subject: sb129: #i113189# change UNO components to use passive registration

---
 ucb/source/ucp/ext/makefile.mk         |  8 ++++++++
 ucb/source/ucp/ext/ucpext.component    | 35 ++++++++++++++++++++++++++++++++++
 ucb/source/ucp/ext/ucpext_services.cxx |  6 ------
 3 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 ucb/source/ucp/ext/ucpext.component

(limited to 'ucb/source/ucp/ext')

diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk
index 23c30b3bda5b..e106b8e1ba31 100644
--- a/ucb/source/ucp/ext/makefile.mk
+++ b/ucb/source/ucp/ext/makefile.mk
@@ -63,3 +63,11 @@ SHL1DEF = $(MISC)$/$(SHL1TARGET).def
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/ucpext.component
+
+$(MISC)/ucpext.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpext.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpext.component
diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component
new file mode 100644
index 000000000000..d673777a6707
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext.component
@@ -0,0 +1,35 @@
+<?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="org.openoffice.comp.ucp.ext.ContentProvider">
+    <service name="com.sun.star.ucb.ContentProvider"/>
+    <service name="com.sun.star.ucb.ExtensionContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 8daa33f5cf8c..ce525c2da665 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -79,12 +79,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
-    sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey )
-    {
-        return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::ucb::ucp::ext::s_aServiceEntries );
-    }
-
     //------------------------------------------------------------------------------------------------------------------
     void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
-- 
cgit 


From 4a7e903d201016282d998960148d262aa1f31900 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 14 Sep 2010 15:14:56 +0200
Subject: sb129: #i113189# removed obviously unnecessary service registrations;
 allow empty <implementation/>

---
 ucb/source/ucp/ext/ucpext.component | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ucb/source/ucp/ext')

diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component
index d673777a6707..2982529e539c 100644
--- a/ucb/source/ucp/ext/ucpext.component
+++ b/ucb/source/ucp/ext/ucpext.component
@@ -29,7 +29,6 @@
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.ucp.ext.ContentProvider">
-    <service name="com.sun.star.ucb.ContentProvider"/>
     <service name="com.sun.star.ucb.ExtensionContentProvider"/>
   </implementation>
 </component>
-- 
cgit