wizards: completely work python wizard packaging and registration

Also improve exception handling and error printing in pythonloader
Allow registration of explicit .py components - the only method that works

3 files changed, 15 insertions, 58 deletions

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 8d93a448b60e..d453dbe600ae 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -92,7 +92,7 @@ End
 
 Directory gid_Dir_Wizards
     Styles = (CREATE);
-    ParentID = gid_Dir_Program;
+    ParentID = gid_Brand_Dir_Program;
     DosName = "wizards";
 End
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 67494757cb5a..3f63f498d7db 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -469,63 +469,17 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
 #ifndef AIX
 #ifndef DISABLE_PYUNO
 
-STD_PY_FILE( gid_File_PyInitWizards, __init__, gid_Dir_Wizards )
-
-STD_PY_FILE( gid_File_PyCallFaxWizard, CallWizard, gid_Dir_Program )
-STD_PY_FILE( gid_File_PyInitFax, __init__, gid_Dir_Wizards_Fax )
-STD_PY_FILE( gid_File_PyFaxDocument, FaxDocument, gid_Dir_Wizards_Fax )
-STD_PY_FILE( gid_File_PyCGFax, CGFax, gid_Dir_Wizards_Fax )
-STD_PY_FILE( gid_File_PyFaxWizardDialogResources, FaxWizardDialogResources, gid_Dir_Wizards_Fax )
-STD_PY_FILE( gid_File_PyFaxWizardDialogConst, FaxWizardDialogConst, gid_Dir_Wizards_Fax )
-STD_PY_FILE( gid_File_PyCGFaxWizard, CGFaxWizard, gid_Dir_Wizards_Fax )
-STD_PY_FILE( gid_File_PyFaxWizardDialogImpl, FaxWizardDialogImpl, gid_Dir_Wizards_Fax )
-STD_PY_FILE( gid_File_PyFaxWizardDialog, FaxWizardDialog, gid_Dir_Wizards_Fax )
-
-STD_PY_FILE( gid_File_PyInitCommon, __init__, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyConfigGroup, ConfigGroup, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyConfiguration, Configuration, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyFileAccess, FileAccess, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyProperties, Properties, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyResource, Resource, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyConfigNode, ConfigNode, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyDebugHelper, DebugHelper, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PySystemDialog, SystemDialog, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyHelper, Helper, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyNoValidPathException, NoValidPathException, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyPropertyNames, PropertyNames, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyConfigSet, ConfigSet, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyDesktop, Desktop, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyHelpIds, HelpIds, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyNumberFormatter, NumberFormatter, gid_Dir_Wizards_Common )
-STD_PY_FILE( gid_File_PyPropertySetHelper, PropertySetHelper, gid_Dir_Wizards_Common )
-
-STD_PY_FILE( gid_File_PyInitDocument, __init__, gid_Dir_Wizards_Document )
-STD_PY_FILE( gid_File_PyOfficeDocument, OfficeDocument, gid_Dir_Wizards_Document )
-
-STD_PY_FILE( gid_File_PyInitText, __init__, gid_Dir_Wizards_Text )
-STD_PY_FILE( gid_File_PyTextDocument, TextDocument, gid_Dir_Wizards_Text )
-STD_PY_FILE( gid_File_PyTextFieldHandler, TextFieldHandler, gid_Dir_Wizards_Text )
-STD_PY_FILE( gid_File_PyTextSectionHandler, TextSectionHandler, gid_Dir_Wizards_Text )
-STD_PY_FILE( gid_File_PyViewHandler, ViewHandler, gid_Dir_Wizards_Text )
-
-STD_PY_FILE( gid_File_PyInitUI, __init__, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyControlScroller, ControlScroller, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyImageList, ImageList, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyPathSelection, PathSelection, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyUIConsts, UIConsts, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyUnoDialog, UnoDialog, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyXPathSelectionListener, XPathSelectionListener, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyDocumentPreview, DocumentPreview, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyPeerConfig, PeerConfig, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyUnoDialog2, UnoDialog2, gid_Dir_Wizards_Ui )
-STD_PY_FILE( gid_File_PyWizardDialog, WizardDialog, gid_Dir_Wizards_Ui )
-
-STD_PY_FILE( gid_File_PyInitEvent, __init__, gid_Dir_Wizards_Ui_Event )
-STD_PY_FILE( gid_File_PyCommonListener, CommonListener, gid_Dir_Wizards_Ui_Event )
-STD_PY_FILE( gid_File_PyDataAware, DataAware, gid_Dir_Wizards_Ui_Event )
-STD_PY_FILE( gid_File_PyListModelBinder, ListModelBinder, gid_Dir_Wizards_Ui_Event )
-STD_PY_FILE( gid_File_PyRadioDataAware, RadioDataAware, gid_Dir_Wizards_Ui_Event )
-STD_PY_FILE( gid_File_PyUnoDataAware, UnoDataAware, gid_Dir_Wizards_Ui_Event )
+File gid_File_Wizards_Common
+    Dir = gid_Dir_Wizards;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "wizards.zip";
+End
+
+File gid_File_Wizards_Fax
+    Dir = gid_Dir_Wizards_Fax;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "fax.zip";
+End
 
 #endif
 #endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index cc080b5faa68..da5775bed73d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -140,6 +140,9 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Letter,
 	gid_File_Jar_Form,
 	gid_File_Jar_Fax,
+	gid_File_Wizards_Common,
+	gid_File_Wizards_Event,
+	gid_File_Wizards_Fax,
 	gid_File_Jar_Agenda,
 	gid_File_Jar_Web,
 	gid_File_Jar_Query,