[PATCH] Pack and register the Web wizard.
Javier Fernandez (via Code Review)
gerrit at gerrit.libreoffice.org
Mon Mar 25 03:47:42 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3027
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/3027/1
Pack and register the Web wizard.
Change-Id: I8e43d228e842f24b054afc6bf59040667a6703d5
---
M postprocess/Rdb_services.mk
M scp2/source/ooo/directory_ooo.scp
M scp2/source/ooo/file_ooo.scp
M wizards/Module_wizards.mk
M wizards/Pyuno_commonwizards.mk
A wizards/Pyuno_web.mk
M wizards/com/sun/star/wizards/web/web.component
7 files changed, 103 insertions(+), 4 deletions(-)
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 4b0b8b7..1216d09 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -169,6 +169,7 @@
wizards/com/sun/star/wizards/fax/fax \
wizards/com/sun/star/wizards/letter/letter \
wizards/com/sun/star/wizards/agenda/agenda \
+ wizards/com/sun/star/wizards/web/web \
scripting/source/stringresource/stringresource \
scripting/source/vbaevents/vbaevents \
scripting/util/scriptframe \
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 65acecc..6a16cb8 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -121,6 +121,12 @@
DosName = "agenda";
End
+Directory gid_Dir_Wizards_Web
+ Styles = (CREATE);
+ ParentID = gid_Dir_Wizards;
+ DosName = "web";
+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 dab412c..828671a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -506,6 +506,12 @@
Name = "agenda.zip";
End
+File gid_File_Wizards_Web
+ Dir = gid_Dir_Wizards_Web;
+ ARCHIVE_TXT_FILE_BODY;
+ Name = "web.zip";
+End
+
File gid_File_Pymailmerge
Dir = gid_Brand_Dir_Program;
ARCHIVE_TXT_FILE_BODY;
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 14d6c05..8aaf41c 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -37,6 +37,7 @@
Pyuno_fax \
Pyuno_letter \
Pyuno_agenda \
+ Pyuno_web \
Pyuno_commonwizards \
Zip_depot \
Zip_euro \
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index f213bb1..2fc4d4e 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -42,6 +42,10 @@
common/Desktop.py \
common/HelpIds.py \
common/NumberFormatter.py \
+ common/IRenderer.py \
+ common/UCB.py \
+ common/XMLHelper.py \
+ common/XMLProvider.py \
text/TextElement.py \
document/__init__.py \
document/OfficeDocument.py \
@@ -66,6 +70,9 @@
ui/event/ListModelBinder.py \
ui/event/RadioDataAware.py \
ui/event/UnoDataAware.py \
+ ui/event/Task.py \
+ ui/event/TaskEvent.py \
+ ui/event/TaskListener.py \
))
# vim:set noet sw=4 ts=4:
diff --git a/wizards/Pyuno_web.mk b/wizards/Pyuno_web.mk
new file mode 100644
index 0000000..5a6ae77
--- /dev/null
+++ b/wizards/Pyuno_web.mk
@@ -0,0 +1,79 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Pyuno_Pyuno,web,$(SRCDIR)/wizards/com/sun/star/wizards/web))
+
+$(eval $(call gb_Pyuno_add_files,web,\
+ CallWizard.py \
+ BackgroundsDialog.py \
+ ErrorHandler.py \
+ AbstractErrorHandler.py \
+ FTPDialog.py \
+ FTPDialogResources.py \
+ IconsDialog.py \
+ ImageListDialog.py \
+ LogTaskListener.py \
+ Process.py \
+ ProcessErrorHandler.py \
+ ProcessErrors.py \
+ ProcessStatusRenderer.py \
+ StatusDialog.py \
+ StylePreview.py \
+ TOCPreview.py \
+ WWD_Events.py \
+ WWD_General.py \
+ WWD_Startup.py \
+ WWHID.py \
+ WebWizard.py \
+ WebWizardConst.py \
+ WebWizardDialog.py \
+ WebWizardDialogResources.py \
+ TypeDetection.py \
+ ExtensionVerifier.py\
+ __init__.py \
+ data/CGArgument.py \
+ data/CGContent.py \
+ data/CGDesign.py \
+ data/CGDocument.py \
+ data/CGExporter.py \
+ data/CGFilter.py \
+ data/CGGeneralInfo.py \
+ data/CGIconSet.py \
+ data/CGImage.py \
+ data/CGLayout.py \
+ data/CGPublish.py \
+ data/CGSession.py \
+ data/CGSessionName.py \
+ data/CGSettings.py \
+ data/CGStyle.py\
+ data/__init__.py \
+ export/Exporter.py \
+ export/AbstractExporter.py \
+ export/CopyExporter.py \
+ export/__init__.py \
+))
+$(eval $(call gb_Pyuno_set_componentfile_full,web,wizards/com/sun/star/wizards/web/web,vnd.openoffice.pymodule:wizards.web,.CallWizard))
diff --git a/wizards/com/sun/star/wizards/web/web.component b/wizards/com/sun/star/wizards/web/web.component
index 27bde3a..64e325f 100644
--- a/wizards/com/sun/star/wizards/web/web.component
+++ b/wizards/com/sun/star/wizards/web/web.component
@@ -17,10 +17,9 @@
* 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.web.CallWizard$WizardImplementation">
- <service name="com.sun.star.wizards.web.CallWizard"/>
+ <implementation name="com.sun.star.wizards.web.CallWizard">
+ <service name="com.sun.star.task.Job"/>
</implementation>
</component>
--
To view, visit https://gerrit.libreoffice.org/3027
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e43d228e842f24b054afc6bf59040667a6703d5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Javier Fernandez <javier.fgb at gmail.com>
More information about the LibreOffice
mailing list