[Libreoffice-commits] .: 14 commits - officecfg/registry postprocess/packcomponents pyuno/source scp2/inc scp2/source sdext/source solenv/gbuild wizards/com wizards/Module_wizards.mk wizards/Pyuno_commonwizards.mk wizards/Pyuno_fax.mk
Michael Meeks
michael at kemper.freedesktop.org
Mon Dec 5 12:57:28 PST 2011
officecfg/registry/data/org/openoffice/Office/Common.xcu | 2
postprocess/packcomponents/makefile.mk | 14
pyuno/source/loader/pythonloader.py | 24
pyuno/source/module/pyuno_runtime.cxx | 4
pyuno/source/module/uno.py | 6
scp2/inc/macros.inc | 8
scp2/source/ooo/directory_ooo.scp | 41
scp2/source/ooo/file_ooo.scp | 18
scp2/source/ooo/module_hidden_ooo.scp | 3
sdext/source/presenter/PresenterProtocolHandler.cxx | 322 --
sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png |binary
sdext/source/presenter/makefile.mk | 2
sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu | 38
solenv/gbuild/Pyuno.mk | 28
solenv/gbuild/TargetLocations.mk | 1
wizards/Module_wizards.mk | 2
wizards/Pyuno_commonwizards.mk | 74
wizards/Pyuno_fax.mk | 41
wizards/com/sun/star/wizards/RemoteWebWizard | 7
wizards/com/sun/star/wizards/agenda/AgendaTemplate.py | 1197 ++++++++++
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py | 293 ++
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py | 63
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 463 +++
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py | 153 +
wizards/com/sun/star/wizards/agenda/CGAgenda.py | 27
wizards/com/sun/star/wizards/agenda/CGTopic.py | 45
wizards/com/sun/star/wizards/agenda/TemplateConsts.py | 72
wizards/com/sun/star/wizards/agenda/TopicsControl.py | 886 +++++++
wizards/com/sun/star/wizards/common/ConfigGroup.py | 35
wizards/com/sun/star/wizards/common/ConfigNode.py | 13
wizards/com/sun/star/wizards/common/ConfigSet.py | 184 +
wizards/com/sun/star/wizards/common/Configuration.py | 215 +
wizards/com/sun/star/wizards/common/DebugHelper.py | 10
wizards/com/sun/star/wizards/common/Desktop.py | 230 +
wizards/com/sun/star/wizards/common/FileAccess.py | 676 +++++
wizards/com/sun/star/wizards/common/HelpIds.py | 1012 ++++++++
wizards/com/sun/star/wizards/common/Helper.py | 160 +
wizards/com/sun/star/wizards/common/NoValidPathException.py | 10
wizards/com/sun/star/wizards/common/NumberFormatter.py | 232 +
wizards/com/sun/star/wizards/common/Properties.py | 43
wizards/com/sun/star/wizards/common/PropertyNames.py | 15
wizards/com/sun/star/wizards/common/PropertySetHelper.py | 250 ++
wizards/com/sun/star/wizards/common/Resource.py | 70
wizards/com/sun/star/wizards/common/SystemDialog.py | 230 +
wizards/com/sun/star/wizards/document/OfficeDocument.py | 280 ++
wizards/com/sun/star/wizards/fax/CGFax.py | 31
wizards/com/sun/star/wizards/fax/CGFaxWizard.py | 10
wizards/com/sun/star/wizards/fax/CallWizard.py | 35
wizards/com/sun/star/wizards/fax/FaxDocument.py | 129 +
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 638 +++++
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py | 83
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 659 +++++
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 140 +
wizards/com/sun/star/wizards/fax/__init__.py | 2
wizards/com/sun/star/wizards/fax/pyfax.component | 34
wizards/com/sun/star/wizards/form/StyleApplier.java | 2
wizards/com/sun/star/wizards/letter/CGLetter.py | 37
wizards/com/sun/star/wizards/letter/CGLetterWizard.py | 10
wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py | 10
wizards/com/sun/star/wizards/letter/LetterDocument.py | 259 ++
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 1105 +++++++++
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py | 60
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 1196 +++++++++
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 219 +
wizards/com/sun/star/wizards/letter/LocaleCodes.py | 154 +
wizards/com/sun/star/wizards/text/TextDocument.py | 262 ++
wizards/com/sun/star/wizards/text/TextFieldHandler.py | 165 +
wizards/com/sun/star/wizards/text/TextSectionHandler.py | 123 +
wizards/com/sun/star/wizards/text/ViewHandler.py | 37
wizards/com/sun/star/wizards/ui/ControlScroller.py | 230 +
wizards/com/sun/star/wizards/ui/DocumentPreview.py | 85
wizards/com/sun/star/wizards/ui/ImageList.py | 503 ++++
wizards/com/sun/star/wizards/ui/PathSelection.py | 121 +
wizards/com/sun/star/wizards/ui/PeerConfig.py | 62
wizards/com/sun/star/wizards/ui/UIConsts.py | 55
wizards/com/sun/star/wizards/ui/UnoDialog.py | 411 +++
wizards/com/sun/star/wizards/ui/UnoDialog2.py | 240 ++
wizards/com/sun/star/wizards/ui/WizardDialog.py | 490 ++++
wizards/com/sun/star/wizards/ui/XPathSelectionListener.py | 7
wizards/com/sun/star/wizards/ui/event/CommonListener.py | 124 +
wizards/com/sun/star/wizards/ui/event/DataAware.java | 8
wizards/com/sun/star/wizards/ui/event/DataAware.py | 114
wizards/com/sun/star/wizards/ui/event/ListModelBinder.py | 75
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java | 11
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py | 37
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py | 84
wizards/com/sun/star/wizards/web/BackgroundsDialog.py | 194 +
wizards/com/sun/star/wizards/web/IconsDialog.py | 96
wizards/com/sun/star/wizards/web/ImageListDialog.py | 211 +
wizards/com/sun/star/wizards/web/StylePreview.py | 76
wizards/com/sun/star/wizards/web/WWD_Events.py | 937 +++++++
wizards/com/sun/star/wizards/web/WWD_General.py | 258 ++
wizards/com/sun/star/wizards/web/WWD_Startup.py | 661 +++++
wizards/com/sun/star/wizards/web/WWHID.py | 140 +
wizards/com/sun/star/wizards/web/WebWizardConst.py | 39
wizards/com/sun/star/wizards/web/WebWizardDialog.py | 713 +++++
wizards/com/sun/star/wizards/web/WebWizardDialogResources.py | 298 ++
99 files changed, 18878 insertions(+), 301 deletions(-)
New commits:
commit fe05a4b4aaaabecd5d63362bd563188133dcb08c
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Dec 5 20:52:12 2011 +0000
fax wizard: build and install the java wizard in paralle to the python one
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c394308..f09c51e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -97,7 +97,6 @@ my_components = \
component/scripting/source/dlgprov/dlgprov \
component/scripting/source/protocolhandler/protocolhandler \
component/scripting/source/pyprov/mailmerge \
- component/wizards/com/sun/star/wizards/fax/fax \
component/scripting/source/stringresource/stringresource \
component/scripting/source/vbaevents/vbaevents \
component/scripting/util/scriptframe \
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index fa07924..a0acbc5 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 06383e7..462fe29 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 0000000..06383e7
--- /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>
commit 49df5176e5f72bc2943924b025afcc19d9b8ebec
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Dec 5 20:26:12 2011 +0000
fax wizard: more misc. bug fixing, and missing file makefile
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
new file mode 100644
index 0000000..3c52e1d
--- /dev/null
+++ b/wizards/Pyuno_commonwizards.mk
@@ -0,0 +1,74 @@
+# 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 David Tardon, Red Hat Inc. <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,wizards,$(SRCDIR)/wizards/com/sun/star/wizards))
+
+$(eval $(call gb_Pyuno_add_files,wizards,\
+ __init__.py \
+ common/__init__.py \
+ common/ConfigGroup.py \
+ common/Configuration.py \
+ common/FileAccess.py \
+ common/Properties.py \
+ common/Resource.py \
+ common/ConfigNode.py \
+ common/DebugHelper.py \
+ common/Helper.py \
+ common/NoValidPathException.py \
+ common/PropertyNames.py \
+ common/SystemDialog.py \
+ common/ConfigSet.py \
+ common/Desktop.py \
+ common/HelpIds.py \
+ common/NumberFormatter.py \
+ common/PropertySetHelper.py \
+ document/__init__.py \
+ document/OfficeDocument.py \
+ text/__init__.py \
+ text/TextDocument.py \
+ text/TextFieldHandler.py \
+ text/TextSectionHandler.py \
+ text/ViewHandler.py \
+ ui/__init__.py \
+ ui/ControlScroller.py \
+ ui/ImageList.py \
+ ui/PathSelection.py \
+ ui/UIConsts.py \
+ ui/UnoDialog.py \
+ ui/XPathSelectionListener.py \
+ ui/DocumentPreview.py \
+ ui/PeerConfig.py \
+ ui/UIConsts.py \
+ ui/UnoDialog2.py \
+ ui/WizardDialog.py \
+ ui/event/__init__.py \
+ ui/event/CommonListener.py \
+ ui/event/DataAware.py \
+ ui/event/ListModelBinder.py \
+ ui/event/RadioDataAware.py \
+ ui/event/UnoDataAware.py \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py b/wizards/com/sun/star/wizards/fax/CallWizard.py
index 1114603..0ea754b 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.py
@@ -2,6 +2,7 @@
import uno
import unohelper
+import traceback
from com.sun.star.task import XJobExecutor
from wizards.fax.FaxWizardDialogImpl import FaxWizardDialogImpl
diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.py b/wizards/com/sun/star/wizards/ui/UIConsts.py
index a975ff4..2c7ee2a 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.py
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.py
@@ -1,53 +1,55 @@
-RID_COMMON = 500
-RID_DB_COMMON = 1000
-RID_FORM = 2200
-RID_QUERY = 2300
-RID_REPORT = 2400
-RID_TABLE = 2500
-RID_IMG_REPORT = 1000
-RID_IMG_FORM = 1100
-RID_IMG_WEB = 1200
-INVISIBLESTEP = 99
-INFOIMAGEURL = "private:resource/dbu/image/19205"
+class UIConsts():
-'''
-The tabindex of the navigation buttons in a wizard must be assigned a very
-high tabindex because on every step their taborder must appear at the end
-'''
-SOFIRSTWIZARDNAVITABINDEX = 30000
+ RID_COMMON = 500
+ RID_DB_COMMON = 1000
+ RID_FORM = 2200
+ RID_QUERY = 2300
+ RID_REPORT = 2400
+ RID_TABLE = 2500
+ RID_IMG_REPORT = 1000
+ RID_IMG_FORM = 1100
+ RID_IMG_WEB = 1200
+ INVISIBLESTEP = 99
+ INFOIMAGEURL = "private:resource/dbu/image/19205"
-#Steps of the QueryWizard
+ '''
+ The tabindex of the navigation buttons in a wizard must be assigned a very
+ high tabindex because on every step their taborder must appear at the end
+ '''
+ SOFIRSTWIZARDNAVITABINDEX = 30000
-SOFIELDSELECTIONPAGE = 1
-SOSORTINGPAGE = 2
-SOFILTERPAGE = 3
-SOAGGREGATEPAGE = 4
-SOGROUPSELECTIONPAGE = 5
-SOGROUPFILTERPAGE = 6
-SOTITLESPAGE = 7
-SOSUMMARYPAGE = 8
+ # Steps of the QueryWizard
-class CONTROLTYPE():
+ SOFIELDSELECTIONPAGE = 1
+ SOSORTINGPAGE = 2
+ SOFILTERPAGE = 3
+ SOAGGREGATEPAGE = 4
+ SOGROUPSELECTIONPAGE = 5
+ SOGROUPFILTERPAGE = 6
+ SOTITLESPAGE = 7
+ SOSUMMARYPAGE = 8
- BUTTON = 1
- IMAGECONTROL = 2
- LISTBOX = 3
- COMBOBOX = 4
- CHECKBOX = 5
- RADIOBUTTON = 6
- DATEFIELD = 7
- EDITCONTROL = 8
- FILECONTROL = 9
- FIXEDLINE = 10
- FIXEDTEXT = 11
- FORMATTEDFIELD = 12
- GROUPBOX = 13
- HYPERTEXT = 14
- NUMERICFIELD = 15
- PATTERNFIELD = 16
- PROGRESSBAR = 17
- ROADMAP = 18
- SCROLLBAR = 19
- TIMEFIELD = 20
- CURRENCYFIELD = 21
- UNKNOWN = -1
+ class CONTROLTYPE():
+
+ BUTTON = 1
+ IMAGECONTROL = 2
+ LISTBOX = 3
+ COMBOBOX = 4
+ CHECKBOX = 5
+ RADIOBUTTON = 6
+ DATEFIELD = 7
+ EDITCONTROL = 8
+ FILECONTROL = 9
+ FIXEDLINE = 10
+ FIXEDTEXT = 11
+ FORMATTEDFIELD = 12
+ GROUPBOX = 13
+ HYPERTEXT = 14
+ NUMERICFIELD = 15
+ PATTERNFIELD = 16
+ PROGRESSBAR = 17
+ ROADMAP = 18
+ SCROLLBAR = 19
+ TIMEFIELD = 20
+ CURRENCYFIELD = 21
+ UNKNOWN = -1
commit 1a7eee2446dfbe06ac39941473010fc8915ee6e6
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Dec 5 19:44:49 2011 +0000
Improve pyuno debugging in various ways - add stack traces etc.
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py
index 5675a0c..c4fa69d 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -111,7 +111,8 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
g_loadedComponents[url] = mod
return mod
elif "vnd.openoffice.pymodule" == protocol:
- print ("here")
+ # the failure is on symbol lookup later in the parent ...
+ print ("Warning: Python module loading is almost certainly pre-broken")
nSlash = dependent.rfind('/')
if -1 != nSlash:
path = unohelper.fileUrlToSystemPath( dependent[0:nSlash] )
@@ -127,7 +128,8 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
protocol + " in url " +url, self )
except Exception as e:
if DEBUG:
- print ("Python import error " + str(e) + " args " + str(e.args));
+ print ("Python import exception " + str(type(e)) +
+ " message " + str(e) + " args " + str(e.args));
raise RuntimeException( "Couldn't load " + url + " for reason " + str(e), None )
return None
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index c09cc5c..e15a72d 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -1008,6 +1008,10 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
}
RuntimeException e;
e.Message = buf.makeStringAndClear();
+#if OSL_DEBUG_LEVEL > 0
+ fprintf( stderr, "Python exception: %s\n",
+ rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
+#endif
ret = com::sun::star::uno::makeAny( e );
}
return ret;
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index e82d9d6..f93ac5e 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -333,7 +333,7 @@ def _uno_struct__setattr__(self,name,value):
# private, referenced from the pyuno shared library
def _uno_struct__repr__(self):
return repr(self.__dict__["value"])
-
+
def _uno_struct__str__(self):
return str(self.__dict__["value"])
@@ -363,7 +363,7 @@ def _uno_extract_printable_stacktrace( trace ):
ret = "Couldn't import traceback module"
return ret
-# hook into the __import__ chain
+# hook into the __import__ chain
__builtin__.__dict__["__import__"] = _uno_import
-
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 41b8bad143c06bc5419783b9f3cf5685aa3eea63
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Dec 5 13:04:05 2011 +0000
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
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 587b756..39677d2 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -74,51 +74,6 @@ LOCALPYFILES= \
$(BIN)$/pythonloader.py \
$(BIN)$/officehelper.py \
$(BIN)$/mailmerge.py \
- $(BIN)$/CallWizard.py \
- $(BIN)$/__init__.py \
- $(BIN)$/FaxDocument.py \
- $(BIN)$/FaxWizardDialogResources.py \
- $(BIN)$/CGFax.py \
- $(BIN)$/FaxWizardDialogConst.py \
- $(BIN)$/CGFaxWizard.py \
- $(BIN)$/FaxWizardDialogImpl.py \
- $(BIN)$/FaxWizardDialog.py \
- $(BIN)$/Configuration.py \
- $(BIN)$/ConfigGroup.py \
- $(BIN)$/FileAccess.py \
- $(BIN)$/Properties.py \
- $(BIN)$/Resource.py \
- $(BIN)$/ConfigNode.py \
- $(BIN)$/DebugHelper.py \
- $(BIN)$/Helper.py \
- $(BIN)$/NoValidPathException.py \
- $(BIN)$/PropertyNames.py \
- $(BIN)$/SystemDialog.py \
- $(BIN)$/ConfigSet.py \
- $(BIN)$/Desktop.py \
- $(BIN)$/HelpIds.py \
- $(BIN)$/NumberFormatter.py \
- $(BIN)$/PropertySetHelper.py \
- $(BIN)$/OfficeDocument.py \
- $(BIN)$/TextDocument.py \
- $(BIN)$/TextFieldHandler.py \
- $(BIN)$/TextSectionHandler.py \
- $(BIN)$/ViewHandler.py \
- $(BIN)$/ControlScroller.py \
- $(BIN)$/ImageList.py \
- $(BIN)$/PathSelection.py \
- $(BIN)$/UIConsts.py \
- $(BIN)$/UnoDialog.py \
- $(BIN)$/XPathSelectionListener.py \
- $(BIN)$/DocumentPreview.py \
- $(BIN)$/PeerConfig.py \
- $(BIN)$/UnoDialog2.py \
- $(BIN)$/WizardDialog.py \
- $(BIN)$/CommonListener.py \
- $(BIN)$/DataAware.py \
- $(BIN)$/ListModelBinder.py \
- $(BIN)$/RadioDataAware.py \
- $(BIN)$/UnoDataAware.py \
$(BIN)$/msgbox.py
.ENDIF
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 10f964b..c394308 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -93,13 +93,14 @@ my_components = \
component/scaddins/source/analysis/analysis \
component/scaddins/source/datefunc/date \
component/sccomp/source/solver/solver \
- component/scripting/source/basprov/basprov \
- component/scripting/source/dlgprov/dlgprov \
- component/scripting/source/protocolhandler/protocolhandler \
+ component/scripting/source/basprov/basprov \
+ component/scripting/source/dlgprov/dlgprov \
+ component/scripting/source/protocolhandler/protocolhandler \
component/scripting/source/pyprov/mailmerge \
- component/scripting/source/stringresource/stringresource \
- component/scripting/source/vbaevents/vbaevents \
- component/scripting/util/scriptframe \
+ component/wizards/com/sun/star/wizards/fax/fax \
+ component/scripting/source/stringresource/stringresource \
+ component/scripting/source/vbaevents/vbaevents \
+ component/scripting/util/scriptframe \
component/sd/util/sd \
component/sd/util/sdd \
component/sd/util/sdfilt \
@@ -196,7 +197,7 @@ my_components += pythonloader
.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID"
my_components += component/desktop/unx/splash/splash
.ENDIF
-
+
.IF "$(DISABLE_ATL)" == ""
my_components += emboleobj
.END
@@ -357,8 +358,6 @@ my_components += evoab
my_components += component/avmedia/source/gstreamer/avmediagstreamer
.END
-my_ooo_components = mailmerge component/wizards/com/sun/star/wizards/fax/fax
-
.INCLUDE: target.mk
ALLTAR : $(MISC)/services.rdb
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py
index ad72cca..5675a0c 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -35,7 +35,7 @@ from com.sun.star.loader import XImplementationLoader
from com.sun.star.lang import XServiceInfo
MODULE_PROTOCOL = "vnd.openoffice.pymodule:"
-DEBUG = 0
+DEBUG = 1
g_supportedServices = "com.sun.star.loader.Python", # referenced by the native C++ loader !
g_implementationName = "org.openoffice.comp.pyuno.Loader" # referenced by the native C++ loader !
@@ -98,6 +98,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
# read the file
filename = unohelper.fileUrlToSystemPath( url )
+
fileHandle = file( filename )
src = fileHandle.read().replace("\r","")
if not src.endswith( "\n" ):
@@ -110,11 +111,23 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
g_loadedComponents[url] = mod
return mod
elif "vnd.openoffice.pymodule" == protocol:
- return __import__( dependent )
+ print ("here")
+ nSlash = dependent.rfind('/')
+ if -1 != nSlash:
+ path = unohelper.fileUrlToSystemPath( dependent[0:nSlash] )
+ dependent = dependent[nSlash+1:len(dependent)]
+ if not path in sys.path:
+ sys.path.append( path )
+ var = __import__( dependent )
+ return var
else:
+ if DEBUG:
+ print("Unknown protocol '" + protocol + "'");
raise RuntimeException( "PythonLoader: Unknown protocol " +
protocol + " in url " +url, self )
- except ImportError as e:
+ except Exception as e:
+ if DEBUG:
+ print ("Python import error " + str(e) + " args " + str(e.args));
raise RuntimeException( "Couldn't load " + url + " for reason " + str(e), None )
return None
@@ -124,6 +137,9 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
mod = self.getModuleFromUrl( locationUrl )
implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
+ print ("dump stuff")
+ if DEBUG:
+ print ("Fetched ImplHelper as " + str(implHelper))
if implHelper == None:
return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey )
else:
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 8d93a44..d453dbe 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 6749475..3f63f49 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 cc080b5..da5775b 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,
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index b8eb04e..57c5571 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -23,26 +23,39 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+gb_Pyuno_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
gb_Pyuno__get_outdir_path = $(patsubst $(OUTDIR)/%,%,$(gb_Helper_OUTDIRLIBDIR))/pyuno/$(1)
$(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
mkdir -p $(dir $@) && touch $@
+$(call gb_Pyuno_get_target_zip,%) : $(call gb_Package_get_target,%_pyuno)
+ $(call gb_Output_announce,$*,$(true),PYZIP,3)
+ cd $(gb_Helper_OUTDIRLIBDIR)/pyuno && \
+ $(gb_Pyuno_ZIPCOMMAND) -rX --filesync \
+ $(call gb_Pyuno_get_target_zip,$*) \
+ $(PYZFILES)
+
.PHONY : $(call gb_Pyuno_get_clean_target,%)
$(call gb_Pyuno_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PYU,3)
- rm -f $@
+ rm -f $@ $(gb_Pyuno_get_target_zip,$*)
define gb_Pyuno_Pyuno
+$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES :=
$(call gb_Package_Package,$(1)_pyuno,$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
-$(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(1)_pyuno)
-$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_pyuno)
+$(call gb_Pyuno_get_target,$(1)) : \
+ $(call gb_Package_get_target,$(1)_pyuno) \
+ $(call gb_Pyuno_get_target_zip,$(1))
+$(call gb_Pyuno_get_clean_target,$(1)) : \
+ $(call gb_Package_get_clean_target,$(1)_pyuno)
endef
define gb_Pyuno_add_file
+$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES += $(2)
$(call gb_Package_add_file,$(1)_pyuno,$(call gb_Pyuno__get_outdir_path,$(2)),$(2))
endef
@@ -54,11 +67,16 @@ endef
gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule:
-define gb_Pyuno_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(2),$(gb_Pyuno__COMPONENTPREFIX),$(1))
+define gb_Pyuno_set_componentfile_full
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4))
$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
endef
+define gb_Pyuno_set_componentfile
+$(call gb_Pyuno_set_componentfile_full,$(1),$(2),$(gb_Pyuno__COMPONENTPREFIX),$(1))
+
+endef
+
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 20af9eb..d51b8ed 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -104,6 +104,7 @@ gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1)
gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1)
+gb_Pyuno_get_target_zip = $(OUTDIR)/bin/$(1).zip
gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index b17e872..14cd360 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
AllLangResTarget_wzi \
Pyuno_fax \
Pyuno_commonwizards \
- Pyuno_event \
Zip_depot \
Zip_euro \
Zip_form \
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
deleted file mode 100644
index f13c1c2..0000000
--- a/wizards/Pyuno_commonwizards.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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 David Tardon, Red Hat Inc. <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,common,$(SRCDIR)/wizards/com/sun/star/wizards))
-
-$(eval $(call gb_Pyuno_add_files,common,\
- common/ConfigGroup.py \
- common/Configuration.py \
- common/FileAccess.py \
- common/Properties.py \
- common/Resource.py \
- common/ConfigNode.py \
- common/DebugHelper.py \
- common/Helper.py \
- common/NoValidPathException.py \
- common/PropertyNames.py \
- common/SystemDialog.py \
- common/ConfigSet.py \
- common/Desktop.py \
- common/HelpIds.py \
- common/NumberFormatter.py \
- common/PropertySetHelper.py \
- document/OfficeDocument.py \
- text/TextDocument.py \
- text/TextFieldHandler.py \
- text/TextSectionHandler.py \
- text/ViewHandler.py \
- ui/ControlScroller.py \
- ui/ImageList.py \
- ui/PathSelection.py \
- ui/UIConsts.py \
- ui/UnoDialog.py \
- ui/XPathSelectionListener.py \
- ui/DocumentPreview.py \
- ui/PeerConfig.py \
- ui/UnoDialog2.py \
- ui/WizardDialog.py \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/Pyuno_event.mk b/wizards/Pyuno_event.mk
deleted file mode 100644
index f349637..0000000
--- a/wizards/Pyuno_event.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 David Tardon, Red Hat Inc. <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,event,$(SRCDIR)/wizards/com/sun/star/wizards/ui/event))
-
-$(eval $(call gb_Pyuno_add_files,event,\
- CommonListener.py \
- DataAware.py \
- ListModelBinder.py \
- RadioDataAware.py \
- UnoDataAware.py \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index 61467a1..fa07924 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -26,6 +26,7 @@
$(eval $(call gb_Pyuno_Pyuno,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
$(eval $(call gb_Pyuno_add_files,fax,\
+ __init__.py \
CallWizard.py \
CGFax.py \
CGFaxWizard.py \
@@ -34,9 +35,7 @@ $(eval $(call gb_Pyuno_add_files,fax,\
FaxWizardDialogImpl.py \
FaxWizardDialog.py \
FaxWizardDialogResources.py \
- __init__.py \
))
-
-$(eval $(call gb_Pyuno_set_componentfile,fax,wizards/com/sun/star/wizards/fax/fax))
+$(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))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py b/wizards/com/sun/star/wizards/fax/CallWizard.py
index 5aae1b7..1114603 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.py
@@ -14,8 +14,13 @@ class CallWizard(unohelper.Base, XJobExecutor):
self.ctx = ctx
def trigger(self, args):
- fw = FaxWizardDialogImpl(self.ctx.ServiceManager)
- fx.startWizard()
+ try:
+ fw = FaxWizardDialogImpl(self.ctx.ServiceManager)
+ fw.startWizard(self.ctx.ServiceManager)
+ except Exception as e:
+ print ("Wizard failure exception " + str(type(e)) +
+ " message " + str(e) + " args " + str(e.args) +
+ traceback.format_exc());
# pythonloader looks for a static g_ImplementationHelper variable
g_ImplementationHelper = unohelper.ImplementationHelper()
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index c465d88..c74aa1f 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -1,3 +1,4 @@
+import wizards.ui.UIConsts
from wizards.ui.WizardDialog import *
from wizards.fax.FaxWizardDialogResources import FaxWizardDialogResources
from wizards.fax.FaxWizardDialogConst import *
diff --git a/wizards/com/sun/star/wizards/fax/__init__.py b/wizards/com/sun/star/wizards/fax/__init__.py
index e69de29..1ad913a 100644
--- a/wizards/com/sun/star/wizards/fax/__init__.py
+++ b/wizards/com/sun/star/wizards/fax/__init__.py
@@ -0,0 +1,2 @@
+__all__ = ['CallWizard', 'CGFax', 'GCFaxWizard', 'FaxDocument', 'FaxWizardDialogConst',
+ 'FaxWizardDialogImpl', 'FaxWizardDialog', 'FaxWizardDialogResources']
diff --git a/wizards/com/sun/star/wizards/fax/fax.component b/wizards/com/sun/star/wizards/fax/fax.component
index a03d00a..06383e7 100644
--- a/wizards/com/sun/star/wizards/fax/fax.component
+++ b/wizards/com/sun/star/wizards/fax/fax.component
@@ -28,8 +28,7 @@
<component loader="com.sun.star.loader.Python"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation
- name="com.sun.star.wizards.fax.CallWizard">
+ <implementation name="com.sun.star.wizards.fax.CallWizard">
<service name="com.sun.star.task.Job"/>
</implementation>
</component>
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
index 58b448c..31ab465 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@ -1,3 +1,4 @@
+from wizards.ui.UIConsts import *
from wizards.ui.UnoDialog import *
from wizards.ui.event.CommonListener import *
from wizards.common.Desktop import Desktop
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index d73fb4f..fddc2e0 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -1,3 +1,4 @@
+import wizards.ui.UIConsts
from wizards.ui.UnoDialog2 import *
from abc import ABCMeta, abstractmethod
from wizards.common.Resource import Resource
diff --git a/wizards/com/sun/star/wizards/ui/event/__init__.py b/wizards/com/sun/star/wizards/ui/event/__init__.py
new file mode 100644
index 0000000..e69de29
commit fb7f82382bd317dd12913a6d7a3a5e4be6a6671c
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Dec 2 17:56:44 2011 +0000
presenter console: clean and simplify over-abstract code
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index f5be51f..c801462 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -66,8 +66,8 @@ namespace {
public:
virtual ~Command() {}
virtual void Execute (void) = 0;
- virtual bool IsEnabled (void) const = 0;
- virtual Any GetState (void) const = 0;
+ virtual bool IsEnabled (void) const { return true; }
+ virtual Any GetState (void) const { return Any(sal_False); }
};
class GotoPreviousSlideCommand : public Command
@@ -78,7 +78,6 @@ namespace {
virtual ~GotoPreviousSlideCommand (void) {}
virtual void Execute (void);
virtual bool IsEnabled (void) const;
- virtual Any GetState (void) const;
private:
rtl::Reference<PresenterController> mpPresenterController;
};
@@ -90,8 +89,10 @@ namespace {
const rtl::Reference<PresenterController>& rpPresenterController);
virtual ~GotoNextSlideCommand (void) {}
virtual void Execute (void);
- virtual bool IsEnabled (void) const;
- virtual Any GetState (void) const;
+ // The next slide command is always enabled, even when the current slide
+ // is the last slide: from the last slide it goes to the pause slide,
+ // and from there it ends the slide show.
+ virtual bool IsEnabled (void) const { return true; }
private:
rtl::Reference<PresenterController> mpPresenterController;
};
@@ -103,8 +104,6 @@ namespace {
const rtl::Reference<PresenterController>& rpPresenterController);
virtual ~GotoNextEffectCommand (void) {}
virtual void Execute (void);
- virtual bool IsEnabled (void) const;
- virtual Any GetState (void) const;
private:
rtl::Reference<PresenterController> mpPresenterController;
};
@@ -116,8 +115,6 @@ namespace {
const rtl::Reference<PresenterController>& rpPresenterController);
virtual ~SwitchMonitorCommand (void) {}
virtual void Execute (void);
- virtual bool IsEnabled (void) const;
- virtual Any GetState (void) const;
private:
rtl::Reference<PresenterController> mpPresenterController;
};
@@ -130,7 +127,6 @@ namespace {
const rtl::Reference<PresenterController>& rpPresenterController);
virtual ~SetNotesViewCommand (void) {}
virtual void Execute (void);
- virtual bool IsEnabled (void) const;
virtual Any GetState (void) const;
private:
bool mbOn;
@@ -146,7 +142,6 @@ namespace {
const rtl::Reference<PresenterController>& rpPresenterController);
virtual ~SetSlideSorterCommand (void) {}
virtual void Execute (void);
- virtual bool IsEnabled (void) const;
virtual Any GetState (void) const;
private:
bool mbOn;
@@ -161,7 +156,6 @@ namespace {
const rtl::Reference<PresenterController>& rpPresenterController);
virtual ~SetHelpViewCommand (void) {}
virtual void Execute (void);
- virtual bool IsEnabled (void) const;
virtual Any GetState (void) const;
private:
bool mbOn;
@@ -176,7 +170,6 @@ namespace {
const sal_Int32 nSizeChange);
virtual ~NotesFontSizeCommand (void) {}
virtual void Execute (void);
- virtual bool IsEnabled (void) const;
virtual Any GetState (void) const;
protected:
::rtl::Reference<PresenterNotesView> GetNotesView (void) const;
@@ -259,9 +252,6 @@ private:
void ThrowIfDisposed (void) const throw (css::lang::DisposedException);
};
-
-
-
//----- Service ---------------------------------------------------------------
OUString PresenterProtocolHandler::getImplementationName_static (void)
@@ -269,18 +259,12 @@ OUString PresenterProtocolHandler::getImplementationName_static (void)
return A2S("vnd.sun.star.sdext.presenter.PresenterProtocolHandler");
}
-
-
-
Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static (void)
{
static const ::rtl::OUString sServiceName(A2S("com.sun.star.frame.ProtocolHandler"));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
-
-
-
Reference<XInterface> PresenterProtocolHandler::Create (
const Reference<uno::XComponentContext>& rxContext)
SAL_THROW((Exception))
@@ -289,34 +273,22 @@ Reference<XInterface> PresenterProtocolHandler::Create (
}
-
-
//===== PresenterProtocolHandler =========================================================
-
PresenterProtocolHandler::PresenterProtocolHandler (const Reference<XComponentContext>& rxContext)
: PresenterProtocolHandlerInterfaceBase(m_aMutex)
{
(void)rxContext;
}
-
-
-
PresenterProtocolHandler::~PresenterProtocolHandler (void)
{
}
-
-
-
void SAL_CALL PresenterProtocolHandler::disposing (void)
{
}
-
-
-
//----- XInitialize -----------------------------------------------------------
void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArguments)
@@ -340,9 +312,6 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArgume
}
}
-
-
-
//----- XDispatchProvider -----------------------------------------------------
Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch (
@@ -365,9 +334,6 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch (
return xDispatch;
}
-
-
-
Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryDispatches(
const Sequence<frame::DispatchDescriptor>& rDescriptors)
throw(RuntimeException)
@@ -378,8 +344,6 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD
}
-
-
//-----------------------------------------------------------------------------
void PresenterProtocolHandler::ThrowIfDisposed (void) const
@@ -394,9 +358,6 @@ void PresenterProtocolHandler::ThrowIfDisposed (void) const
}
}
-
-
-
//===== PresenterProtocolHandler::Dispatch ====================================
Reference<frame::XDispatch> PresenterProtocolHandler::Dispatch::Create (
@@ -410,9 +371,6 @@ Reference<frame::XDispatch> PresenterProtocolHandler::Dispatch::Create (
return NULL;
}
-
-
-
PresenterProtocolHandler::Dispatch::Dispatch (
const OUString& rsURLPath,
const ::rtl::Reference<PresenterController>& rpPresenterController)
@@ -430,9 +388,6 @@ PresenterProtocolHandler::Dispatch::Dispatch (
}
}
-
-
-
Command* PresenterProtocolHandler::Dispatch::CreateCommand (
const OUString& rsURLPath,
const ::rtl::Reference<PresenterController>& rpPresenterController)
@@ -468,16 +423,10 @@ Command* PresenterProtocolHandler::Dispatch::CreateCommand (
return NULL;
}
-
-
-
PresenterProtocolHandler::Dispatch::~Dispatch (void)
{
}
-
-
-
void PresenterProtocolHandler::Dispatch::disposing (void)
{
if (mbIsListeningToWindowManager)
@@ -491,9 +440,6 @@ void PresenterProtocolHandler::Dispatch::disposing (void)
mpCommand.reset();
}
-
-
-
//----- XDispatch -------------------------------------------------------------
void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch(
@@ -517,9 +463,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch(
}
}
-
-
-
void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener(
const css::uno::Reference<css::frame::XStatusListener>& rxListener,
const css::util::URL& rURL)
@@ -540,9 +483,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener(
throw RuntimeException();
}
-
-
-
void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener (
const css::uno::Reference<css::frame::XStatusListener>& rxListener,
const css::util::URL& rURL)
@@ -562,11 +502,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener (
throw RuntimeException();
}
-
-
-
-//-----------------------------------------------------------------------------
-
void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const
throw (::com::sun::star::lang::DisposedException)
{
@@ -579,9 +514,6 @@ void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const
}
}
-
-
-
//----- document::XEventListener ----------------------------------------------
void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent (
@@ -593,9 +525,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent (
mpCommand->GetState();
}
-
-
-
//----- lang::XEventListener --------------------------------------------------
void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::EventObject& rEvent)
@@ -606,9 +535,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::Ev
}
-
-
-
//===== GotoPreviousSlideCommand ==============================================
GotoPreviousSlideCommand::GotoPreviousSlideCommand (
@@ -617,8 +543,6 @@ GotoPreviousSlideCommand::GotoPreviousSlideCommand (
{
}
-
-
void GotoPreviousSlideCommand::Execute (void)
{
if ( ! mpPresenterController.is())
@@ -630,9 +554,6 @@ void GotoPreviousSlideCommand::Execute (void)
mpPresenterController->GetSlideShowController()->gotoPreviousSlide();
}
-
-
-
bool GotoPreviousSlideCommand::IsEnabled (void) const
{
if ( ! mpPresenterController.is())
@@ -644,16 +565,6 @@ bool GotoPreviousSlideCommand::IsEnabled (void) const
return mpPresenterController->GetSlideShowController()->getCurrentSlideIndex()>0;
}
-
-
-
-Any GotoPreviousSlideCommand::GetState (void) const
-{
- return Any(sal_False);
-}
-
-
-
//===== GotoNextEffect ========================================================
GotoNextEffectCommand::GotoNextEffectCommand (
@@ -662,8 +573,6 @@ GotoNextEffectCommand::GotoNextEffectCommand (
{
}
-
-
void GotoNextEffectCommand::Execute (void)
{
if ( ! mpPresenterController.is())
@@ -675,28 +584,6 @@ void GotoNextEffectCommand::Execute (void)
mpPresenterController->GetSlideShowController()->gotoNextEffect();
}
-
-
-
-bool GotoNextEffectCommand::IsEnabled (void) const
-{
- // The next slide command is always enabled, even when the current slide
- // is the last slide: from the last slide it goes to the pause slide,
- // and from there it ends the slide show.
- return true;
-}
-
-
-
-
-Any GotoNextEffectCommand::GetState (void) const
-{
- return Any(sal_False);
-}
-
-
-
-
//===== GotoNextSlide =========================================================
GotoNextSlideCommand::GotoNextSlideCommand (
@@ -705,8 +592,6 @@ GotoNextSlideCommand::GotoNextSlideCommand (
{
}
-
-
void GotoNextSlideCommand::Execute (void)
{
if ( ! mpPresenterController.is())
@@ -718,26 +603,6 @@ void GotoNextSlideCommand::Execute (void)
mpPresenterController->GetSlideShowController()->gotoNextSlide();
}
-
-
-
-bool GotoNextSlideCommand::IsEnabled (void) const
-{
- // The next slide command is always enabled, even when the current slide
- // is the last slide: from the last slide it goes to the pause slide,
- // and from there it ends the slide show.
- return true;
-}
-
-
-
-
-Any GotoNextSlideCommand::GetState (void) const
-{
- return Any(sal_False);
-}
-
-
//===== SwitchMonitorCommand ==============================================
SwitchMonitorCommand::SwitchMonitorCommand (
@@ -751,18 +616,6 @@ void SwitchMonitorCommand::Execute (void)
fprintf (stderr, "Switch monitor !\n");
}
-bool SwitchMonitorCommand::IsEnabled (void) const
-{
- fprintf (stderr, "FIXME - check me !\n");
- return true;
-}
-
-Any SwitchMonitorCommand::GetState (void) const
-{
- return Any(sal_False);
-}
-
-
//===== SetNotesViewCommand ===================================================
SetNotesViewCommand::SetNotesViewCommand (
@@ -773,9 +626,6 @@ SetNotesViewCommand::SetNotesViewCommand (
{
}
-
-
-
void SetNotesViewCommand::Execute (void)
{
if ( ! mpPresenterController.is())
@@ -792,17 +642,6 @@ void SetNotesViewCommand::Execute (void)
pWindowManager->SetViewMode(PresenterWindowManager::VM_Standard);
}
-
-
-
-bool SetNotesViewCommand::IsEnabled (void) const
-{
- return true;
-}
-
-
-
-
Any SetNotesViewCommand::GetState (void) const
{
if ( ! mpPresenterController.is())
@@ -816,18 +655,12 @@ Any SetNotesViewCommand::GetState (void) const
return Any(IsActive(pWindowManager));
}
-
-
-
bool SetNotesViewCommand::IsActive (
const ::rtl::Reference<PresenterWindowManager>& rpWindowManager) const
{
return rpWindowManager->GetViewMode() == PresenterWindowManager::VM_Notes;
}
-
-
-
//===== SetSlideSorterCommand =================================================
SetSlideSorterCommand::SetSlideSorterCommand (
@@ -838,9 +671,6 @@ SetSlideSorterCommand::SetSlideSorterCommand (
{
}
-
-
-
void SetSlideSorterCommand::Execute (void)
{
if ( ! mpPresenterController.is())
@@ -854,17 +684,6 @@ void SetSlideSorterCommand::Execute (void)
pWindowManager->SetSlideSorterState(mbOn);
}
-
-
-
-bool SetSlideSorterCommand::IsEnabled (void) const
-{
- return true;
-}
-
-
-
-
Any SetSlideSorterCommand::GetState (void) const
{
if ( ! mpPresenterController.is())
@@ -878,9 +697,6 @@ Any SetSlideSorterCommand::GetState (void) const
return Any(pWindowManager->GetViewMode()==PresenterWindowManager::VM_SlideOverview);
}
-
-
-
//===== SetHelpViewCommand ===================================================
SetHelpViewCommand::SetHelpViewCommand (
@@ -891,9 +707,6 @@ SetHelpViewCommand::SetHelpViewCommand (
{
}
-
-
-
void SetHelpViewCommand::Execute (void)
{
if ( ! mpPresenterController.is())
@@ -907,17 +720,6 @@ void SetHelpViewCommand::Execute (void)
pWindowManager->SetHelpViewState(mbOn);
}
-
-
-
-bool SetHelpViewCommand::IsEnabled (void) const
-{
- return true;
-}
-
-
-
-
Any SetHelpViewCommand::GetState (void) const
{
if ( ! mpPresenterController.is())
@@ -931,9 +733,6 @@ Any SetHelpViewCommand::GetState (void) const
return Any(pWindowManager->GetViewMode()==PresenterWindowManager::VM_Help);
}
-
-
-
//===== NotesFontSizeCommand ==================================================
NotesFontSizeCommand::NotesFontSizeCommand(
@@ -944,9 +743,6 @@ NotesFontSizeCommand::NotesFontSizeCommand(
{
}
-
-
-
::rtl::Reference<PresenterNotesView> NotesFontSizeCommand::GetNotesView (void) const
{
if (mpPresenterController.get() == NULL)
@@ -961,9 +757,6 @@ NotesFontSizeCommand::NotesFontSizeCommand(
return dynamic_cast<PresenterNotesView*>(pDescriptor->mxView.get());
}
-
-
-
void NotesFontSizeCommand::Execute (void)
{
::rtl::Reference<PresenterNotesView> pView (GetNotesView());
@@ -971,17 +764,6 @@ void NotesFontSizeCommand::Execute (void)
pView->ChangeFontSize(mnSizeChange);
}
-
-
-
-bool NotesFontSizeCommand::IsEnabled (void) const
-{
- return true;
-}
-
-
-
-
Any NotesFontSizeCommand::GetState (void) const
{
return Any();
commit 857b4f5357ba53bdfaf59671b219d74ae8c5945a
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Dec 2 17:47:11 2011 +0000
presenter console: add 'Switch monitors' button to help get setup
For years, we've been carefully detecting the laptop display, and choosing
it as the default display to project to - thus many of our users have
configured around this. Provide a way for them to undo the folly, and any
subsequent mis-detections easily.
Initial Artwork is clearly in need of some bug-fixing.
Cleanup hyper-pre-optimised madness in ProtocolHandler.cxx too, called
a few dozen times - and has nested switch statements on characters.
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 1c19fc4..f5be51f 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -109,6 +109,19 @@ namespace {
rtl::Reference<PresenterController> mpPresenterController;
};
+ class SwitchMonitorCommand : public Command
+ {
+ public:
+ SwitchMonitorCommand (
+ const rtl::Reference<PresenterController>& rpPresenterController);
+ virtual ~SwitchMonitorCommand (void) {}
+ virtual void Execute (void);
+ virtual bool IsEnabled (void) const;
+ virtual Any GetState (void) const;
+ private:
+ rtl::Reference<PresenterController> mpPresenterController;
+ };
+
class SetNotesViewCommand : public Command
{
public:
@@ -426,76 +439,31 @@ Command* PresenterProtocolHandler::Dispatch::CreateCommand (
{
if (rsURLPath.getLength() <= 5)
return NULL;
- switch (rsURLPath[0])
- {
- case sal_Char('C') :
- switch (rsURLPath[5])
- {
- case sal_Char('N'):
- if (rsURLPath == A2S("CloseNotes"))
- return new SetNotesViewCommand(false, rpPresenterController);
- break;
- case sal_Char('S'):
- if (rsURLPath == A2S("CloseSlideSorter"))
- return new SetSlideSorterCommand(false, rpPresenterController);
- break;
- case sal_Char('H'):
- if (rsURLPath == A2S("CloseHelp"))
- return new SetHelpViewCommand(false, rpPresenterController);
- break;
- }
- break;
- case sal_Char('G') :
- if (rsURLPath == A2S("GrowNotesFont"))
- return new NotesFontSizeCommand(rpPresenterController, +1);
- break;
-
- case sal_Char('N') :
- switch (rsURLPath[4])
- {
- case sal_Char('E'):
- if (rsURLPath == A2S("NextEffect"))
- return new GotoNextEffectCommand(rpPresenterController);
- case sal_Char('S'):
- if (rsURLPath == A2S("NextSlide"))
- return new GotoNextSlideCommand(rpPresenterController);
- break;
- }
- break;
- case sal_Char('P') :
- if (rsURLPath == A2S("PrevSlide"))
- return new GotoPreviousSlideCommand(rpPresenterController);
- break;
-
- case sal_Char('S') :
- switch (rsURLPath[4])
- {
- case sal_Char('N'):
- if (rsURLPath == A2S("ShowNotes"))
- return new SetNotesViewCommand(true, rpPresenterController);
- break;
-
- case sal_Char('S'):
- if (rsURLPath == A2S("ShowSlideSorter"))
- return new SetSlideSorterCommand(true, rpPresenterController);
- break;
-
- case sal_Char('H'):
- if (rsURLPath == A2S("ShowHelp"))
- return new SetHelpViewCommand(true, rpPresenterController);
- break;
-
- case sal_Char('n'):
- if (rsURLPath == A2S("ShrinkNotesFont"))
- return new NotesFontSizeCommand(rpPresenterController, -1);
- break;
- }
- break;
-
- default:
- break;
- }
+ if (rsURLPath == A2S("CloseNotes"))
+ return new SetNotesViewCommand(false, rpPresenterController);
+ if (rsURLPath == A2S("CloseSlideSorter"))
+ return new SetSlideSorterCommand(false, rpPresenterController);
+ if (rsURLPath == A2S("CloseHelp"))
+ return new SetHelpViewCommand(false, rpPresenterController);
+ if (rsURLPath == A2S("GrowNotesFont"))
+ return new NotesFontSizeCommand(rpPresenterController, +1);
+ if (rsURLPath == A2S("NextEffect"))
+ return new GotoNextEffectCommand(rpPresenterController);
+ if (rsURLPath == A2S("NextSlide"))
+ return new GotoNextSlideCommand(rpPresenterController);
+ if (rsURLPath == A2S("PrevSlide"))
+ return new GotoPreviousSlideCommand(rpPresenterController);
+ if (rsURLPath == A2S("SwitchMonitor"))
+ return new SwitchMonitorCommand(rpPresenterController);
+ if (rsURLPath == A2S("ShowNotes"))
+ return new SetNotesViewCommand(true, rpPresenterController);
+ if (rsURLPath == A2S("ShowSlideSorter"))
+ return new SetSlideSorterCommand(true, rpPresenterController);
+ if (rsURLPath == A2S("ShowHelp"))
+ return new SetHelpViewCommand(true, rpPresenterController);
+ if (rsURLPath == A2S("ShrinkNotesFont"))
+ return new NotesFontSizeCommand(rpPresenterController, -1);
return NULL;
}
@@ -686,7 +654,6 @@ Any GotoPreviousSlideCommand::GetState (void) const
-
//===== GotoNextEffect ========================================================
GotoNextEffectCommand::GotoNextEffectCommand (
@@ -771,6 +738,29 @@ Any GotoNextSlideCommand::GetState (void) const
}
+//===== SwitchMonitorCommand ==============================================
+
+SwitchMonitorCommand::SwitchMonitorCommand (
+ const rtl::Reference<PresenterController>& rpPresenterController)
+ : mpPresenterController(rpPresenterController)
+{
+}
+
+void SwitchMonitorCommand::Execute (void)
+{
+ fprintf (stderr, "Switch monitor !\n");
+}
+
+bool SwitchMonitorCommand::IsEnabled (void) const
+{
+ fprintf (stderr, "FIXME - check me !\n");
+ return true;
+}
+
+Any SwitchMonitorCommand::GetState (void) const
+{
+ return Any(sal_False);
+}
//===== SetNotesViewCommand ===================================================
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png
new file mode 100644
index 0000000..653dffe
Binary files /dev/null and b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png differ
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png
new file mode 100644
index 0000000..f567516
Binary files /dev/null and b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png differ
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png
new file mode 100644
index 0000000..3ca0f6f
Binary files /dev/null and b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png differ
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index e1d15a5..a0d8d0f 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -190,6 +190,8 @@ COMPONENT_BITMAPS= \
$(ZIP1DIR)$/bitmaps$/ButtonNotesMouseOver.png \
$(ZIP1DIR)$/bitmaps$/ButtonNotesSelected.png \
$(ZIP1DIR)$/bitmaps$/ButtonNotesDisabled.png \
+ $(ZIP1DIR)$/bitmaps$/ButtonSwitchMonitorNormal.png \
+ $(ZIP1DIR)$/bitmaps$/ButtonSwitchMonitorMouseOver.png \
$(ZIP1DIR)$/bitmaps$/ButtonSlideSorterNormal.png \
$(ZIP1DIR)$/bitmaps$/ButtonSlideSorterMouseOver.png \
$(ZIP1DIR)$/bitmaps$/ButtonSlideSorterSelected.png \
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
index 2231639..069cc3b 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
@@ -222,6 +222,44 @@
</node>
</node>
<node oor:name="l" oor:op="replace">
+ <prop oor:name="Name"><value>SwitchMonitor</value></prop>
+ <prop oor:name="Type"><value>Button</value></prop>
+ <node oor:name="Normal">
+ <prop oor:name="Text"><value xml:lang="en-US">Exchange</value></prop>
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorNormal.png</value></prop>
+ </node>
+ <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:SwitchMonitor</value></prop>
+ <node oor:name="Font">
+ <prop oor:name="Size"><value>12</value></prop>
+ <prop oor:name="Style"><value>Bold</value></prop>
+ <prop oor:name="Color"><value>B3B7BC</value></prop>
+ <prop oor:name="Anchor"><value>Center</value></prop>
+ </node>
+ </node>
+ <node oor:name="MouseOver">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorMouseOver.png</value></prop>
+ </node>
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>FFFFFF</value></prop>
+ </node>
+ </node>
+ <node oor:name="Disabled">
+ <node oor:name="Icon">
+ <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorDisabled.png</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="m" oor:op="replace">
+ <prop oor:name="Type"><value>VerticalSeparator</value></prop>
+ <node oor:name="Normal">
+ <node oor:name="Font">
+ <prop oor:name="Color"><value>76797C</value></prop>
+ </node>
+ </node>
+ </node>
+ <node oor:name="n" oor:op="replace">
<prop oor:name="Name"><value>Help</value></prop>
<prop oor:name="Type"><value>Button</value></prop>
<node oor:name="Normal">
commit b35b7080980c0ba43f411db469feb30f8a5c6881
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Dec 2 17:15:48 2011 +0000
pywizards: resurrect Xisco's code lost in rebasing
Xisco merged this to master and then deleted it on master, which cause
these files to get lost during the re-base across that.
diff --git a/wizards/com/sun/star/wizards/RemoteWebWizard b/wizards/com/sun/star/wizards/RemoteWebWizard
new file mode 100755
index 0000000..1f6d747
--- /dev/null
+++ b/wizards/com/sun/star/wizards/RemoteWebWizard
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+from web.WWD_Events import WWD_Events
+import sys
+
+if __name__ == "__main__":
+
+ WWD_Events.main(sys.argv)
diff --git a/wizards/com/sun/star/wizards/__init__.py b/wizards/com/sun/star/wizards/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/wizards/com/sun/star/wizards/agenda/TemplateConsts.py b/wizards/com/sun/star/wizards/agenda/TemplateConsts.py
new file mode 100644
index 0000000..3095f31
--- /dev/null
+++ b/wizards/com/sun/star/wizards/agenda/TemplateConsts.py
@@ -0,0 +1,72 @@
+FILLIN_TITLE = "<title>"
+FILLIN_DATE = "<date>"
+FILLIN_TIME = "<time>"
+FILLIN_LOCATION = "<location>"
+'''
+section name <b>prefix</b> for sections that contain items.
+this is also used as table name prefix, since each items section
+must contain a table whos name is identical name to the section's name.
+'''
+SECTION_ITEMS = "AGENDA_ITEMS"
+'''
+the name of the section which contains the topics.
+'''
+SECTION_TOPICS = "AGENDA_TOPICS"
+'''
+the name of the parent minutes section.
+'''
+SECTION_MINUTES_ALL = "MINUTES_ALL"
+'''
+the name of the child nimutes section.
+This section will be duplicated for each topic.
+'''
+SECTION_MINUTES = "MINUTES"
+'''
+taged headings and names.
+These will be searched in item tables (in the template) and will be
+replaced with resource strings.
+
+headings...
+'''
+FILLIN_MEETING_TYPE = "<meeting-type>"
+FILLIN_BRING = "<bring>"
+FILLIN_READ = "<read>"
+FILLIN_NOTES = "<notes>"
+'''
+names...
+'''
+FILLIN_CALLED_BY = "<called-by>"
+FILLIN_FACILITATOR = "<facilitator>"
+FILLIN_PARTICIPANTS = "<attendees>"
+FILLIN_NOTETAKER = "<notetaker>"
+FILLIN_TIMEKEEPER = "<timekeeper>"
+FILLIN_OBSERVERS = "<observers>"
+FILLIN_RESOURCE_PERSONS = "<resource-persons>"
+
+'''
+Fillins for the topic table.
+These strings will be searched inside the topic table as
+part of detecting its structure.
+'''
+FILLIN_TOPIC_NUMBER = "<num>"
+FILLIN_TOPIC_TOPIC = "<topic>"
+FILLIN_TOPIC_RESPONSIBLE = "<responsible>"
+FILLIN_TOPIC_TIME = "<topic-time>"
+'''
+fillins for minutes.
+These will be searched in the minutes section and will be replaced
+with the appropriate data.
+'''
+FILLIN_MINUTES_TITLE = "<minutes-title>"
+FILLIN_MINUTES_LOCATION = "<minutes-location>"
+FILLIN_MINUTES_DATE = "<minutes-date>"
+FILLIN_MINUTES_TIME = "<minutes-time>"
+'''
+Minutes-topic fillins
+These will be searched in the minutes-child-section, and
+will be replaced with topic data.
+'''
+FILLIN_MINUTE_NUM = "<mnum>"
+FILLIN_MINUTE_TOPIC = "<mtopic>"
+FILLIN_MINUTE_RESPONSIBLE = "<mresponsible>"
+FILLIN_MINUTE_TIME = "<mtime>"
diff --git a/wizards/com/sun/star/wizards/agenda/__init__.py b/wizards/com/sun/star/wizards/agenda/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.py b/wizards/com/sun/star/wizards/common/ConfigNode.py
new file mode 100644
index 0000000..892e6e3
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/ConfigNode.py
@@ -0,0 +1,13 @@
+from abc import ABCMeta, abstractmethod
+
+class ConfigNode(object):
+
+ root = None
+
+ @abstractmethod
+ def readConfiguration(self, configurationView, param):
+ pass
+
+ @abstractmethod
+ def writeConfiguration(self, configurationView, param):
+ pass
diff --git a/wizards/com/sun/star/wizards/common/DebugHelper.py b/wizards/com/sun/star/wizards/common/DebugHelper.py
new file mode 100644
index 0000000..7501603
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/DebugHelper.py
@@ -0,0 +1,10 @@
+class DebugHelper(object):
+
+ @classmethod
+ def exception(self, ex):
+ raise NotImplementedError
+
+ @classmethod
+ def writeInfo(self, msg):
+ raise NotImplementedError
+
diff --git a/wizards/com/sun/star/wizards/common/HelpIds.py b/wizards/com/sun/star/wizards/common/HelpIds.py
new file mode 100644
index 0000000..c6bd1b7
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/HelpIds.py
@@ -0,0 +1,1012 @@
+class HelpIds:
+ array1 = [
+ "HID:WIZARDS_HID0_WEBWIZARD", # HID:34200
+ "HID:WIZARDS_HID0_HELP", # HID:34201
+ "HID:WIZARDS_HID0_NEXT", # HID:34202
+ "HID:WIZARDS_HID0_PREV", # HID:34203
+ "HID:WIZARDS_HID0_CREATE", # HID:34204
+ "HID:WIZARDS_HID0_CANCEL", # HID:34205
+ "HID:WIZARDS_HID0_STATUS_DIALOG", # HID:34206
+ "HID:WIZARDS_HID1_LST_SESSIONS", # HID:34207
+ "",
+ "HID:WIZARDS_HID1_BTN_DEL_SES", # HID:34209
+ "HID:WIZARDS_HID2_LST_DOCS", # HID:34210
+ "HID:WIZARDS_HID2_BTN_ADD_DOC", # HID:34211
+ "HID:WIZARDS_HID2_BTN_REM_DOC", # HID:34212
+ "HID:WIZARDS_HID2_BTN_DOC_UP", # HID:34213
+ "HID:WIZARDS_HID2_BTN_DOC_DOWN", # HID:34214
+ "HID:WIZARDS_HID2_TXT_DOC_TITLE", # HID:34215
+ "HID:WIZARDS_HID2_TXT_DOC_DESC", # HID:34216
+ "HID:WIZARDS_HID2_TXT_DOC_AUTHOR", # HID:34217
+ "HID:WIZARDS_HID2_LST_DOC_EXPORT", # HID:34218
+ "HID:WIZARDS_HID2_STATUS_ADD_DOCS", # HID:34219
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG1", # HID:34220
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG2", # HID:34221
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG3", # HID:34222
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG4", # HID:34223
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG5", # HID:34224
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG6", # HID:34225
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG7", # HID:34226
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG8", # HID:34227
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG9", # HID:34228
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG10", # HID:34229
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG11", # HID:34230
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG12", # HID:34231
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG13", # HID:34232
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG14", # HID:34233
+ "HID:WIZARDS_HID3_IL_LAYOUTS_IMG15", # HID:34234
+ "HID:WIZARDS_HID4_CHK_DISPLAY_FILENAME", # HID:34235
+ "HID:WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION", # HID:34236
+ "HID:WIZARDS_HID4_CHK_DISPLAY_AUTHOR", # HID:34237
+ "HID:WIZARDS_HID4_CHK_DISPLAY_CR_DATE", # HID:34238
+ "HID:WIZARDS_HID4_CHK_DISPLAY_UP_DATE", # HID:34239
+ "HID:WIZARDS_HID4_CHK_DISPLAY_FORMAT", # HID:34240
+ "HID:WIZARDS_HID4_CHK_DISPLAY_F_ICON", # HID:34241
+ "HID:WIZARDS_HID4_CHK_DISPLAY_PAGES", # HID:34242
+ "HID:WIZARDS_HID4_CHK_DISPLAY_SIZE", # HID:34243
+ "HID:WIZARDS_HID4_GRP_OPTIMAIZE_640", # HID:34244
+ "HID:WIZARDS_HID4_GRP_OPTIMAIZE_800", # HID:34245
+ "HID:WIZARDS_HID4_GRP_OPTIMAIZE_1024", # HID:34246
+ "HID:WIZARDS_HID5_LST_STYLES", # HID:34247
+ "HID:WIZARDS_HID5_BTN_BACKGND", # HID:34248
+ "HID:WIZARDS_HID5_BTN_ICONS", # HID:34249
+ "HID:WIZARDS_HID6_TXT_SITE_TITLE", # HID:34250
+ "",
+ "",
+ "HID:WIZARDS_HID6_TXT_SITE_DESC", # HID:34253
+ "",
+ "HID:WIZARDS_HID6_DATE_SITE_CREATED", # HID:34255
+ "HID:WIZARDS_HID6_DATE_SITE_UPDATED", # HID:34256
+ "",
+ "HID:WIZARDS_HID6_TXT_SITE_EMAIL", # HID:34258
+ "HID:WIZARDS_HID6_TXT_SITE_COPYRIGHT", # HID:34259
+ "HID:WIZARDS_HID7_BTN_PREVIEW", # HID:34260
+ "HID:WIZARDS_HID7_CHK_PUBLISH_LOCAL", # HID:34261
+ "HID:WIZARDS_HID7_TXT_LOCAL", # HID:34262
+ "HID:WIZARDS_HID7_BTN_LOCAL", # HID:34263
+ "HID:WIZARDS_HID7_CHK_PUBLISH_ZIP", # HID:34264
+ "HID:WIZARDS_HID7_TXT_ZIP", # HID:34265
+ "HID:WIZARDS_HID7_BTN_ZIP", # HID:34266
+ "HID:WIZARDS_HID7_CHK_PUBLISH_FTP", # HID:34267
+ "HID:WIZARDS_HID7_TXT_FTP", # HID:34268
+ "HID:WIZARDS_HID7_BTN_FTP", # HID:34269
+ "HID:WIZARDS_HID7_CHK_SAVE", # HID:34270
+ "HID:WIZARDS_HID7_TXT_SAVE", # HID:34271
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_BG", # HID:34290
+ "HID:WIZARDS_HID_BG_BTN_OTHER", # HID:34291
+ "HID:WIZARDS_HID_BG_BTN_NONE", # HID:34292
+ "HID:WIZARDS_HID_BG_BTN_OK", # HID:34293
+ "HID:WIZARDS_HID_BG_BTN_CANCEL", # HID:34294
+ "HID:WIZARDS_HID_BG_BTN_BACK", # HID:34295
+ "HID:WIZARDS_HID_BG_BTN_FW", # HID:34296
+ "HID:WIZARDS_HID_BG_BTN_IMG1", # HID:34297
+ "HID:WIZARDS_HID_BG_BTN_IMG2", # HID:34298
+ "HID:WIZARDS_HID_BG_BTN_IMG3", # HID:34299
+ "HID:WIZARDS_HID_BG_BTN_IMG4", # HID:34300
+ "HID:WIZARDS_HID_BG_BTN_IMG5", # HID:34301
+ "HID:WIZARDS_HID_BG_BTN_IMG6", # HID:34302
+ "HID:WIZARDS_HID_BG_BTN_IMG7", # HID:34303
+ "HID:WIZARDS_HID_BG_BTN_IMG8", # HID:34304
+ "HID:WIZARDS_HID_BG_BTN_IMG9", # HID:34305
+ "HID:WIZARDS_HID_BG_BTN_IMG10", # HID:34306
+ "HID:WIZARDS_HID_BG_BTN_IMG11", # HID:34307
+ "HID:WIZARDS_HID_BG_BTN_IMG12", # HID:34308
+ "HID:WIZARDS_HID_BG_BTN_IMG13", # HID:34309
+ "HID:WIZARDS_HID_BG_BTN_IMG14", # HID:34300
+ "HID:WIZARDS_HID_BG_BTN_IMG15", # HID:34311
+ "HID:WIZARDS_HID_BG_BTN_IMG16", # HID:34312
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_DIALOG", # HID:34320
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDPREV", # HID:34322
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDNEXT", # HID:34323
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDFINISH", # HID:34324
+ "HID:WIZARDS_HID_DLGREPORT_0_CMDCANCEL", # HID:34325
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_1_LBTABLES", # HID:34330
+ "HID:WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE", # HID:34331
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED", # HID:34332
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEALL", # HID:34333
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED", # HID:34334
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL", # HID:34335
+ "HID:WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED", # HID:34336
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEUP", # HID:34337
+ "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEDOWN", # HID:34338
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_2_GROUPING", # HID:34340
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDGROUP", # HID:34341
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP", # HID:34342
+ "HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST", # HID:34343
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP", # HID:34344
+ "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP", # HID:34345
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT1", # HID:34346
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1", # HID:34347
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1", # HID:34348
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT2", # HID:34349
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2", # HID:34350
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2", # HID:34351
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT3", # HID:34352
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3", # HID:34353
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3", # HID:34354
+ "HID:WIZARDS_HID_DLGREPORT_3_SORT4", # HID:34355
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4", # HID:34356
+ "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4", # HID:34357
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_4_TITLE", # HID:34362
+ "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", # HID:34363
+ "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", # HID:34364
+ "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", # HID:34365
+ "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", # HID:34366
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", # HID:34370
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", # HID:34371
+ "HID:WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH", # HID:34372
+ "HID:WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH", # HID:34373
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", # HID:34374
+ "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", # HID:34375
+ "HID:WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH", # HID:34376
+ "HID:WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH", # HID:34377
+ "HID:WIZARDS_HID_DLGREPORT_5_CHKLINKTODB", # HID:34378
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_1", # HID:34381
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_2", # HID:34382
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_3", # HID:34383
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_4", # HID:34384
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_5", # HID:34385
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_6", # HID:34386
+ "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_7", # HID:34387
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_DIALOG", # HID:34400
+ "",
+ "HID:WIZARDS_HID_DLGFORM_CMDPREV", # HID:34402
+ "HID:WIZARDS_HID_DLGFORM_CMDNEXT", # HID:34403
+ "HID:WIZARDS_HID_DLGFORM_CMDFINISH", # HID:34404
+ "HID:WIZARDS_HID_DLGFORM_CMDCANCEL", # HID:34405
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_MASTER_LBTABLES", # HID:34411
+ "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE", # HID:34412
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED", # HID:34413
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL", # HID:34414
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED", # HID:34415
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL", # HID:34416
+ "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED", # HID:34417
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP", # HID:34418
+ "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN", # HID:34419
+ "",
+ "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", # HID:34421
+ "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", # HID:34422
+ "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", # HID:34423
+ "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", # HID:34424
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_SUB_LBTABLES", # HID:34431
+ "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE", # HID:34432
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED", # HID:34433
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL", # HID:34434
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED", # HID:34435
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL", # HID:34436
+ "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSSELECTED", # HID:34437
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP", # HID:34438
+ "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN", # HID:34439
+ "",
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1", # HID:34441
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1", # HID:34442
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2", # HID:34443
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2", # HID:34444
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3", # HID:34445
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3", # HID:34446
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4", # HID:34447
+ "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4", # HID:34448
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", # HID:34451
+ "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", # HID:34452
+ "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED", # HID:34453
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED", # HID:34454
+ "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE", # HID:34455
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED", # HID:34456
+ "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED2", # HID:34457
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED2", # HID:34458
+ "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE2", # HID:34459
+ "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED2", # HID:34460
+ "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", # HID:34461
+ "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", # HID:34462
+ "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", # HID:34463
+ "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", # HID:34464
+ "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", # HID:34465
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", # HID:34471
+ "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", # HID:34472
+ "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", # HID:34473
+ "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", # HID:34474
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGFORM_TXTPATH", # HID:34481
+ "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", # HID:34482
+ "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", # HID:34483
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGNEWSLTR_DIALOG", # HID:34500
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT", # HID:34501
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT", # HID:34502
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT", # HID:34503
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED", # HID:34504
+ "HID:WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED", # HID:34505
+ "HID:WIZARDS_HID_DLGNEWSLTR_CMDGOON", # HID:34506
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY", # HID:34520
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY", # HID:34521
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY", # HID:34522
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTRATE", # HID:34523
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTDATE", # HID:34524
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION", # HID:34525
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTFIX", # HID:34526
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM", # HID:34527
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY", # HID:34528
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY", # HID:34529
+ "HID:WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS", # HID:34530
+ "HID:WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS", # HID:34531
+ "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT", # HID:34532
+ "HID:WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES", # HID:34533
+ "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT", # HID:34534
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT", # HID:34535
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT", # HID:34536
+ "HID:WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE", # HID:34537
+ "HID:WIZARDS_HID_DLGDEPOT_1_OPTTOTAL", # HID:34538
+ "HID:WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND", # HID:34539
+ "HID:WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE", # HID:34540
+ "HID:WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE", # HID:34541
+ "HID:WIZARDS_HID_DLGDEPOT_2_TXTDATE", # HID:34542
+ "HID:WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE", # HID:34543
+ "HID:WIZARDS_HID_DLGDEPOT_3_TXTENDDATE", # HID:34544
+ "HID:WIZARDS_HID_DLGDEPOT_3_OPTDAILY", # HID:34545
+ "HID:WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY", # HID:34546
+ "HID:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY", # HID:34547
+ "HID:WIZARDS_HID_DLGDEPOT_LSTMARKETS", # HID:34548
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY", # HID:34549
+ "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY", # HID:34550
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGIMPORT_DIALOG", # HID:34570
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDHELP", # HID:34571
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL", # HID:34572
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDPREV", # HID:34573
+ "HID:WIZARDS_HID_DLGIMPORT_0_CMDNEXT", # HID:34574
+ "HID:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS", # HID:34575
+ "HID:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS", # HID:34576
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE", # HID:34577
+ "HID:WIZARDS_HID_DLGIMPORT_2_CHKWORD", # HID:34578
+ "HID:WIZARDS_HID_DLGIMPORT_2_CHKEXCEL", # HID:34579
+ "HID:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT", # HID:34580
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE", # HID:34581
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE", # HID:34582
+ "HID:WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH", # HID:34583
+ "HID:WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH", # HID:34584
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT", # HID:34585
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT", # HID:34586
+ "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE", # HID:34587
+ "HID:WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH", # HID:34588
+ "HID:WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH", # HID:34589
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT", # HID:34590
+ "HID:WIZARDS_HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH", # HID:34591
+ "HID:WIZARDS_HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH", # HID:34592
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDEXPORTPATHSELECT", # HID:34593
+ "",
+ "HID:WIZARDS_HID_DLGIMPORT_3_TBSUMMARY", # HID:34595
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKWRITER", # HID:34596
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKCALC", # HID:34597
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS", # HID:34598
+ "HID:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL", # HID:34599
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2", # HID:34600
+ "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2", # HID:34601
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_DIALOG", # HID:34630
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL", # HID:34631
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1", # HID:34632
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2", # HID:34633
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY", # HID:34634
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1", # HID:34635
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2", # HID:34636
+ "HID:WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY", # HID:34637
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGSTYLES_DIALOG", # HID:34650
+ "HID:WIZARDS_HID_DLGSTYLES_LISTBOX", # HID:34651
+ "HID:WIZARDS_HID_DLGSTYLES_CANCEL", # HID:34652
+ "HID:WIZARDS_HID_DLGSTYLES_OKAY", # HID:34653
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGCONVERT_DIALOG", # HID:34660
+ "HID:WIZARDS_HID_DLGCONVERT_CHECKBOX1", # HID:34661
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1", # HID:34662
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2", # HID:34663
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3", # HID:34664
+ "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4", # HID:34665
+ "HID:WIZARDS_HID_DLGCONVERT_LISTBOX1", # HID:34666
+ "HID:WIZARDS_HID_DLGCONVERT_OBFILE", # HID:34667
+ "HID:WIZARDS_HID_DLGCONVERT_OBDIR", # HID:34668
+ "HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1", # HID:34669
+ "HID:WIZARDS_HID_DLGCONVERT_TBSOURCE", # HID:34670
+ "HID:WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE", # HID:34671
+ "HID:WIZARDS_HID_DLGCONVERT_TBTARGET", # HID:34672
+ "HID:WIZARDS_HID_DLGCONVERT_CBCANCEL", # HID:34673
+ "HID:WIZARDS_HID_DLGCONVERT_CBHELP", # HID:34674
+ "HID:WIZARDS_HID_DLGCONVERT_CBBACK", # HID:34675
+ "HID:WIZARDS_HID_DLGCONVERT_CBGOON", # HID:34676
+ "HID:WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN", # HID:34677
+ "HID:WIZARDS_HID_DLGCONVERT_CBTARGETOPEN", # HID:34678
+ "HID:WIZARDS_HID_DLGCONVERT_CHKPROTECT", # HID:34679
+ "HID:WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS", # HID:34680
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGPASSWORD_CMDGOON", # HID:34690
+ "HID:WIZARDS_HID_DLGPASSWORD_CMDCANCEL", # HID:34691
+ "HID:WIZARDS_HID_DLGPASSWORD_CMDHELP", # HID:34692
+ "HID:WIZARDS_HID_DLGPASSWORD_TXTPASSWORD", # HID:34693
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG", # HID:34700
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW", # HID:34701
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR", # HID:34702
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH", # HID:34703
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR", # HID:34704
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH", # HID:34705
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINYEAR", # HID:34706
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINMONTH", # HID:34707
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE", # HID:34708
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA", # HID:34709
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT", # HID:34710
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE", # HID:34711
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT", # HID:34712
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT", # HID:34713
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY", # HID:34714
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTDAY", # HID:34715
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH", # HID:34716
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH", # HID:34717
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR", # HID:34718
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR", # HID:34719
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA", # HID:34720
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL", # HID:34721
+ "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" # HID:34722
+ ]
+ array2 = ["HID:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER", # HID:40769
+ "HID:WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER", # HID:40770
+ "HID:WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER", # HID:40771
+ "HID:WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE", # HID:40772
+ "HID:WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER", # HID:40773
+ "HID:WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE", # HID:40774
+ "HID:WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE", # HID:40775
+ "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO", # HID:40776
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT", # HID:40777
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOX", # HID:40778
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH", # HID:40779
+ "HID:WIZARDS_HID_LTRWIZ_NUMLOGOY", # HID:40780
+ "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS", # HID:40781
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT", # HID:40782
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSX", # HID:40783
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH", # HID:40784
+ "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSY", # HID:40785
+ "HID:WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER", # HID:40786
+ "HID:WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER", # HID:40787
+ "HID:WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT", # HID:40788
+ "HID:WIZARDS_HID_LTRWIZ_LSTLETTERNORM", # HID:40789
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSELOGO", # HID:40790
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER", # HID:40791
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSESIGNS", # HID:40792
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSESUBJECT", # HID:40793
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSESALUTATION", # HID:40794
+ "HID:WIZARDS_HID_LTRWIZ_LSTSALUTATION", # HID:40795
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS", # HID:40796
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEGREETING", # HID:40797
+ "HID:WIZARDS_HID_LTRWIZ_LSTGREETING", # HID:40798
+ "HID:WIZARDS_HID_LTRWIZ_CHKUSEFOOTER", # HID:40799
+ "HID:WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER", # HID:40800
+ "HID:WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE", # HID:40801
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERNAME", # HID:40802
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTREET", # HID:40803
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE", # HID:40804
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT", # HID:40805
+ "HID:WIZARDS_HID_LTRWIZ_TXTSENDERCITY", # HID:40806
+ "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER", # HID:40807
+ "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE", # HID:40808
+ "HID:WIZARDS_HID_LTRWIZ_TXTFOOTER", # HID:40809
+ "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES", # HID:40810
+ "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS", # HID:40811
+ "HID:WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME", # HID:40812
+ "HID:WIZARDS_HID_LTRWIZ_OPTCREATELETTER", # HID:40813
+ "HID:WIZARDS_HID_LTRWIZ_OPTMAKECHANGES", # HID:40814
+ "HID:WIZARDS_HID_LTRWIZ_TXTPATH", # HID:40815
+ "HID:WIZARDS_HID_LTRWIZ_CMDPATH", # HID:40816
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_LTRWIZARD", # HID:40820
+ "HID:WIZARDS_HID_LTRWIZARD_HELP", # HID:40821
+ "HID:WIZARDS_HID_LTRWIZARD_BACK", # HID:40822
+ "HID:WIZARDS_HID_LTRWIZARD_NEXT", # HID:40823
+ "HID:WIZARDS_HID_LTRWIZARD_CREATE", # HID:40824
+ "HID:WIZARDS_HID_LTRWIZARD_CANCEL", # HID:40825
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTTABLES", # HID:40850
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDS", # HID:40851
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED", # HID:40852
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEALL", # HID:40853
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED", # HID:40854
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL", # HID:40855
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS", # HID:40856
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEUP", # HID:40857
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN", # HID:40858
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT1", # HID:40865
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND1", # HID:40866
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND1", # HID:40867
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT2", # HID:40868
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND2", # HID:40869
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND2", # HID:40870
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT3", # HID:40871
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND3", # HID:40872
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND3", # HID:40873
+ "HID:WIZARDS_HID_QUERYWIZARD_SORT4", # HID:40874
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND4", # HID:40875
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND4", # HID:40876
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHALL", # HID:40878
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHANY", # HID:40879
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1", # HID:40880
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1", # HID:40881
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_1", # HID:40882
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2", # HID:40883
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2", # HID:40884
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_2", # HID:40885
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3", # HID:40886
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3", # HID:40887
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_3", # HID:40888
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY", # HID:40895
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY", # HID:40896
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1", # HID:40897
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1", # HID:40898
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2", # HID:40899
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2", # HID:40900
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3", # HID:40901
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3", # HID:40902
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4", # HID:40903
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4", # HID:40904
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5", # HID:40905
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5", # HID:40906
+ "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS", # HID:40907
+ "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS", # HID:40908
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS", # HID:40915
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED", # HID:40916
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED", # HID:40917
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS", # HID:40918
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP", # HID:40919
+ "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN", # HID:40920
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL", # HID:40923
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY", # HID:40924
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1", # HID:40925
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1", # HID:40926
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1", # HID:40927
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2", # HID:40928
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2", # HID:40929
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2", # HID:40930
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3", # HID:40931
+ "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3", # HID:40932
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3", # HID:40933
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_1", # HID:40940
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_2", # HID:40941
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_3", # HID:40942
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_4", # HID:40943
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_5", # HID:40944
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_6", # HID:40945
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_7", # HID:40946
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE", # HID:40955
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY", # HID:40956
+ "HID:WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY", # HID:40957
+ "HID:WIZARDS_HID_QUERYWIZARD_TXTSUMMARY", # HID:40958
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD", # HID:40970
+ "",
+ "HID:WIZARDS_HID_QUERYWIZARD_BACK", # HID:40972
+ "HID:WIZARDS_HID_QUERYWIZARD_NEXT", # HID:40973
+ "HID:WIZARDS_HID_QUERYWIZARD_CREATE", # HID:40974
+ "HID:WIZARDS_HID_QUERYWIZARD_CANCEL", # HID:40975
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_IS", # HID:41000
+ "", "HID:WIZARDS_HID_IS_BTN_NONE", # HID:41002
+ "HID:WIZARDS_HID_IS_BTN_OK", # HID:41003
+ "HID:WIZARDS_HID_IS_BTN_CANCEL", # HID:41004
+ "HID:WIZARDS_HID_IS_BTN_IMG1", # HID:41005
+ "HID:WIZARDS_HID_IS_BTN_IMG2", # HID:41006
+ "HID:WIZARDS_HID_IS_BTN_IMG3", # HID:41007
+ "HID:WIZARDS_HID_IS_BTN_IMG4", # HID:41008
+ "HID:WIZARDS_HID_IS_BTN_IMG5", # HID:41009
+ "HID:WIZARDS_HID_IS_BTN_IMG6", # HID:41010
+ "HID:WIZARDS_HID_IS_BTN_IMG7", # HID:41011
+ "HID:WIZARDS_HID_IS_BTN_IMG8", # HID:41012
+ "HID:WIZARDS_HID_IS_BTN_IMG9", # HID:41013
+ "HID:WIZARDS_HID_IS_BTN_IMG10", # HID:41014
+ "HID:WIZARDS_HID_IS_BTN_IMG11", # HID:41015
+ "HID:WIZARDS_HID_IS_BTN_IMG12", # HID:41016
+ "HID:WIZARDS_HID_IS_BTN_IMG13", # HID:41017
+ "HID:WIZARDS_HID_IS_BTN_IMG14", # HID:41018
+ "HID:WIZARDS_HID_IS_BTN_IMG15", # HID:41019
+ "HID:WIZARDS_HID_IS_BTN_IMG16", # HID:41020
+ "HID:WIZARDS_HID_IS_BTN_IMG17", # HID:41021
+ "HID:WIZARDS_HID_IS_BTN_IMG18", # HID:41022
+ "HID:WIZARDS_HID_IS_BTN_IMG19", # HID:41023
+ "HID:WIZARDS_HID_IS_BTN_IMG20", # HID:41024
+ "HID:WIZARDS_HID_IS_BTN_IMG21", # HID:41025
+ "HID:WIZARDS_HID_IS_BTN_IMG22", # HID:41026
+ "HID:WIZARDS_HID_IS_BTN_IMG23", # HID:41027
+ "HID:WIZARDS_HID_IS_BTN_IMG24", # HID:41028
+ "HID:WIZARDS_HID_IS_BTN_IMG25", # HID:41029
+ "HID:WIZARDS_HID_IS_BTN_IMG26", # HID:41030
+ "HID:WIZARDS_HID_IS_BTN_IMG27", # HID:41031
+ "HID:WIZARDS_HID_IS_BTN_IMG28", # HID:41032
+ "HID:WIZARDS_HID_IS_BTN_IMG29", # HID:41033
+ "HID:WIZARDS_HID_IS_BTN_IMG30", # HID:41034
+ "HID:WIZARDS_HID_IS_BTN_IMG31", # HID:41035
+ "HID:WIZARDS_HID_IS_BTN_IMG32", # HID:41036
+ "",
+ "",
+ "",
+ "HID:WIZARDS_HID_FTP", # HID:41040
+ "HID:WIZARDS_HID_FTP_SERVER", # HID:41041
+ "HID:WIZARDS_HID_FTP_USERNAME", # HID:41042
+ "HID:WIZARDS_HID_FTP_PASS", # HID:41043
+ "HID:WIZARDS_HID_FTP_TEST", # HID:41044
+ "HID:WIZARDS_HID_FTP_TXT_PATH", # HID:41045
+ "HID:WIZARDS_HID_FTP_BTN_PATH", # HID:41046
+ "HID:WIZARDS_HID_FTP_OK", # HID:41047
+ "HID:WIZARDS_HID_FTP_CANCEL", # HID:41048
+ "",
+ "",
+ "HID:WIZARDS_HID_AGWIZ", # HID:41051
+ "HID:WIZARDS_HID_AGWIZ_HELP", # HID:41052
+ "HID:WIZARDS_HID_AGWIZ_NEXT", # HID:41053
+ "HID:WIZARDS_HID_AGWIZ_PREV", # HID:41054
+ "HID:WIZARDS_HID_AGWIZ_CREATE", # HID:41055
+ "HID:WIZARDS_HID_AGWIZ_CANCEL", # HID:41056
+ "HID:WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN", # HID:41057
+ "HID:WIZARDS_HID_AGWIZ_1_CHK_MINUTES", # HID:41058
+ "HID:WIZARDS_HID_AGWIZ_2_TXT_TIME", # HID:41059
+ "HID:WIZARDS_HID_AGWIZ_2_TXT_DATE", # HID:41060
+ "HID:WIZARDS_HID_AGWIZ_2_TXT_TITLE", # HID:41061
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list