[Libreoffice-commits] .: Branch 'integration/dev300_m101' - ucb/source

[Tor Lillqvist]

 ucb/source/ucp/odma/makefile.mk        |    7 ++++++
 ucb/source/ucp/odma/odma_services.cxx  |   16 ---------------
 ucb/source/ucp/odma/ucpodma1.component |   34 +++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 16 deletions(-)

New commits:
commit 2996d639b245fc99d43b5ea03481ee9df279d4c5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 17:52:46 2011 +0200

    Make the OCMA UCP build again, add .component file

diff --git a/ucb/source/ucp/odma/makefile.mk b/ucb/source/ucp/odma/makefile.mk
old mode 100755
new mode 100644
index 643b4fa..4af8c76
--- a/ucb/source/ucp/odma/makefile.mk
+++ b/ucb/source/ucp/odma/makefile.mk
@@ -102,3 +102,10 @@ LIB3OBJFILES=$(SLO3FILES)
 
 .INCLUDE: target.mk
 
+ALLTAR : $(MISC)/$(TARGET)$(UCP_VERSION).component
+
+$(MISC)/$(TARGET)$(UCP_VERSION).component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        $(TARGET)$(UCP_VERSION).component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt $(TARGET)$(UCP_VERSION).component
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index d6c5106..4aa8810 100755
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -46,22 +46,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Write info into registry.
-    //////////////////////////////////////////////////////////////////////
-
-    // @@@ Adjust namespace names.
-    writeInfo( pRegistryKey,
-               ::odma::ContentProvider::getImplementationName_Static(),
-               ::odma::ContentProvider::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/odma/ucpodma1.component b/ucb/source/ucp/odma/ucpodma1.component
new file mode 100644
index 0000000..fa1abae
--- /dev/null
+++ b/ucb/source/ucp/odma/ucpodma1.component
@@ -0,0 +1,34 @@
+<?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.ucb.FileProvider">
+    <service name="com.sun.star.ucb.ODMAContentProvider"/>
+  </implementation>
+</component>