diff options
Diffstat (limited to 'xmerge/source')
| -rw-r--r-- | xmerge/source/bridge/XMergeBridge.component | 34 | ||||
| -rw-r--r-- | xmerge/source/bridge/java/XMergeBridge.java | 22 | ||||
| -rw-r--r-- | xmerge/source/bridge/makefile.mk | 8 |
3 files changed, 44 insertions, 20 deletions
diff --git a/xmerge/source/bridge/XMergeBridge.component b/xmerge/source/bridge/XMergeBridge.component new file mode 100644 index 000000000000..c48aae6a0e20 --- /dev/null +++ b/xmerge/source/bridge/XMergeBridge.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.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="XMergeBridge$_XMergeBridge"> + <service name="com.sun.star.documentconversion.XMergeBridge"/> + </implementation> +</component> diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index 38503d3b49ff..c2dafd75c996 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -74,9 +74,8 @@ import java.net.URI; /** This outer class provides an inner class to implement the service - * description, a method to instantiate the - * component on demand (__getServiceFactory()), and a method to give - * information about the component (__writeRegistryServiceInfo()). + * description and a method to instantiate the + * component on demand (__getServiceFactory()). */ public class XMergeBridge { @@ -695,21 +694,4 @@ public class XMergeBridge { return xSingleServiceFactory; } - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - - return FactoryHelper.writeRegistryServiceInfo(_XMergeBridge.class.getName(), - _XMergeBridge.__serviceName, regKey); - } } - - - diff --git a/xmerge/source/bridge/makefile.mk b/xmerge/source/bridge/makefile.mk index 77a39a568966..05fa5a738d84 100644 --- a/xmerge/source/bridge/makefile.mk +++ b/xmerge/source/bridge/makefile.mk @@ -33,3 +33,11 @@ PRJNAME=xmerge .IF "$(L10N_framework)"=="" ALLTAR: ANTBUILD .ENDIF + +ALLTAR : $(MISC)/XMergeBridge.component + +$(MISC)/XMergeBridge.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)XMergeBridge.jar' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component |