summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2013-02-14 00:53:25 +0100
committerXisco Fauli <anistenis@gmail.com>2013-02-14 00:55:16 +0100
commit0e34f7e99a096dc5d78931d0f1275d1ead32a711 (patch)
tree5d0f86f87899d603e6beea2b224443e5c7d4c825 /wizards
parentd984860ea022c4e2256947d745b29458ae5e591c (diff)
pyagenda: Register and Pack python agenda wizard
Change-Id: I3fc2b0f4e014d358d416c230b0450dcbe5d76363
Diffstat (limited to 'wizards')
-rw-r--r--wizards/Jar_agenda.mk59
-rw-r--r--wizards/Module_wizards.mk2
-rw-r--r--wizards/com/sun/star/wizards/agenda/agenda.component8
3 files changed, 4 insertions, 65 deletions
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
deleted file mode 100644
index 22acb1b98927..000000000000
--- a/wizards/Jar_agenda.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Jar_Jar,agenda))
-
-$(eval $(call gb_Jar_use_jars,agenda,\
- ridl \
- unoil \
- jurt \
- juh \
- java_uno \
- commonwizards \
-))
-
-$(eval $(call gb_Jar_set_manifest,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda/MANIFEST.MF))
-
-$(eval $(call gb_Jar_set_packageroot,agenda,com))
-
-$(eval $(call gb_Jar_add_sourcefiles,agenda,\
- wizards/com/sun/star/wizards/agenda/AgendaTemplate \
- wizards/com/sun/star/wizards/agenda/AgendaWizardDialog \
- wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst \
- wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl \
- wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources \
- wizards/com/sun/star/wizards/agenda/CallWizard \
- wizards/com/sun/star/wizards/agenda/CGAgenda \
- wizards/com/sun/star/wizards/agenda/CGTopic \
- wizards/com/sun/star/wizards/agenda/TemplateConsts \
- wizards/com/sun/star/wizards/agenda/TopicsControl \
-))
-
-$(eval $(call gb_Jar_set_componentfile,agenda,wizards/com/sun/star/wizards/agenda/agenda,OOO))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 8a2088acac89..14d6c057c009 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,wizards,\
AllLangResTarget_wzi \
Pyuno_fax \
Pyuno_letter \
+ Pyuno_agenda \
Pyuno_commonwizards \
Zip_depot \
Zip_euro \
@@ -55,7 +56,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
ifeq ($(SOLAR_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,wizards,\
Jar_commonwizards \
- Jar_agenda \
Jar_form \
Jar_query \
Jar_report \
diff --git a/wizards/com/sun/star/wizards/agenda/agenda.component b/wizards/com/sun/star/wizards/agenda/agenda.component
index 1e19172727e9..5778ae32fe06 100644
--- a/wizards/com/sun/star/wizards/agenda/agenda.component
+++ b/wizards/com/sun/star/wizards/agenda/agenda.component
@@ -16,11 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-<component loader="com.sun.star.loader.Java2"
+<component loader="com.sun.star.loader.Python"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation
- name="com.sun.star.wizards.agenda.CallWizard$WizardImplementation">
- <service name="com.sun.star.wizards.agenda.CallWizard"/>
+ <implementation name="com.sun.star.wizards.agenda.CallWizard">
+ <service name="com.sun.star.task.Job"/>
</implementation>
</component>