pyagenda: Register and Pack python agenda wizard

Change-Id: I3fc2b0f4e014d358d416c230b0450dcbe5d76363

7 files changed, 17 insertions, 68 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 111529382107..f7238ec00fea 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -396,7 +396,7 @@
       </node>
       <node oor:name="m2" oor:op="replace" install:module="writer">
         <prop oor:name="URL"  oor:type="xs:string">
-          <value >service:com.sun.star.wizards.agenda.CallWizard?start</value>
+          <value >service:com.sun.star.wizards.agenda.CallWizard?insert</value>
         </prop>
         <prop oor:name="Title">
           <value xml:lang="en-US">~Agenda...</value>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 840aaee2e059..8693cd1d0561 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -168,6 +168,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 		scripting/source/pyprov/mailmerge \
 		wizards/com/sun/star/wizards/fax/fax \
 		wizards/com/sun/star/wizards/letter/letter \
+		wizards/com/sun/star/wizards/agenda/agenda \
 		scripting/source/stringresource/stringresource \
 		scripting/source/vbaevents/vbaevents \
 		scripting/util/scriptframe \
@@ -227,7 +228,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 		xmerge/source/bridge/XMergeBridge \
 		scripting/java/ScriptFramework \
 		scripting/java/ScriptProviderForJava \
-		wizards/com/sun/star/wizards/agenda/agenda \
 		wizards/com/sun/star/wizards/form/form \
 		connectivity/source/drivers/hsqldb/hsqldb \
 		connectivity/source/drivers/jdbc/jdbc \
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index b766327ed7bf..65aceccb92b5 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -115,6 +115,12 @@ Directory gid_Dir_Wizards_Letter
     DosName = "letter";
 End
 
+Directory gid_Dir_Wizards_Agenda
+    Styles = (CREATE);
+    ParentID = gid_Dir_Wizards;
+    DosName = "agenda";
+End
+
 Directory gid_Dir_Resource
     ParentID = gid_Brand_Dir_Program;
     DosName = "resource";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6b672d06eb3c..655832850a97 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -433,7 +433,6 @@ End
 STD_JAR_FILE( gid_File_Jar_Report, report )
 STD_JAR_FILE( gid_File_Jar_Table, table )
 STD_JAR_FILE( gid_File_Jar_Form, form )
-STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
 STD_JAR_FILE( gid_File_Jar_Query, query )
 STD_JAR_FILE( gid_File_Jar_Web, web )
 #endif
@@ -495,6 +494,11 @@ File gid_File_Wizards_Letter
     Name = "letter.zip";
 End
 
+File gid_File_Wizards_Agenda
+    Dir = gid_Dir_Wizards_Agenda;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "agenda.zip";
+End
 #endif
 #endif
 
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>