summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2011-12-05 20:52:12 +0000
committerMichael Meeks <michael.meeks@suse.com>2011-12-05 20:53:25 +0000
commitfe05a4b4aaaabecd5d63362bd563188133dcb08c (patch)
treecf83aaa73f5c90395460475ab25579883f71fe07 /wizards
parent49df5176e5f72bc2943924b025afcc19d9b8ebec (diff)
fax wizard: build and install the java wizard in paralle to the python one
Diffstat (limited to 'wizards')
-rw-r--r--wizards/Pyuno_fax.mk6
-rw-r--r--wizards/com/sun/star/wizards/fax/fax.component7
-rw-r--r--wizards/com/sun/star/wizards/fax/pyfax.component34
3 files changed, 41 insertions, 6 deletions
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index fa07924384ff..a0acbc5785d1 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -23,9 +23,9 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Pyuno_Pyuno,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
+$(eval $(call gb_Pyuno_Pyuno,pyfax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
-$(eval $(call gb_Pyuno_add_files,fax,\
+$(eval $(call gb_Pyuno_add_files,pyfax,\
__init__.py \
CallWizard.py \
CGFax.py \
@@ -36,6 +36,6 @@ $(eval $(call gb_Pyuno_add_files,fax,\
FaxWizardDialog.py \
FaxWizardDialogResources.py \
))
-$(eval $(call gb_Pyuno_set_componentfile_full,fax,wizards/com/sun/star/wizards/fax/fax,vnd.sun.star.expand:\dLO_LIB_DIR/wizards/fax/CallWizard,.py))
+$(eval $(call gb_Pyuno_set_componentfile_full,pyfax,wizards/com/sun/star/wizards/fax/pyfax,vnd.sun.star.expand:\dLO_LIB_DIR/wizards/fax/CallWizard,.py))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/com/sun/star/wizards/fax/fax.component b/wizards/com/sun/star/wizards/fax/fax.component
index 06383e74db2f..462fe2901255 100644
--- a/wizards/com/sun/star/wizards/fax/fax.component
+++ b/wizards/com/sun/star/wizards/fax/fax.component
@@ -26,9 +26,10 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.Python"
+<component loader="com.sun.star.loader.Java2"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.wizards.fax.CallWizard">
- <service name="com.sun.star.task.Job"/>
+ <implementation
+ name="com.sun.star.wizards.fax.CallWizard$WizardImplementation">
+ <service name="com.sun.star.wizards.fax.CallWizard"/>
</implementation>
</component>
diff --git a/wizards/com/sun/star/wizards/fax/pyfax.component b/wizards/com/sun/star/wizards/fax/pyfax.component
new file mode 100644
index 000000000000..06383e74db2f
--- /dev/null
+++ b/wizards/com/sun/star/wizards/fax/pyfax.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.Python"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.wizards.fax.CallWizard">
+ <service name="com.sun.star.task.Job"/>
+ </implementation>
+</component>