[Libreoffice-commits] .: 91 commits - accessibility/inc accessibility/prj accessibility/source automation/inc automation/prj automation/source basctl/inc basctl/sdi basctl/source bean/com bean/native bean/prj crashrep/prj cui/Library_cui.mk cui/source embedserv/prj embedserv/source extensions/source extensions/test forms/Library_frm.mk forms/qa forms/source lingucomponent/prj lingucomponent/source MathMLDTD/prj package/inc package/qa package/source setup_native/prj setup_native/source UnoControls/prj wizards/com wizards/source wizards/util xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/test_docs xmlsecurity/util
Xisco Fauli
xfauli at kemper.freedesktop.org
Sun Aug 21 13:43:04 PDT 2011
MathMLDTD/prj/d.lst | 4
UnoControls/prj/build.lst | 2
UnoControls/prj/d.lst | 12
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 5
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 5
accessibility/prj/build.lst | 2
accessibility/prj/d.lst | 12
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 24
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 11
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 11
accessibility/source/extended/AccessibleGridControlBase.cxx | 22
accessibility/source/extended/AccessibleGridControlHeader.cxx | 11
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 11
accessibility/source/helper/accresmgr.cxx | 4
automation/inc/automation/commdefines.hxx | 20
automation/inc/automation/commtypes.hxx | 11
automation/prj/d.lst | 44
automation/source/inc/cmdbasestream.hxx | 32
automation/source/inc/icommstream.hxx | 14
automation/source/inc/rcontrol.hxx | 16
automation/source/inc/svcommstream.hxx | 14
automation/source/miniapp/servres.cxx | 6
automation/source/miniapp/servres.hxx | 7
automation/source/miniapp/testapp.cxx | 2
automation/source/server/XMLParser.cxx | 12
automation/source/server/cmdbasestream.cxx | 150 -
automation/source/server/recorder.cxx | 26
automation/source/server/retstrm.cxx | 8
automation/source/server/retstrm.hxx | 16
automation/source/server/scmdstrm.cxx | 24
automation/source/server/scmdstrm.hxx | 4
automation/source/server/sta_list.cxx | 9
automation/source/server/statemnt.cxx | 548 +--
automation/source/server/statemnt.hxx | 18
automation/source/server/svcommstream.cxx | 14
automation/source/simplecm/communiio.hxx | 12
automation/source/simplecm/packethandler.cxx | 4
automation/source/simplecm/tcpio.cxx | 4
automation/source/simplecm/tcpio.hxx | 4
automation/source/testtool/cmdstrm.cxx | 42
automation/source/testtool/cmdstrm.hxx | 10
automation/source/testtool/cretstrm.hxx | 4
automation/source/testtool/makefile.mk | 2
automation/source/testtool/objtest.cxx | 100
automation/source/testtool/tcommuni.cxx | 6
automation/source/testtool/testtool.ini | 1
basctl/inc/basidesh.hrc | 1
basctl/sdi/baside.sdi | 5
basctl/source/basicide/baside2.cxx | 9
basctl/source/basicide/baside2.hxx | 1
basctl/source/basicide/baside2b.cxx | 32
basctl/source/basicide/basidesh.src | 5
basctl/source/basicide/iderdll.cxx | 3
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/dlged/dlged.cxx | 9
bean/com/sun/star/comp/beans/HasConnectionException.java | 2
bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 1
bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 1
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c | 9
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 24
bean/prj/d.lst | 8
crashrep/prj/d.lst | 6
cui/Library_cui.mk | 6
cui/source/customize/acccfg.cxx | 2
cui/source/customize/macropg.cxx | 20
cui/source/dialogs/about.cxx | 223 +
cui/source/dialogs/about.hrc | 7
cui/source/dialogs/about.src | 8
cui/source/dialogs/cuigaldlg.cxx | 92
cui/source/dialogs/cuihyperdlg.cxx | 1
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hlinettp.cxx | 50
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/hyperdlg.hrc | 1
cui/source/dialogs/hyperdlg.src | 27
cui/source/dialogs/iconcdlg.cxx | 14
cui/source/dialogs/srchxtra.cxx | 8
cui/source/factory/cuiresmgr.cxx | 7
cui/source/factory/dlgfact.cxx | 1
cui/source/inc/about.hxx | 3
cui/source/inc/chardlg.hxx | 8
cui/source/inc/cuigaldlg.hxx | 28
cui/source/inc/cuitabline.hxx | 59
cui/source/inc/hlinettp.hxx | 9
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/page.hxx | 2
cui/source/options/fontsubs.cxx | 1
cui/source/options/fontsubs.hxx | 1
cui/source/options/optchart.cxx | 4
cui/source/options/optgdlg.cxx | 22
cui/source/options/opthtml.cxx | 74
cui/source/options/optinet2.cxx | 407 ++
cui/source/options/optinet2.hrc | 23
cui/source/options/optinet2.hxx | 69
cui/source/options/optinet2.src | 166 +
cui/source/options/optmemory.cxx | 4
cui/source/options/optpath.cxx | 1
cui/source/options/optsave.cxx | 10
cui/source/options/treeopt.cxx | 4
cui/source/options/treeopt.src | 4
cui/source/tabpages/autocdlg.cxx | 58
cui/source/tabpages/chardlg.cxx | 288 +
cui/source/tabpages/numpages.cxx | 9
cui/source/tabpages/page.cxx | 17
cui/source/tabpages/tpline.cxx | 23
embedserv/prj/build.lst | 2
embedserv/prj/d.lst | 4
embedserv/source/inc/embservconst.h | 2
extensions/source/ole/oleobjw.cxx | 11
extensions/source/ole/oleobjw.hxx | 4
extensions/source/oooimprovement/onlogrotate_job.cxx | 2
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2
extensions/source/propctrlr/eventhandler.cxx | 3
extensions/source/propctrlr/standardcontrol.cxx | 4
extensions/source/svg/makefile.mk | 67
extensions/source/svg/svgaction.cxx | 1461 +++++++++
extensions/source/svg/svgaction.hxx | 167 +
extensions/source/svg/svgcom.hxx | 76
extensions/source/svg/svgprinter.cxx | 331 ++
extensions/source/svg/svgprinter.hxx | 70
extensions/source/svg/svguno.cxx | 101
extensions/source/svg/svgwriter.cxx | 174 +
extensions/source/svg/svgwriter.hxx | 63
extensions/source/update/check/Jobs.xcu | 2
extensions/source/update/tools/ztool.cxx | 6
extensions/test/ole/OleClient/clientTest.cxx | 2
extensions/test/ole/OleConverterVar1/convTest.cxx | 2
extensions/test/ole/cppToUno/testcppuno.cxx | 2
forms/Library_frm.mk | 6
forms/qa/unoapi/knownissues.xcl | 6
forms/source/component/Columns.cxx | 30
forms/source/component/DatabaseForm.cxx | 91
forms/source/component/Edit.cxx | 62
forms/source/component/Edit.hxx | 1
forms/source/component/Filter.cxx | 34
forms/source/component/FormattedField.cxx | 4
forms/source/resource/frm_resource.cxx | 4
lingucomponent/prj/d.lst | 106
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 8
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 4
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 15
lingucomponent/source/thesaurus/libnth/makefile.mk | 3
package/inc/EncryptedDataHeader.hxx | 32
package/inc/EncryptionData.hxx | 52
package/inc/PackageConstants.hxx | 36
package/inc/ZipFile.hxx | 52
package/inc/ZipOutputStream.hxx | 33
package/inc/ZipPackage.hxx | 42
package/inc/ZipPackageEntry.hxx | 106
package/inc/ZipPackageFolder.hxx | 4
package/inc/ZipPackageStream.hxx | 218 -
package/qa/storages/TestHelper.java | 16
package/source/manifest/Base64Codec.cxx | 8
package/source/manifest/Base64Codec.hxx | 4
package/source/manifest/ManifestDefines.hxx | 21
package/source/manifest/ManifestExport.cxx | 285 -
package/source/manifest/ManifestImport.cxx | 169 -
package/source/manifest/ManifestImport.hxx | 28
package/source/manifest/UnoRegister.cxx | 5
package/source/xstor/owriteablestream.cxx | 188 -
package/source/xstor/xstorage.cxx | 212 -
package/source/xstor/xstorage.hxx | 11
package/source/zipapi/Deflater.cxx | 8
package/source/zipapi/EntryInputStream.cxx | 205 +
package/source/zipapi/EntryInputStream.hxx | 85
package/source/zipapi/Inflater.cxx | 4
package/source/zipapi/MemoryByteGrabber.hxx | 2
package/source/zipapi/XFileStream.cxx | 230 +
package/source/zipapi/XFileStream.hxx | 95
package/source/zipapi/XMemoryStream.cxx | 55
package/source/zipapi/XMemoryStream.hxx | 45
package/source/zipapi/XUnbufferedStream.cxx | 100
package/source/zipapi/XUnbufferedStream.hxx | 17
package/source/zipapi/ZipFile.cxx | 512 +--
package/source/zipapi/ZipOutputStream.cxx | 124
package/source/zipapi/blowfishcontext.cxx | 122
package/source/zipapi/blowfishcontext.hxx | 58
package/source/zipapi/makefile.mk | 2
package/source/zipapi/sha1context.cxx | 97
package/source/zipapi/sha1context.hxx | 59
package/source/zippackage/ZipPackage.cxx | 573 +--
package/source/zippackage/ZipPackageEntry.cxx | 24
package/source/zippackage/ZipPackageEntry.hxx | 106
package/source/zippackage/ZipPackageFolder.cxx | 197 -
package/source/zippackage/ZipPackageStream.cxx | 406 --
package/source/zippackage/ZipPackageStream.hxx | 196 +
package/source/zippackage/zipfileaccess.cxx | 5
setup_native/prj/build.lst | 1
setup_native/prj/d.lst | 19
setup_native/source/mac/ooo/DS_Store |binary
setup_native/source/mac/ooo/DS_Store_Langpack |binary
setup_native/source/mac/ooo3_installer.icns |binary
setup_native/source/packinfo/packinfo_extensions.txt | 44
setup_native/source/packinfo/packinfo_office.txt | 108
setup_native/source/packinfo/packinfo_office_lang.txt | 4
setup_native/source/packinfo/shellscripts_extensions.txt | 24
setup_native/source/packinfo/spellchecker_selection.txt | 84
setup_native/source/win32/customactions/javafilter/makefile.mk | 4
setup_native/source/win32/customactions/languagepacks/makefile.mk | 2
setup_native/source/win32/customactions/patch/makefile.mk | 3
setup_native/source/win32/customactions/quickstarter/makefile.mk | 3
setup_native/source/win32/customactions/rebase/makefile.mk | 2
setup_native/source/win32/customactions/rebase/rebase.cxx | 85
setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk | 2
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 48
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx | 36
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx | 14
setup_native/source/win32/customactions/reg64/makefile.mk | 3
setup_native/source/win32/customactions/regactivex/makefile.mk | 3
setup_native/source/win32/customactions/regpatchactivex/makefile.mk | 10
setup_native/source/win32/customactions/relnotes/exports.dxp | 3
setup_native/source/win32/customactions/relnotes/makefile.mk | 76
setup_native/source/win32/customactions/relnotes/relnotes.cxx | 188 +
setup_native/source/win32/customactions/sellang/makefile.mk | 20
setup_native/source/win32/customactions/shellextensions/makefile.mk | 4
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 25
setup_native/source/win32/customactions/thesaurus/makefile.mk | 9
setup_native/source/win32/customactions/tools/makefile.mk | 4
setup_native/source/win32/msi-encodinglist.txt | 2
wizards/com/sun/star/wizards/RemoteAgendaWizard | 6
wizards/com/sun/star/wizards/RemoteWebWizard | 7
wizards/com/sun/star/wizards/agenda/AgendaTemplate.java | 99
wizards/com/sun/star/wizards/agenda/AgendaTemplate.py | 1197 +++++++
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java | 114
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py | 293 +
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java | 52
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py | 63
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 208 -
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 463 +++
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.java | 70
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py | 153 +
wizards/com/sun/star/wizards/agenda/CGAgenda.java | 2
wizards/com/sun/star/wizards/agenda/CGAgenda.py | 27
wizards/com/sun/star/wizards/agenda/CGTopic.java | 18
wizards/com/sun/star/wizards/agenda/CGTopic.py | 45
wizards/com/sun/star/wizards/agenda/CallWizard.java | 10
wizards/com/sun/star/wizards/agenda/TemplateConsts.java | 14
wizards/com/sun/star/wizards/agenda/TemplateConsts.py | 72
wizards/com/sun/star/wizards/agenda/TopicsControl.java | 82
wizards/com/sun/star/wizards/agenda/TopicsControl.py | 886 +++++
wizards/com/sun/star/wizards/common/ConfigGroup.java | 6
wizards/com/sun/star/wizards/common/ConfigGroup.py | 5
wizards/com/sun/star/wizards/common/ConfigNode.java | 8
wizards/com/sun/star/wizards/common/ConfigNode.py | 6
wizards/com/sun/star/wizards/common/ConfigSet.java | 6
wizards/com/sun/star/wizards/common/ConfigSet.py | 184 +
wizards/com/sun/star/wizards/common/Configuration.java | 6
wizards/com/sun/star/wizards/common/Configuration.py | 15
wizards/com/sun/star/wizards/common/DebugHelper.java | 2
wizards/com/sun/star/wizards/common/Desktop.java | 14
wizards/com/sun/star/wizards/common/Desktop.py | 96
wizards/com/sun/star/wizards/common/FileAccess.java | 20
wizards/com/sun/star/wizards/common/FileAccess.py | 156 -
wizards/com/sun/star/wizards/common/HelpIds.java | 4
wizards/com/sun/star/wizards/common/Helper.java | 2
wizards/com/sun/star/wizards/common/Helper.py | 43
wizards/com/sun/star/wizards/common/IRenderer.java | 4
wizards/com/sun/star/wizards/common/Indexable.java | 2
wizards/com/sun/star/wizards/common/InvalidQueryException.java | 2
wizards/com/sun/star/wizards/common/JavaTools.java | 16
wizards/com/sun/star/wizards/common/NoValidPathException.java | 2
wizards/com/sun/star/wizards/common/NumberFormatter.java | 84
wizards/com/sun/star/wizards/common/NumericalHelper.java | 68
wizards/com/sun/star/wizards/common/Properties.java | 2
wizards/com/sun/star/wizards/common/Properties.py | 43
wizards/com/sun/star/wizards/common/PropertyNames.java | 2
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 6
wizards/com/sun/star/wizards/common/Resource.java | 2
wizards/com/sun/star/wizards/common/SystemDialog.java | 14
wizards/com/sun/star/wizards/common/SystemDialog.py | 17
wizards/com/sun/star/wizards/common/TerminateWizardException.java | 2
wizards/com/sun/star/wizards/common/UCB.java | 66
wizards/com/sun/star/wizards/common/XMLHelper.java | 2
wizards/com/sun/star/wizards/common/XMLProvider.java | 2
wizards/com/sun/star/wizards/db/BlindtextCreator.java | 2
wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 2
wizards/com/sun/star/wizards/db/CommandMetaData.java | 6
wizards/com/sun/star/wizards/db/CommandName.java | 2
wizards/com/sun/star/wizards/db/DBMetaData.java | 6
wizards/com/sun/star/wizards/db/FieldColumn.java | 2
wizards/com/sun/star/wizards/db/QueryMetaData.java | 18
wizards/com/sun/star/wizards/db/RecordParser.java | 2
wizards/com/sun/star/wizards/db/RelationController.java | 4
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 4
wizards/com/sun/star/wizards/db/TableDescriptor.java | 8
wizards/com/sun/star/wizards/db/TypeInspector.java | 12
wizards/com/sun/star/wizards/document/Control.java | 6
wizards/com/sun/star/wizards/document/DatabaseControl.java | 2
wizards/com/sun/star/wizards/document/FormHandler.java | 2
wizards/com/sun/star/wizards/document/GridControl.java | 2
wizards/com/sun/star/wizards/document/OfficeDocument.java | 8
wizards/com/sun/star/wizards/document/OfficeDocument.py | 49
wizards/com/sun/star/wizards/document/Shape.java | 2
wizards/com/sun/star/wizards/document/TimeStampControl.java | 4
wizards/com/sun/star/wizards/fax/CGFax.java | 2
wizards/com/sun/star/wizards/fax/CGFaxWizard.java | 2
wizards/com/sun/star/wizards/fax/CallWizard.java | 4
wizards/com/sun/star/wizards/fax/FaxDocument.java | 2
wizards/com/sun/star/wizards/fax/FaxDocument.py | 3
wizards/com/sun/star/wizards/fax/FaxWizardDialog.java | 6
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 111
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java | 6
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py | 4
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 10
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 161 +
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java | 4
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 3
wizards/com/sun/star/wizards/form/CallFormWizard.java | 2
wizards/com/sun/star/wizards/form/DataEntrySetter.java | 4
wizards/com/sun/star/wizards/form/FieldLinker.java | 6
wizards/com/sun/star/wizards/form/Finalizer.java | 2
wizards/com/sun/star/wizards/form/FormConfiguration.java | 2
wizards/com/sun/star/wizards/form/FormControlArranger.java | 6
wizards/com/sun/star/wizards/form/FormDocument.java | 2
wizards/com/sun/star/wizards/form/FormWizard.java | 2
wizards/com/sun/star/wizards/form/StyleApplier.java | 2
wizards/com/sun/star/wizards/form/UIControlArranger.java | 2
wizards/com/sun/star/wizards/letter/CGLetter.java | 2
wizards/com/sun/star/wizards/letter/CGLetterWizard.java | 2
wizards/com/sun/star/wizards/letter/CGPaperElementLocation.java | 2
wizards/com/sun/star/wizards/letter/CallWizard.java | 4
wizards/com/sun/star/wizards/letter/LetterDocument.java | 2
wizards/com/sun/star/wizards/letter/LetterDocument.py | 56
wizards/com/sun/star/wizards/letter/LetterWizardDialog.java | 4
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 270 -
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java | 2
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py | 2
wizards/com/sun/star/wizards/letter/LetterWizardDialogEvents.java | 2
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 10
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 491 +--
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 2
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 2
wizards/com/sun/star/wizards/letter/LocaleCodes.java | 2
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 2
wizards/com/sun/star/wizards/query/Finalizer.java | 2
wizards/com/sun/star/wizards/query/QuerySummary.java | 8
wizards/com/sun/star/wizards/query/QueryWizard.java | 2
wizards/com/sun/star/wizards/report/CallReportWizard.java | 2
wizards/com/sun/star/wizards/report/DBColumn.java | 2
wizards/com/sun/star/wizards/report/Dataimport.java | 10
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 2
wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java | 6
wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java | 2
wizards/com/sun/star/wizards/report/IReportDocument.java | 26
wizards/com/sun/star/wizards/report/RecordTable.java | 2
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 2
wizards/com/sun/star/wizards/report/ReportImplementationHelper.java | 6
wizards/com/sun/star/wizards/report/ReportLayouter.java | 2
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 2
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 14
wizards/com/sun/star/wizards/report/ReportWizard.java | 4
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 26
wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java | 2
wizards/com/sun/star/wizards/table/CGCategory.java | 4
wizards/com/sun/star/wizards/table/CGTable.java | 2
wizards/com/sun/star/wizards/table/CallTableWizard.java | 2
wizards/com/sun/star/wizards/table/FieldDescription.java | 8
wizards/com/sun/star/wizards/table/FieldFormatter.java | 2
wizards/com/sun/star/wizards/table/Finalizer.java | 2
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 2
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 6
wizards/com/sun/star/wizards/table/TableWizard.java | 2
wizards/com/sun/star/wizards/text/TextDocument.java | 2
wizards/com/sun/star/wizards/text/TextDocument.py | 48
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 4
wizards/com/sun/star/wizards/text/TextFieldHandler.py | 40
wizards/com/sun/star/wizards/text/TextFrameHandler.java | 2
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 4
wizards/com/sun/star/wizards/text/TextSectionHandler.py | 62
wizards/com/sun/star/wizards/text/TextStyleHandler.java | 2
wizards/com/sun/star/wizards/text/TextTableHandler.java | 2
wizards/com/sun/star/wizards/text/ViewHandler.java | 2
wizards/com/sun/star/wizards/text/ViewHandler.py | 2
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 4
wizards/com/sun/star/wizards/ui/ButtonList.java | 14
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 4
wizards/com/sun/star/wizards/ui/ControlScroller.java | 6
wizards/com/sun/star/wizards/ui/ControlScroller.py | 230 +
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 2
wizards/com/sun/star/wizards/ui/DocumentPreview.java | 6
wizards/com/sun/star/wizards/ui/DocumentPreview.py | 85
wizards/com/sun/star/wizards/ui/FieldSelection.java | 2
wizards/com/sun/star/wizards/ui/FilterComponent.java | 12
wizards/com/sun/star/wizards/ui/ImageList.java | 20
wizards/com/sun/star/wizards/ui/ImageList.py | 502 +++
wizards/com/sun/star/wizards/ui/PathSelection.java | 2
wizards/com/sun/star/wizards/ui/PeerConfig.java | 20
wizards/com/sun/star/wizards/ui/PeerConfig.py | 62
wizards/com/sun/star/wizards/ui/SortingComponent.java | 10
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 2
wizards/com/sun/star/wizards/ui/UnoDialog.java | 2
wizards/com/sun/star/wizards/ui/UnoDialog.py | 364 --
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 2
wizards/com/sun/star/wizards/ui/UnoDialog2.py | 76
wizards/com/sun/star/wizards/ui/WizardDialog.java | 4
wizards/com/sun/star/wizards/ui/WizardDialog.py | 90
wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java | 2
wizards/com/sun/star/wizards/ui/XCompletion.java | 2
wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java | 2
wizards/com/sun/star/wizards/ui/XPathSelectionListener.java | 2
wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 2
wizards/com/sun/star/wizards/ui/event/CommonListener.java | 2
wizards/com/sun/star/wizards/ui/event/CommonListener.py | 43
wizards/com/sun/star/wizards/ui/event/DataAware.java | 24
wizards/com/sun/star/wizards/ui/event/DataAware.py | 59
wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 14
wizards/com/sun/star/wizards/ui/event/EventNames.java | 2
wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 10
wizards/com/sun/star/wizards/ui/event/ListModelBinder.py | 75
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java | 6
wizards/com/sun/star/wizards/ui/event/RadioDataAware.java | 2
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py | 12
wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java | 4
wizards/com/sun/star/wizards/ui/event/Task.java | 2
wizards/com/sun/star/wizards/ui/event/TaskEvent.java | 2
wizards/com/sun/star/wizards/ui/event/TaskListener.java | 2
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 8
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py | 14
wizards/com/sun/star/wizards/web/AbstractErrorHandler.java | 12
wizards/com/sun/star/wizards/web/BackgroundsDialog.java | 18
wizards/com/sun/star/wizards/web/BackgroundsDialog.py | 194 +
wizards/com/sun/star/wizards/web/CallWizard.java | 4
wizards/com/sun/star/wizards/web/ErrorHandler.java | 6
wizards/com/sun/star/wizards/web/ExtensionVerifier.java | 4
wizards/com/sun/star/wizards/web/FTPDialog.java | 20
wizards/com/sun/star/wizards/web/FTPDialogResources.java | 6
wizards/com/sun/star/wizards/web/IconsDialog.java | 4
wizards/com/sun/star/wizards/web/IconsDialog.py | 96
wizards/com/sun/star/wizards/web/ImageListDialog.java | 18
wizards/com/sun/star/wizards/web/ImageListDialog.py | 211 +
wizards/com/sun/star/wizards/web/LogTaskListener.java | 2
wizards/com/sun/star/wizards/web/Process.java | 52
wizards/com/sun/star/wizards/web/ProcessErrorHandler.java | 2
wizards/com/sun/star/wizards/web/ProcessErrors.java | 2
wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java | 4
wizards/com/sun/star/wizards/web/StatusDialog.java | 6
wizards/com/sun/star/wizards/web/StylePreview.java | 12
wizards/com/sun/star/wizards/web/StylePreview.py | 76
wizards/com/sun/star/wizards/web/TOCPreview.java | 18
wizards/com/sun/star/wizards/web/WWD_Events.java | 46
wizards/com/sun/star/wizards/web/WWD_Events.py | 937 ++++++
wizards/com/sun/star/wizards/web/WWD_General.java | 26
wizards/com/sun/star/wizards/web/WWD_General.py | 258 +
wizards/com/sun/star/wizards/web/WWD_Startup.java | 2
wizards/com/sun/star/wizards/web/WWD_Startup.py | 661 ++++
wizards/com/sun/star/wizards/web/WWHID.java | 2
wizards/com/sun/star/wizards/web/WWHID.py | 140
wizards/com/sun/star/wizards/web/WebWizard.java | 2
wizards/com/sun/star/wizards/web/WebWizardConst.java | 2
wizards/com/sun/star/wizards/web/WebWizardConst.py | 39
wizards/com/sun/star/wizards/web/WebWizardDialog.java | 12
wizards/com/sun/star/wizards/web/WebWizardDialog.py | 713 ++++
wizards/com/sun/star/wizards/web/WebWizardDialogResources.java | 6
wizards/com/sun/star/wizards/web/WebWizardDialogResources.py | 298 +
wizards/com/sun/star/wizards/web/data/CGArgument.java | 2
wizards/com/sun/star/wizards/web/data/CGArgument.py | 4
wizards/com/sun/star/wizards/web/data/CGContent.java | 2
wizards/com/sun/star/wizards/web/data/CGContent.py | 21
wizards/com/sun/star/wizards/web/data/CGDesign.java | 2
wizards/com/sun/star/wizards/web/data/CGDesign.py | 22
wizards/com/sun/star/wizards/web/data/CGDocument.java | 8
wizards/com/sun/star/wizards/web/data/CGDocument.py | 272 +
wizards/com/sun/star/wizards/web/data/CGExporter.java | 2
wizards/com/sun/star/wizards/web/data/CGExporter.py | 23
wizards/com/sun/star/wizards/web/data/CGFilter.java | 4
wizards/com/sun/star/wizards/web/data/CGFilter.py | 6
wizards/com/sun/star/wizards/web/data/CGGeneralInfo.java | 2
wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py | 42
wizards/com/sun/star/wizards/web/data/CGIconSet.java | 2
wizards/com/sun/star/wizards/web/data/CGIconSet.py | 7
wizards/com/sun/star/wizards/web/data/CGImage.java | 2
wizards/com/sun/star/wizards/web/data/CGImage.py | 4
wizards/com/sun/star/wizards/web/data/CGLayout.java | 2
wizards/com/sun/star/wizards/web/data/CGLayout.py | 33
wizards/com/sun/star/wizards/web/data/CGPublish.java | 2
wizards/com/sun/star/wizards/web/data/CGPublish.py | 34
wizards/com/sun/star/wizards/web/data/CGSession.java | 2
wizards/com/sun/star/wizards/web/data/CGSession.py | 49
wizards/com/sun/star/wizards/web/data/CGSessionName.java | 2
wizards/com/sun/star/wizards/web/data/CGSessionName.py | 5
wizards/com/sun/star/wizards/web/data/CGSettings.java | 2
wizards/com/sun/star/wizards/web/data/CGSettings.py | 130
wizards/com/sun/star/wizards/web/data/CGStyle.java | 4
wizards/com/sun/star/wizards/web/data/CGStyle.py | 15
wizards/com/sun/star/wizards/web/data/ConfigSetItem.java | 2
wizards/com/sun/star/wizards/web/data/TypeDetection.java | 10
wizards/com/sun/star/wizards/web/data/TypeDetection.py | 37
wizards/com/sun/star/wizards/web/export/AbstractExporter.java | 2
wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java | 2
wizards/com/sun/star/wizards/web/export/CopyExporter.java | 2
wizards/com/sun/star/wizards/web/export/Exporter.java | 8
wizards/com/sun/star/wizards/web/export/FilterExporter.java | 2
wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java | 2
wizards/com/sun/star/wizards/web/status/ErrorLog.java | 2
wizards/com/sun/star/wizards/web/status/ErrorReporter.java | 2
wizards/com/sun/star/wizards/web/status/LogTaskListener.java | 2
wizards/com/sun/star/wizards/web/status/Task.java | 2
wizards/com/sun/star/wizards/web/status/TaskEvent.java | 2
wizards/com/sun/star/wizards/web/status/TaskListener.java | 2
wizards/source/euro/euro.src | 2
wizards/source/formwizard/dbwizres.src | 64
wizards/source/imagelists/imagelists.src | 38
wizards/source/importwizard/importwi.src | 24
wizards/source/schedule/schedule.src | 72
wizards/source/template/template.src | 22
wizards/source/webwizard/webwizar.src | 2
wizards/util/helpids.h | 859 +++++
wizards/util/hidother.src | 1499 ++++++++++
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 4
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 7
xmlsecurity/qa/certext/User_35_Root_11.crt | 64
xmlsecurity/source/component/documentdigitalsignatures.cxx | 10
xmlsecurity/source/dialogs/certificateviewer.cxx | 22
xmlsecurity/source/dialogs/dialogs.hrc | 12
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/dialogs/resourcemanager.cxx | 3
xmlsecurity/source/dialogs/stbcontrl.cxx | 8
xmlsecurity/source/dialogs/warnings.cxx | 6
xmlsecurity/source/framework/buffernode.cxx | 6
xmlsecurity/source/framework/elementcollector.cxx | 7
xmlsecurity/source/framework/elementcollector.hxx | 1
xmlsecurity/source/framework/securityengine.hxx | 1
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 3
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 3
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 7
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 1
xmlsecurity/source/xmlsec/diagnose.cxx | 3
xmlsecurity/source/xmlsec/makefile.mk | 6
xmlsecurity/source/xmlsec/mscrypt/makefile.mk | 3
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 182 -
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 84
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 20
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 3
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 28
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 161 +
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 276 -
xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 89
xmlsecurity/source/xmlsec/nss/digestcontext.cxx | 101
xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 68
xmlsecurity/source/xmlsec/nss/makefile.mk | 27
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 521 ---
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 90
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 244 -
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 77
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 57
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 365 ++
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 62
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 74
xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 34
xmlsecurity/source/xmlsec/saxhelper.cxx | 96
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 4
xmlsecurity/test_docs/CAs/Root_11/demoCA/index.txt | 1
xmlsecurity/test_docs/CAs/Root_11/demoCA/newcerts/1022.pem | 64
xmlsecurity/test_docs/CAs/Root_11/demoCA/serial | 2
xmlsecurity/test_docs/CAs/Root_11/openssl.cfg | 17
xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt | 64
xmlsecurity/util/makefile.mk | 11
xmlsecurity/util/xsec_xmlsec.component | 1
xmlsecurity/util/xsec_xmlsec.windows.component | 3
572 files changed, 21537 insertions(+), 8887 deletions(-)
New commits:
commit 57b992c0b57daba5f44b5c4cdb08e817f355ea01
Merge: 6c76e4d... 13014ed...
Author: Xisco Fauli <anistenis at gmail.com>
Date: Sun Aug 21 21:57:58 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/core
commit 6c76e4db034fd2c43884698b1a30225fd00b3bfd
Merge: e9440fb... 36703ca...
Author: Xisco Fauli <anistenis at gmail.com>
Date: Sun Aug 21 21:50:13 2011 +0200
Merge branch 'master' into feature/gsoc2011_wizards
Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx
diff --cc automation/source/inc/cmdbasestream.hxx
index ce3ee45,7011299..71666ce
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@@ -51,33 -51,32 +51,32 @@@ public
void GenError( rtl::OString *pUId, comm_String *pString );
- void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr );
- void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr );
- void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_String *pString );
- void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL bBool );
- void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_String *pString );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
- void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT32 nNr );
- void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_String *pString );
- void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_BOOL bBool );
- void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT16 nNr );
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString );
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr );
// MacroRecorder
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); // also used outside MacroRecorder
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString );
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod ); // also used outside MacroRecorder
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr );
- void Read ( comm_UINT16 &nNr );
- void Read ( comm_UINT32 &nNr );
- void Read (comm_UniChar* &aString, comm_UINT16 &nLenInChars );
+ void Read ( comm_USHORT &nNr );
+ void Read ( comm_ULONG &nNr );
+ void Read (comm_UniChar* &aString, comm_USHORT &nLenInChars );
void Read ( comm_BOOL &bBool );
- comm_UINT16 GetNextType();
+ comm_USHORT GetNextType();
- void Write( comm_UINT16 nNr );
- void Write( comm_UINT32 nNr );
- void Write( const comm_UniChar* aString, comm_UINT16 nLenInChars );
+ void Write( comm_USHORT nNr );
+ void Write( comm_ULONG nNr );
+ void Write( const comm_UniChar* aString, comm_USHORT nLenInChars );
void Write( comm_BOOL bBool );
// Complex Datatypes to be handled system dependent
diff --cc automation/source/server/cmdbasestream.cxx
index 3988bcb,154ca63..1144cde
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@@ -184,22 -184,12 +184,12 @@@ void CmdBaseStream::GenReturn( comm_USH
Write(bBool);
}
- void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool )
- {
- Write(comm_USHORT(SIReturn));
- Write(nRet);
- Write(pUId);
- Write(comm_USHORT(PARAM_USHORT_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
- Write(nMethod);
- Write(bBool);
- }
-
- void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr )
+ void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr )
{
- Write(comm_UINT16(SIReturn));
+ Write(comm_USHORT(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_UINT16(PARAM_UINT16_1|PARAM_UINT32_1)); // Typ der folgenden Parameter
+ Write(comm_USHORT(PARAM_USHORT_1|PARAM_ULONG_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(nNr);
}
diff --cc automation/source/server/retstrm.hxx
index d216508,b61911a..19ee23f
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@@ -44,17 -44,16 +44,16 @@@ public
void GenError( rtl::OString aUId, String aString );
using CmdBaseStream::GenReturn;
- void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
- void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
- void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+ void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
// MacroRecorder
- void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
- void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
- void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+ void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
+ void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
void GenReturn( sal_uInt16 nRet, rtl::OString aUId, String aString );
- void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT32 nNr, String aString, sal_Bool bBool );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool );
// needed for RemoteCommand and Profiling
void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue );
diff --cc automation/source/testtool/cmdstrm.hxx
index d9c3cec,5dac92d..a3997fa
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@@ -51,11 -51,9 +51,9 @@@ public
void GenCmdFlow( sal_uInt16 nArt );
- void GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 );
- void GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 );
- void GenCmdFlow( sal_uInt16 nArt, String aString1 );
+ void GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 );
- void Reset(comm_UINT32 nSequence);
+ void Reset(comm_ULONG nSequence);
SvMemoryStream* GetStream();
diff --cc cui/Library_cui.mk
index 6e3bf19,94d8a4a..406dd74
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@@ -35,11 -36,9 +36,10 @@@ $(eval $(call gb_Library_set_include,cu
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/cui/source/inc) \
-I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
))
- $(eval $(call gb_Library_set_defs,cui,\
- $$(DEFS) \
+ $(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
$(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
diff --cc cui/source/dialogs/about.cxx
index 33e8276,0d77033..e4a4b29
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@@ -236,49 -187,64 +245,66 @@@ AboutDialog::AboutDialog( Window* pPare
// character size
Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
// preferred Version widget size
+ Size aVTSize = aVersionText.CalcMinimumSize();
long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
- long nDlgMargin = a6Size.Width() * 3 ;
- long nCtrlMargin = aVTSize.Height() + ( a6Size.Height() * 2 );
- long nTextWidth = aOutSiz.Width() - nDlgMargin;
+ long nDlgMargin = a6Size.Width() * 2;
+ long nCtrlMargin = a6Size.Height() * 2;
+
+ aVersionText.SetSizePixel(Size(800, 600));
+ Size aVersionTextSize = aVersionText.CalcMinimumSize();
+ aVersionTextSize.Width() += nDlgMargin;
+
+ Size aOutSiz = GetOutputSizePixel();
+ aOutSiz.Width() = aAppLogoSiz.Width();
+
+ if (aOutSiz.Width() < aVersionTextSize.Width())
+ aOutSiz.Width() = aVersionTextSize.Width();
+
+ if (aOutSiz.Width() < 300)
+ aOutSiz.Width() = 300;
+
+ //round up to nearest even
+ aOutSiz.Width() += aOutSiz.Width() & 1;
+
+ long nTextWidth = (aOutSiz.Width() - nDlgMargin);
// finally set the aVersionText widget position and size
- Size aVTSize = aVersionText.GetSizePixel();
- aVTSize.Width() = nTextWidth;
- aVersionText.SetSizePixel(aVTSize);
- aVTSize = aVersionText.CalcMinimumSize();
- Point aVTPnt;
- aVTPnt.X() = ( aOutSiz.Width() - aVTSize.Width() ) / 2;
- aVTPnt.Y() = nY;
- aVersionText.SetPosSizePixel( aVTPnt, aVTSize );
+ Size aVTCopySize = aVTSize;
+ Point aVTCopyPnt;
+ aVTCopySize.Width() = nTextWidth;
+ aVTCopyPnt.X() = ( aOutSiz.Width() - aVTCopySize.Width() ) / 2;
+ aVTCopyPnt.Y() = nY;
+ aVersionText.SetPosSizePixel( aVTCopyPnt, aVTCopySize );
+
+ nY += nCtrlMargin;
- nY += aVTSize.Height() + nCtrlMargin;
+ // OK-Button-Position (at the bottom and centered)
+ Size aOKSiz = aOKButton.GetSizePixel();
+ Point aOKPnt = aOKButton.GetPosPixel();
+
+ // FixedHyperlink with more info link
+ Point aLinkPnt = aInfoLink.GetPosPixel();
+ Size aLinkSize = aInfoLink.GetSizePixel();
// Multiline edit with Copyright-Text
- // preferred Version widget size
- aCopyrightText.SetSizePixel(Size(nTextWidth,600));
- Size aCTSize = aCopyrightText.CalcMinimumSize();
- aCTSize.Width()= nTextWidth;
- Point aCTPnt;
- aCTPnt.X() = ( aOutSiz.Width() - aCTSize.Width() ) / 2;
- aCTPnt.Y() = nY;
- aCopyrightText.SetPosSizePixel( aCTPnt, aCTSize );
+ Point aCopyPnt = aCopyrightText.GetPosPixel();
+ Size aCopySize = aCopyrightText.GetSizePixel();
+ aCopySize.Width() = nTextWidth;
+ aCopySize.Height() = aOutSiz.Height() - nY - ( aOKSiz.Height() * 2 ) - 3*aLinkSize.Height() - nCtrlMargin;
- nY += aCTSize.Height() + nCtrlMargin;
+ aCopyPnt.X() = ( aOutSiz.Width() - aCopySize.Width() ) / 2;
+ aCopyPnt.Y() = nY;
+ aCopyrightText.SetPosSizePixel( aCopyPnt, aCopySize );
- // FixedHyperlink with more info link
- Size aLTSize = aInfoLink.CalcMinimumSize();
- Point aLTPnt;
- aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2;
- aLTPnt.Y() = nY;
- aInfoLink.SetPosSizePixel( aLTPnt, aLTSize );
+ nY += aCopySize.Height() + aLinkSize.Height();
- nY += aLTSize.Height() + nCtrlMargin;
+ aLinkSize.Width() = aInfoLink.CalcMinimumSize().Width();
+ aLinkPnt.X() = ( aOutSiz.Width() - aLinkSize.Width() ) / 2;
+ aLinkPnt.Y() = nY;
+ aInfoLink.SetPosSizePixel( aLinkPnt, aLinkSize );
+
+ nY += aLinkSize.Height() + nCtrlMargin;
- // OK-Button-Position (at the bottom and centered)
- Size aOKSiz = aOKButton.GetSizePixel();
- Point aOKPnt;
aOKPnt.X() = ( aOutSiz.Width() - aOKSiz.Width() ) / 2;
aOKPnt.Y() = nY;
aOKButton.SetPosPixel( aOKPnt );
diff --cc cui/source/dialogs/about.hrc
index 349a5e1,fe31423..2f7e974
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@@ -29,10 -29,13 +29,14 @@@
#define ABOUT_BTN_OK 1
#define ABOUT_FTXT_VERSION 2
-#define ABOUT_FTXT_COPYRIGHT 3
-#define ABOUT_FTXT_LINK 4
-#define ABOUT_STR_BUILD 5
+#define ABOUT_STR_ACCEL 3
+#define ABOUT_FTXT_COPYRIGHT 4
+
+#define ABOUT_FTXT_LINK 5
#define ABOUT_STR_VERSION 6
- #define ABOUT_STR_COPYRIGHT 7
- #define ABOUT_STR_LINK 8
+ #define ABOUT_STR_VENDOR 7
+ #define ABOUT_STR_COPYRIGHT 8
+ #define ABOUT_STR_COPYRIGHT_DERIVED 9
+ #define ABOUT_STR_COPYRIGHT_ORACLE_DERIVED 10
+ #define ABOUT_STR_ACKNOWLEDGEMENT 11
+ #define ABOUT_STR_LINK 12
diff --cc forms/Library_frm.mk
index 1208fa5,91ec3b0..f99dcb8
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@@ -35,15 -36,14 +36,8 @@@ $(eval $(call gb_Library_set_include,fr
-I$(realpath $(SRCDIR)/forms/source/inc) \
-I$(realpath $(SRCDIR)/forms/source/solar/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
- ))
-
- $(eval $(call gb_Library_set_defs,frm,\
- $$(DEFS) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \
))
-$(eval $(call gb_Library_add_api,frm,\
- offapi \
- oovbaapi \
- udkapi \
-))
-
$(eval $(call gb_Library_add_linked_libs,frm,\
comphelper \
cppu \
diff --cc lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 8324c4f,1f8a508..e54cc74
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@@ -95,27 -95,27 +95,27 @@@ Hyphenator::Hyphenator()
numdict = 0;
}
+
Hyphenator::~Hyphenator()
{
- if (pPropHelper)
- pPropHelper->RemoveAsPropListener();
-
- if ((numdict) && (aDicts))
+ if (numdict && aDicts)
{
- for (int i=0; i < numdict; ++i)
+ for (int i=0; i < numdict; i++)
{
- delete aDicts[i].apCC;
- if (aDicts[i].aPtr)
- hnj_hyphen_free(aDicts[i].aPtr);
+ if (aDicts[i].apCC) delete aDicts[i].apCC;
+ aDicts[i].apCC = NULL;
}
}
- if (aDicts) delete[] aDicts;
- aDicts = NULL;
- numdict = 0;
- }
+ delete[] aDicts;
+ if (pPropHelper)
+ {
+ pPropHelper->RemoveAsPropListener();
+ delete pPropHelper;
+ }
+ }
- PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
+ PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl()
{
if (!pPropHelper)
{
diff --cc lingucomponent/source/spellcheck/spell/sspellimp.cxx
index c72103c,31bcadc..e210c2e
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@@ -102,18 -101,20 +102,20 @@@ SpellChecker::~SpellChecker(
}
aDicts = NULL;
numdict = 0;
- delete[] aDEncs;
+ if (aDEncs) delete[] aDEncs;
aDEncs = NULL;
- delete[] aDLocs;
+ if (aDLocs) delete[] aDLocs;
aDLocs = NULL;
- delete[] aDNames;
+ if (aDNames) delete[] aDNames;
aDNames = NULL;
if (pPropHelper)
+ {
pPropHelper->RemoveAsPropListener();
+ delete pPropHelper;
+ }
}
-
- PropertyHelper_Spell & SpellChecker::GetPropHelper_Impl()
+ PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
{
if (!pPropHelper)
{
diff --cc setup_native/prj/d.lst
index b571e6b,6221f73..358fce0
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@@ -1,56 -1,54 +1,53 @@@
-mkdir: %_DEST%\bin\osl
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
+mkdir: %_DEST%\bin%_EXT%\osl
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
+..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-mkdir: %_DEST%\bin\userscripts
-..\%__SRC%\bin\install %_DEST%\bin\userscripts\install
-..\%__SRC%\bin\uninstall %_DEST%\bin\userscripts\uninstall
-..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin\openoffice.org-userland-1.0-0.noarch.rpm
+mkdir: %_DEST%\bin%_EXT%\userscripts
+..\%__SRC%\bin\install %_DEST%\bin%_EXT%\userscripts\install
+..\%__SRC%\bin\uninstall %_DEST%\bin%_EXT%\userscripts\uninstall
+..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin%_EXT%\openoffice.org-userland-1.0-0.noarch.rpm
- mkdir: %_DEST%\bin%_EXT%\osolsmf
- ..\%__SRC%\bin\ulfconv %_DEST%\bin%_EXT%\ulfconv
- ..\%__SRC%\bin\langpackscript.sh %_DEST%\bin%_EXT%\langpackscript.sh
- ..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin%_EXT%\linuxpatchscript.sh
- ..\%__SRC%\bin\downloadscript.sh %_DEST%\bin%_EXT%\downloadscript.sh
- ..\%__SRC%\bin\register_extensions %_DEST%\bin%_EXT%\register_extensions
- ..\%__SRC%\bin\deregister_extensions %_DEST%\bin%_EXT%\deregister_extensions
- ..\%__SRC%\bin\unpack_update.sh %_DEST%\bin%_EXT%\unpack_update
- ..\%__SRC%\bin\update.sh %_DEST%\bin%_EXT%\update
- ..\%__SRC%\bin\javaloader.sh %_DEST%\bin%_EXT%\javaloader.sh
- ..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin%_EXT%\*.ulf
- ..\source\win32\msi-encodinglist.txt %_DEST%\bin%_EXT%\msi-encodinglist.txt
- ..\source\win32\patchlist.txt %_DEST%\bin%_EXT%\patchlist.txt
- ..\source\win32\desktophelper.txt %_DEST%\bin%_EXT%\desktophelper.txt
- ..\source\win32\get_retval.bat %_DEST%\bin%_EXT%\get_retval.bat
- ..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin%_EXT%\downloadtemplate.nsi
- ..\source\win32\nsis\*.ico %_DEST%\bin%_EXT%\*.ico
- ..\source\win32\nsis\*.bmp %_DEST%\bin%_EXT%\*.bmp
- ..\source\linux\*.dat %_DEST%\bin%_EXT%\*.dat
- ..\source\mac\*.icns %_DEST%\bin%_EXT%\*.icns
- ..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack
- ..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png
- ..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
- ..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
- ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
- ..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
- ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
- ..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
- ..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed
- ..\source\opensolaris\bundledextensions\README %_DEST%\bin%_EXT%\osolsmf\README
- ..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin%_EXT%\osolsmf\ooo_bundled_extensions.xml
- ..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin%_EXT%\osolsmf\svc-ooo_bundled_extensions
- ..\source\packinfo\solariscopyrightfile %_DEST%\bin%_EXT%\solariscopyrightfile
- ..\source\packinfo\linuxcopyrightfile %_DEST%\bin%_EXT%\linuxcopyrightfile
- ..\source\packinfo\*.txt %_DEST%\bin%_EXT%\*.txt
- ..\source\packinfo\*.pcp %_DEST%\bin%_EXT%\*.pcp
- ..\scripts\admin.pl %_DEST%\bin%_EXT%\admin.pl
- ..\scripts\*.txt %_DEST%\bin%_EXT%\*.txt
- ..\scripts\mac_install.script %_DEST%\bin%_EXT%\mac_install.script
- ..\scripts\osx_install_languagepack.applescript %_DEST%\bin%_EXT%\osx_install_languagepack.applescript
- ..\scripts\osx_install_patch.applescript %_DEST%\bin%_EXT%\osx_install_patch.applescript
-
+ mkdir: %_DEST%\bin\osolsmf
+ ..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv
+ ..\%__SRC%\bin\langpackscript.sh %_DEST%\bin\langpackscript.sh
+ ..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin\linuxpatchscript.sh
+ ..\%__SRC%\bin\downloadscript.sh %_DEST%\bin\downloadscript.sh
+ ..\%__SRC%\bin\register_extensions %_DEST%\bin\register_extensions
+ ..\%__SRC%\bin\deregister_extensions %_DEST%\bin\deregister_extensions
+ ..\%__SRC%\bin\unpack_update.sh %_DEST%\bin\unpack_update
+ ..\%__SRC%\bin\update.sh %_DEST%\bin\update
+ ..\%__SRC%\bin\javaloader.sh %_DEST%\bin\javaloader.sh
+ ..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin\*.ulf
+ ..\source\win32\msi-encodinglist.txt %_DEST%\bin\msi-encodinglist.txt
+ ..\source\win32\patchlist.txt %_DEST%\bin\patchlist.txt
+ ..\source\win32\desktophelper.txt %_DEST%\bin\desktophelper.txt
+ ..\source\win32\get_retval.bat %_DEST%\bin\get_retval.bat
+ ..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin\downloadtemplate.nsi
+ ..\source\win32\nsis\*.ico %_DEST%\bin\*.ico
+ ..\source\win32\nsis\*.bmp %_DEST%\bin\*.bmp
+ ..\source\linux\*.dat %_DEST%\bin\*.dat
+ ..\source\mac\*.icns %_DEST%\bin\*.icns
+ ..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack
+ ..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png
+ ..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin\osl\osxdndinstall_nologo.png
+ ..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store
+ ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack
+ ..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat
+ ..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat
+ ..\source\opensolaris\bundledextensions\installed %_DEST%\bin\osolsmf\installed
+ ..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README
+ ..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml
+ ..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin\osolsmf\svc-ooo_bundled_extensions
+ ..\source\packinfo\solariscopyrightfile %_DEST%\bin\solariscopyrightfile
+ ..\source\packinfo\linuxcopyrightfile %_DEST%\bin\linuxcopyrightfile
+ ..\source\packinfo\*.txt %_DEST%\bin\*.txt
+ ..\source\packinfo\*.pcp %_DEST%\bin\*.pcp
+ ..\scripts\admin.pl %_DEST%\bin\admin.pl
+ ..\scripts\*.txt %_DEST%\bin\*.txt
+ ..\scripts\mac_install.script %_DEST%\bin\mac_install.script
+ ..\scripts\osx_install_languagepack.applescript %_DEST%\bin\osx_install_languagepack.applescript
+ ..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript
-
-..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so
+..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
- ..\inc\setup_native\qswin32.h %_DEST%\inc%_EXT%\setup_native\qswin32.h
-
+ ..\inc\setup_native\qswin32.h %_DEST%\inc\setup_native\qswin32.h
diff --cc wizards/com/sun/star/wizards/fax/FaxDocument.py
index b5fee83,9ee53cd..3b132e4
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@@ -1,5 -1,7 +1,10 @@@
from text.TextDocument import *
from text.TextSectionHandler import TextSectionHandler
++<<<<<<< HEAD
++=======
+ from text.TextFieldHandler import TextFieldHandler
+ from common.Configuration import Configuration
++>>>>>>> master
from common.PropertyNames import PropertyNames
from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
diff --cc wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 644f08a,e040f24..8d7ea27
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@@ -86,7 -86,7 +86,11 @@@ class FaxWizardDialog(WizardDialog)
PropertyNames.PROPERTY_WIDTH),
(True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
4, 74), self)
++<<<<<<< HEAD
+ self.insertLabel("lblBusinessStyle",
++=======
+ self.lblBusinessStyle = self.insertLabel("lblBusinessStyle",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -97,7 -97,7 +101,11 @@@
(8, self.resources.reslblBusinessStyle_value,
110, 42, 1, 32, 60))
++<<<<<<< HEAD
+ self.insertLabel("lblTitle1",
++=======
+ self.lblTitle1 = self.insertLabel("lblTitle1",
++>>>>>>> master
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@@ -108,7 -108,7 +116,11 @@@
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle1_value,
True, 91, 8, 1, 37, 212))
++<<<<<<< HEAD
+ self.insertLabel("lblPrivateStyle",
++=======
+ self.lblPrivateStyle = self.insertLabel("lblPrivateStyle",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -117,7 -117,7 +129,11 @@@
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPrivateStyle_value, 110, 95, 1, 50, 60))
++<<<<<<< HEAD
+ self.insertLabel("lblIntroduction",
++=======
+ self.lblIntroduction = self.insertLabel("lblIntroduction",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@@ -264,7 -264,7 +280,11 @@@
(8, CHKUSEFOOTER_HID,
self.resources.reschkUseFooter_value, 97, 163,
0, 2, 14, 212), self)
++<<<<<<< HEAD
+ self.insertLabel("lblTitle3",
++=======
+ self.lblTitle3 = self.insertLabel("lblTitle3",
++>>>>>>> master
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@@ -312,7 -312,8 +332,12 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (12, TXTSENDERNAME_HID, 182, 67, 3, 17, 119), self)
++=======
+ (12, TXTSENDERNAME_HID, 182, 67, 3,
+ 17, 119), self)
++>>>>>>> master
self.txtSenderStreet = self.insertTextField("txtSenderStreet",
TXTSENDERSTREET_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@@ -322,7 -323,8 +347,12 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (12, TXTSENDERSTREET_HID, 182, 81, 3, 18, 119), self)
++=======
+ (12, TXTSENDERSTREET_HID, 182, 81, 3,
+ 18, 119), self)
++>>>>>>> master
self.txtSenderPostCode = self.insertTextField("txtSenderPostCode",
TXTSENDERPOSTCODE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@@ -332,7 -334,8 +362,12 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (12, TXTSENDERPOSTCODE_HID, 182, 95, 3, 19, 25), self)
++=======
+ (12, TXTSENDERPOSTCODE_HID, 182, 95, 3,
+ 19, 25), self)
++>>>>>>> master
self.txtSenderState = self.insertTextField("txtSenderState",
TXTSENDERSTATE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@@ -342,7 -345,8 +377,12 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (12, TXTSENDERSTATE_HID, 211, 95, 3, 20, 21), self)
++=======
+ (12, TXTSENDERSTATE_HID, 211, 95, 3,
+ 20, 21), self)
++>>>>>>> master
self.txtSenderCity = self.insertTextField("txtSenderCity",
TXTSENDERCITY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@@ -352,7 -356,8 +392,12 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (12, TXTSENDERCITY_HID, 236, 95, 3, 21, 65), self)
++=======
+ (12, TXTSENDERCITY_HID, 236, 95, 3,
+ 21, 65), self)
++>>>>>>> master
self.txtSenderFax = self.insertTextField("txtSenderFax",
TXTSENDERFAX_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@@ -362,7 -367,8 +407,12 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (12, TXTSENDERFAX_HID, 182, 109, 3, 22, 119), self)
++=======
+ (12, TXTSENDERFAX_HID, 182, 109, 3,
+ 22, 119), self)
++>>>>>>> master
self.optReceiverPlaceholder = self.insertRadioButton(
"optReceiverPlaceholder",
OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
@@@ -391,7 -397,7 +441,11 @@@
(8, OPTRECEIVERDATABASE_HID,
self.resources.resoptReceiverDatabase_value, 104, 160, 3,
24, 200), self)
++<<<<<<< HEAD
+ self.insertLabel("lblSenderAddress",
++=======
+ self.lblSenderAddress = self.insertLabel("lblSenderAddress",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -400,14 -406,14 +454,22 @@@
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
++<<<<<<< HEAD
+ self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
++=======
+ self.FixedLine2 = self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
++>>>>>>> master
PropertyNames.PROPERTY_POSITION_X,
PropertyNames.PROPERTY_POSITION_Y,
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(5, 90, 126, 3, 51, 212))
++<<<<<<< HEAD
+ self.insertLabel("lblSenderName",
++=======
+ self.lblSenderName = self.insertLabel("lblSenderName",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -415,8 -421,9 +477,14 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (8, self.resources.reslblSenderName_value, 113, 69, 3, 52, 68))
+ self.insertLabel("lblSenderStreet",
++=======
+ (8, self.resources.reslblSenderName_value, 113, 69, 3,
+ 52, 68))
+ self.lblSenderStreet = self.insertLabel("lblSenderStreet",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -424,8 -431,9 +492,14 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (8, self.resources.reslblSenderStreet_value, 113, 82, 3, 53, 68))
+ self.insertLabel("lblPostCodeCity",
++=======
+ (8, self.resources.reslblSenderStreet_value, 113, 82, 3,
+ 53, 68))
+ self.lblPostCodeCity = self.insertLabel("lblPostCodeCity",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -433,8 -441,9 +507,14 @@@
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
++<<<<<<< HEAD
+ (8, self.resources.reslblPostCodeCity_value, 113, 97, 3, 54, 68))
+ self.insertLabel("lblTitle4",
++=======
+ (8, self.resources.reslblPostCodeCity_value,
+ 113, 97, 3, 54, 68))
+ self.lblTitle4 = self.insertLabel("lblTitle4",
++>>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@@ -446,7 -455,7 +526,11 @@@
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle4_value,
True, 91, 8, 3, 60, 212))
++<<<<<<< HEAD
+ self.insertLabel("lblSenderFax",
++=======
+ self.Label1 = self.insertLabel("lblSenderFax",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -455,7 -464,7 +539,11 @@@
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.resLabel1_value, 113, 111, 3, 68, 68))
++<<<<<<< HEAD
+ self.insertLabel("Label2",
++=======
+ self.Label2 = self.insertLabel("Label2",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -505,7 -514,7 +593,11 @@@
(8, CHKFOOTERPAGENUMBERS_HID,
self.resources.reschkFooterPageNumbers_value, 97, 106,
0, 4, 27, 201), self)
++<<<<<<< HEAD
+ self.insertLabel("lblFooter",
++=======
+ self.lblFooter = self.insertLabel("lblFooter",
++>>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@@ -516,7 -525,7 +608,11 @@@
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor4, 8, self.resources.reslblFooter_value,
97, 28, 4, 33, 116))
++<<<<<<< HEAD
+ self.insertLabel("lblTitle5",
++=======
+ self.lblTitle5 = self.insertLabel("lblTitle5",
++>>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@@ -567,7 -576,7 +663,11 @@@
PropertyNames.PROPERTY_WIDTH),
(8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
104, 123, 5, 31, 198), self)
++<<<<<<< HEAD
+ self.insertLabel("lblFinalExplanation1",
++=======
+ self.lblFinalExplanation1 = self.insertLabel("lblFinalExplanation1",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@@ -578,7 -587,7 +678,11 @@@
PropertyNames.PROPERTY_WIDTH),
(28, self.resources.reslblFinalExplanation1_value,
True, 97, 28, 5, 34, 205))
++<<<<<<< HEAD
+ self.insertLabel("lblProceed",
++=======
+ self.lblProceed = self.insertLabel("lblProceed",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -588,7 -597,7 +692,11 @@@
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblProceed_value, 97, 100, 5,
35, 204))
++<<<<<<< HEAD
+ self.insertLabel("lblFinalExplanation2",
++=======
+ self.lblFinalExplanation2 = self.insertLabel("lblFinalExplanation2",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@@ -599,7 -608,7 +707,11 @@@
PropertyNames.PROPERTY_WIDTH),
(33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
36, 199))
++<<<<<<< HEAD
+ self.insertImage("ImageControl2",
++=======
+ self.ImageControl2 = self.insertImage("ImageControl2",
++>>>>>>> master
("Border",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_IMAGEURL,
@@@ -611,7 -620,7 +723,11 @@@
PropertyNames.PROPERTY_WIDTH),
(0, 10, UIConsts.INFOIMAGEURL, 92, 145,
False, 5, 47, 10))
++<<<<<<< HEAD
+ self.insertLabel("lblTemplateName",
++=======
+ self.lblTemplateName = self.insertLabel("lblTemplateName",
++>>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@@ -622,7 -631,7 +738,11 @@@
(8, self.resources.reslblTemplateName_value, 97, 58, 5,
57, 101))
++<<<<<<< HEAD
+ self.insertLabel("lblTitle6",
++=======
+ self.lblTitle6 = self.insertLabel("lblTitle6",
++>>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
diff --cc wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
index e5a72e1,680a9e3..e690248
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
@@@ -38,7 -38,7 +38,11 @@@ CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkF
CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
FILETEMPLATEPATH_TEXT_CHANGED = None # "fileTemplatePathTextChanged"
++<<<<<<< HEAD
+OPTCREATEFAX_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
++=======
+ OPTCREATEFAX_ITEM_CHANGED = "optCreateFaxItemChanged"
++>>>>>>> master
OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
imageURLImageControl2 = None #"images/ImageControl2"
imageURLImageControl3 = None #"images/ImageControl3"
diff --cc wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 499cfab,c047589..4da4146
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@@ -1,17 -1,19 +1,33 @@@
from FaxWizardDialog import *
from CGFaxWizard import *
from FaxDocument import *
++<<<<<<< HEAD
+from ui.PathSelection import PathSelection
+from common.FileAccess import FileAccess
+from ui.event.UnoDataAware import UnoDataAware
+from ui.event.RadioDataAware import RadioDataAware
+from text.TextFieldHandler import TextFieldHandler
+from common.SystemDialog import SystemDialog
+from common.NoValidPathException import NoValidPathException
+
+from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
+from com.sun.star.uno import RuntimeException
+from com.sun.star.util import CloseVetoException
++=======
+ from ui.PathSelection import *
+ from common.FileAccess import *
+ from ui.event.UnoDataAware import *
+ from ui.event.RadioDataAware import *
+ from common.Configuration import *
+ from document.OfficeDocument import OfficeDocument
+ from text.TextFieldHandler import TextFieldHandler
+ from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
+
+ from common.NoValidPathException import *
+ from com.sun.star.uno import RuntimeException
+ from com.sun.star.util import CloseVetoException
+
++>>>>>>> master
from com.sun.star.view.DocumentZoomType import OPTIMAL
from com.sun.star.document.UpdateDocMode import FULL_UPDATE
from com.sun.star.document.MacroExecMode import ALWAYS_EXECUTE
@@@ -30,11 -32,11 +46,19 @@@ class FaxWizardDialogImpl(FaxWizardDial
RM_FOOTER = 4
RM_FINALSETTINGS = 5
++<<<<<<< HEAD
+ lstBusinessStylePos = None
+ lstPrivateStylePos = None
+
+ def __init__(self, xmsf):
+ super(FaxWizardDialogImpl, self).__init__(xmsf)
++=======
+
+ def __init__(self, xmsf):
+ super(FaxWizardDialogImpl, self).__init__(xmsf)
+ self.mainDA = []
+ self.faxDA = []
++>>>>>>> master
self.bSaveSuccess = False
self.filenameChanged = False
self.UserTemplatePath = ""
@@@ -59,7 -61,7 +83,11 @@@
def startWizard(self, xMSF, CurPropertyValue):
self.running = True
try:
++<<<<<<< HEAD
+ #Number of steps on WizardDialog
++=======
+ #Number of steps on WizardDialog:
++>>>>>>> master
self.nMaxStep = 5
#instatiate The Document Frame for the Preview
@@@ -82,18 -84,19 +110,33 @@@
#special Control fFrameor setting the save Path:
self.insertPathSelectionControl()
++<<<<<<< HEAD
+ self.initializeTemplates(xMSF)
+
++=======
++>>>>>>> master
#load the last used settings
#from the registry and apply listeners to the controls:
self.initConfiguration()
++<<<<<<< HEAD
+
+ if self.myPathSelection.xSaveTextBox.Text.lower() == "":
+ self.myPathSelection.initializePath()
+
+ xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
+ self.createWindowPeer(xContainerWindow)
++=======
+ self.initializeTemplates(xMSF)
+
+ #update the dialog UI according to the loaded Configuration
+ self.__updateUI()
+ if self.myPathSelection.xSaveTextBox.Text.lower() == "":
+ self.myPathSelection.initializePath()
+
+ self.xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
+ self.createWindowPeer(self.xContainerWindow)
++>>>>>>> master
#add the Roadmap to the dialog:
self.insertRoadmap()
@@@ -146,8 -149,7 +189,12 @@@
if fileAccess.exists(self.sPath, True):
answer = SystemDialog.showMessageBox(
self.xMSF, "MessBox", YES_NO + DEF_NO,
++<<<<<<< HEAD
+ self.resources.resOverwriteWarning,
+ self.xUnoDialog.Peer)
++=======
+ self.resources.resOverwriteWarning, self.xUnoDialog.Peer)
++>>>>>>> master
if answer == 3:
# user said: no, do not overwrite...
endWizard = False
@@@ -214,9 -216,26 +261,32 @@@
def insertRoadmap(self):
self.addRoadmap()
++<<<<<<< HEAD
+ self.insertRoadMapItems(
+ [True, True, True, False, True], self.resources.RoadmapLabels)
+
++=======
+ i = 0
+ i = self.insertRoadmapItem(
+ 0, True, self.resources.RoadmapLabels[
+ FaxWizardDialogImpl.RM_TYPESTYLE - 1],
+ FaxWizardDialogImpl.RM_TYPESTYLE)
+ i = self.insertRoadmapItem(
+ i, True, self.resources.RoadmapLabels[
+ FaxWizardDialogImpl.RM_ELEMENTS - 1],
+ FaxWizardDialogImpl.RM_ELEMENTS)
+ i = self.insertRoadmapItem(
+ i, True, self.resources.RoadmapLabels[
+ FaxWizardDialogImpl.RM_SENDERRECEIVER - 1],
+ FaxWizardDialogImpl.RM_SENDERRECEIVER)
+ i = self.insertRoadmapItem(
+ i, False, self.resources.RoadmapLabels[
+ FaxWizardDialogImpl.RM_FOOTER - 1], FaxWizardDialogImpl.RM_FOOTER)
+ i = self.insertRoadmapItem(i, True,
+ self.resources.RoadmapLabels[
+ FaxWizardDialogImpl.RM_FINALSETTINGS - 1],
+ FaxWizardDialogImpl.RM_FINALSETTINGS)
++>>>>>>> master
self.setRoadmapInteractive(True)
self.setRoadmapComplete(True)
self.setCurrentRoadmapItemID(1)
@@@ -235,6 -254,10 +305,13 @@@
self.myPathSelection.addSelectionListener( \
self.myPathSelectionListener())
++<<<<<<< HEAD
++=======
+ def __updateUI(self):
+ UnoDataAware.updateUIs(self.mainDA)
+ UnoDataAware.updateUIs(self.faxDA)
+
++>>>>>>> master
def __initializePaths(self):
try:
self.sTemplatePath = FileAccess.getOfficePath2(self.xMSF,
@@@ -308,66 -331,72 +385,135 @@@
root = Configuration.getConfigurationRoot(self.xMSF,
"/org.openoffice.Office.Writer/Wizards/Fax", False)
self.myConfig.readConfiguration(root, "cp_")
++<<<<<<< HEAD
+ RadioDataAware.attachRadioButtons(
+ self.myConfig, "cp_FaxType",
+ (self.optBusinessFax, self.optPrivateFax), True).updateUI()
+ UnoDataAware.attachListBox(
+ self.myConfig.cp_BusinessFax, "cp_Style",
+ self.lstBusinessStyle, True).updateUI()
+ UnoDataAware.attachListBox(
+ self.myConfig.cp_PrivateFax, "cp_Style", self.lstPrivateStyle,
+ True).updateUI()
+ cgl = self.myConfig.cp_BusinessFax
+ UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintCompanyLogo", self.chkUseLogo, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintSubjectLine", self.chkUseSubject, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintSalutation", self.chkUseSalutation, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintDate", self.chkUseDate, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl, "cp_PrintCommunicationType",
+ self.chkUseCommunicationType, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintGreeting", self.chkUseGreeting, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintFooter", self.chkUseFooter, True).updateUI()
+ UnoDataAware.attachEditControl(cgl,
+ "cp_Salutation", self.lstSalutation, True).updateUI()
+ UnoDataAware.attachEditControl(cgl,
+ "cp_Greeting", self.lstGreeting, True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_CommunicationType",
+ self.lstCommunicationType, True).updateUI()
+ RadioDataAware.attachRadioButtons(cgl, "cp_SenderAddressType",
+ (self.optSenderDefine, self.optSenderPlaceholder),
+ True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_SenderCompanyName",
+ self.txtSenderName, True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_SenderStreet",
+ self.txtSenderStreet, True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_SenderPostCode",
+ self.txtSenderPostCode, True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_SenderState",
+ self.txtSenderState, True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_SenderCity",
+ self.txtSenderCity, True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_SenderFax",
+ self.txtSenderFax, True).updateUI()
+ RadioDataAware.attachRadioButtons(cgl, "cp_ReceiverAddressType",
+ (self.optReceiverDatabase, self.optReceiverPlaceholder),
+ True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_Footer",
+ self.txtFooter, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl, "cp_FooterOnlySecondPage",
+ self.chkFooterNextPages, True).updateUI()
+ UnoDataAware.attachCheckBox(cgl, "cp_FooterPageNumbers",
+ self.chkFooterPageNumbers, True).updateUI()
+ RadioDataAware.attachRadioButtons(cgl, "cp_CreationType",
+ (self.optCreateFax, self.optMakeChanges), True).updateUI()
+ UnoDataAware.attachEditControl(cgl,
+ "cp_TemplateName", self.txtTemplateName, True).updateUI()
+ UnoDataAware.attachEditControl(cgl, "cp_TemplatePath",
+ self.myPathSelection.xSaveTextBox, True).updateUI()
++=======
+ self.mainDA.append(RadioDataAware.attachRadioButtons(
+ self.myConfig, "cp_FaxType",
+ (self.optBusinessFax, self.optPrivateFax), True))
+ self.mainDA.append(UnoDataAware.attachListBox(
+ self.myConfig.cp_BusinessFax, "cp_Style",
+ self.lstBusinessStyle, True))
+ self.mainDA.append(UnoDataAware.attachListBox(
+ self.myConfig.cp_PrivateFax, "cp_Style", self.lstPrivateStyle,
+ True))
+ cgl = self.myConfig.cp_BusinessFax
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintCompanyLogo", self.chkUseLogo, True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintSubjectLine", self.chkUseSubject, True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintSalutation", self.chkUseSalutation, True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintDate", self.chkUseDate, True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintCommunicationType", self.chkUseCommunicationType,
+ True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintGreeting", self.chkUseGreeting, True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_PrintFooter", self.chkUseFooter, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_Salutation", self.lstSalutation, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_Greeting", self.lstGreeting, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_CommunicationType", self.lstCommunicationType,
+ True))
+ self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+ "cp_SenderAddressType", (self.optSenderDefine, \
+ self.optSenderPlaceholder), True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_SenderCompanyName", self.txtSenderName, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_SenderStreet", self.txtSenderStreet, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_SenderPostCode", self.txtSenderPostCode, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_SenderState", self.txtSenderState, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_SenderCity", self.txtSenderCity, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_SenderFax", self.txtSenderFax, True))
+ self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+ "cp_ReceiverAddressType", (self.optReceiverDatabase,
+ self.optReceiverPlaceholder), True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_Footer", self.txtFooter, True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_FooterOnlySecondPage", self.chkFooterNextPages,
+ True))
+ self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+ "cp_FooterPageNumbers", self.chkFooterPageNumbers,
+ True))
+ self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+ "cp_CreationType", (self.optCreateFax, self.optMakeChanges),
+ True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_TemplateName", self.txtTemplateName, True))
+ self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+ "cp_TemplatePath", self.myPathSelection.xSaveTextBox,
+ True))
++>>>>>>> master
except Exception, exception:
traceback.print_exc()
@@@ -388,7 -417,8 +534,12 @@@
self.optPrivateFaxItemChanged()
def optBusinessFaxItemChanged(self):
++<<<<<<< HEAD
+ FaxWizardDialogImpl.lstPrivateStylePos = None
++=======
+ DataAware.setDataObjects(self.faxDA,
+ self.myConfig.cp_BusinessFax, True)
++>>>>>>> master
self.setControlProperty("lblBusinessStyle",
PropertyNames.PROPERTY_ENABLED, True)
self.setControlProperty("lstBusinessStyle",
@@@ -400,19 -430,16 +551,32 @@@
self.lstBusinessStyleItemChanged()
self.__enableSenderReceiver()
self.__setPossibleFooter(True)
++<<<<<<< HEAD
+
+ def lstBusinessStyleItemChanged(self):
+ selectedItemPos = self.lstBusinessStyle.SelectedItemPos
+ #avoid to load the same item again
+ if FaxWizardDialogImpl.lstBusinessStylePos is not selectedItemPos:
+ FaxWizardDialogImpl.lstBusinessStylePos = selectedItemPos
+ TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview(
+ self.BusinessFiles[1][selectedItemPos], False)
+ self.initializeElements()
+ self.setElements()
+
+ def optPrivateFaxItemChanged(self):
+ FaxWizardDialogImpl.lstBusinessStylePos = None
++=======
+ def lstBusinessStyleItemChanged(self):
+ TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
+ self.BusinessFiles[1][self.lstBusinessStyle.SelectedItemPos],
+ False)
+ self.initializeElements()
+ self.setElements()
+
+ def optPrivateFaxItemChanged(self):
+ DataAware.setDataObjects(self.faxDA,
+ self.myConfig.cp_PrivateFax, True)
++>>>>>>> master
self.setControlProperty("lblBusinessStyle",
PropertyNames.PROPERTY_ENABLED, False)
self.setControlProperty("lstBusinessStyle",
@@@ -426,14 -453,11 +590,22 @@@
self.__setPossibleFooter(False)
def lstPrivateStyleItemChanged(self):
++<<<<<<< HEAD
+ selectedItemPos = self.lstPrivateStyle.SelectedItemPos
+ #avoid to load the same item again
+ if FaxWizardDialogImpl.lstPrivateStylePos is not selectedItemPos:
+ FaxWizardDialogImpl.lstPrivateStylePos = selectedItemPos
+ TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview(
+ self.PrivateFiles[1][selectedItemPos], False)
+ self.initializeElements()
+ self.setElements()
++=======
+ TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
+ self.PrivateFiles[1][self.lstPrivateStyle.SelectedItemPos],
+ False)
+ self.initializeElements()
+ self.setElements()
++>>>>>>> master
def txtTemplateNameTextChanged(self):
xDocProps = TextDocument.xTextDocument.DocumentProperties
@@@ -493,6 -517,20 +665,23 @@@
self.txtSenderCityTextChanged()
self.txtSenderFaxTextChanged()
++<<<<<<< HEAD
++=======
+ def optReceiverPlaceholderItemChanged(self):
+ OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
+ "StarBasic", "macro:#/Template.Correspondence.Placeholder()")
+
+ def optReceiverDatabaseItemChanged(self):
+ OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
+ "StarBasic", "macro:#/Template.Correspondence.Database()")
+
+ def optCreateFaxItemChanged(self):
+ self.bEditTemplate = False
+
+ def optMakeChangesItemChanged(self):
+ self.bEditTemplate = True
+
++>>>>>>> master
def txtSenderNameTextChanged(self):
self.myFieldHandler.changeUserFieldContent(
"Company", self.txtSenderName.Text)
@@@ -539,13 -577,13 +728,23 @@@
if self.optReceiverDatabase.State:
self.optReceiverDatabaseItemChanged()
++<<<<<<< HEAD
+ elif self.optReceiverPlaceholder.State:
+ self.optReceiverPlaceholderItemChanged()
+
+ if self.optCreateFax.State:
+ self.optCreateFromTemplateItemChanged()
+
+ elif self.optMakeChanges.State:
++=======
+ if self.optReceiverPlaceholder.State:
+ self.optReceiverPlaceholderItemChanged()
+
+ if self.optCreateFax.State:
+ self.optCreateFaxItemChanged()
+
+ if self.optMakeChanges.State:
++>>>>>>> master
self.optMakeChangesItemChanged()
def chkUseLogoItemChanged(self):
diff --cc wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index bbf6921,864112f..20c32c3
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@@ -1,6 -1,7 +1,10 @@@
from common.Resource import Resource
class FaxWizardDialogResources(Resource):
++<<<<<<< HEAD
++=======
+ UNIT_NAME = "dbwizres"
++>>>>>>> master
MODULE_NAME = "dbw"
RID_FAXWIZARDDIALOG_START = 3200
RID_FAXWIZARDCOMMUNICATION_START = 3270
diff --cc wizards/com/sun/star/wizards/letter/LetterDocument.py
index f260395,ea79721..af928c8
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.py
+++ b/wizards/com/sun/star/wizards/letter/LetterDocument.py
@@@ -188,21 -189,21 +188,20 @@@ class BusinessPaperObject(object)
myBorder = BorderLine()
myBorder.OuterLineWidth = 0
Helper.setUnoPropertyValue(
- self.xFrame,
+ self.xFrame,
"LeftBorder", myBorder)
Helper.setUnoPropertyValue(
- self.xFrame,
+ self.xFrame,
"RightBorder", myBorder)
Helper.setUnoPropertyValue(
- self.xFrame,
+ self.xFrame,
"TopBorder", myBorder)
Helper.setUnoPropertyValue(
- self.xFrame,
+ self.xFrame,
"BottomBorder", myBorder)
Helper.setUnoPropertyValue(
- self.xFrame,
+ self.xFrame,
"Print", False)
-
-
xTextCursor = \
TextDocument.xTextDocument.Text.createTextCursor()
xTextCursor.gotoEnd(True)
diff --cc wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 8f740cd,35158a3..76d4f8e
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@@ -1065,10 -1097,10 +1065,9 @@@ class LetterWizardDialog(WizardDialog)
PropertyNames.PROPERTY_WIDTH),
(33, self.resources.reslblFinalExplanation2_value, True,
"lblFinalExplanation2", 104, 145, 6, 54, 199))
- self.ImageControl2 = self.insertImage(
+ self.insertImage(
"ImageControl2",
-- (
-- "Border", PropertyNames.PROPERTY_HEIGHT,
++ ("Border", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_IMAGEURL,
PropertyNames.PROPERTY_NAME,
PropertyNames.PROPERTY_POSITION_X,
diff --cc wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index 5324e1c,d25c0c2..12474e3
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@@ -1,6 -1,7 +1,7 @@@
from common.Resource import Resource
class LetterWizardDialogResources(Resource):
- UNIT_NAME = "dbwizres"
++
MODULE_NAME = "dbw"
RID_LETTERWIZARDDIALOG_START = 3000
RID_LETTERWIZARDGREETING_START = 3080
diff --cc wizards/com/sun/star/wizards/text/TextDocument.py
index cebb8d6,9a4e741..df7c0e7
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@@ -218,6 -217,9 +218,7 @@@ class TextDocument(object)
year = time.strftime("%Y", now)
month = time.strftime("%m", now)
day = time.strftime("%d", now)
- currentDate.Day = day
- currentDate.Year = year
- currentDate.Month = month
++
dateObject = dateTimeObject(int(year), int(month), int(day))
du = Helper.DateUtils(self.xMSF, TextDocument.xTextDocument)
ff = du.getFormat(DATE_SYS_DDMMYY)
diff --cc wizards/com/sun/star/wizards/ui/UnoDialog2.py
index 7de9d8b0,0bf8686..45b6249
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@@ -202,24 -208,10 +202,23 @@@ class UnoDialog2(UnoDialog)
sName, sPropNames, oPropValues)
return oLine
-
- def insertScrollBar(self, sName, sPropNames, oPropValues):
- oScrollBar = self.insertControlModel2(
+ def insertLabel(self, sName, sPropNames, oPropValues):
+ oFixedText = self.insertControlModel(
+ "com.sun.star.awt.UnoControlFixedTextModel",
+ sName, sPropNames, oPropValues)
+ return oFixedText
+
+ def insertScrollBar(self, sName, sPropNames, oPropValues,
+ iControlKey, listener):
+ oScrollBar = self.insertControlModel(
"com.sun.star.awt.UnoControlScrollBarModel",
sName, sPropNames, oPropValues)
+ if listener is not None:
+ method = getattr(listener, "scrollControls")
+ oScrollBar.addAdjustmentListener(
+ AdjustmentListenerProcAdapter(method))
+ if self.ControlList is not None:
+ self.ControlList[sName] = iControlKey
return oScrollBar
def insertProgressBar(self, sName, sPropNames, oPropValues):
@@@ -238,4 -256,4 +237,3 @@@
return SystemDialog.showMessageBox(
xMSF, self.xControl.Peer,
windowServiceName, windowAttribute, MessageText)
--
diff --cc wizards/com/sun/star/wizards/ui/event/DataAware.py
index 5975dca,450d6f7..5f4df95
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.py
@@@ -98,9 -78,9 +98,10 @@@ class DataAware(object)
#Selected Element listbox
ui = ui[0]
setattr(self._dataObject, self._field, ui)
+ self.enableControls(ui)
except Exception:
traceback.print_exc()
+
'''
given a collection containing DataAware objects,
calls updateUI() on each memebr of the collection.
commit e9440fb5a0579096423c081b0f0a2185b628e896
Author: Xisco Fauli <anistenis at gmail.com>
Date: Wed Aug 10 18:30:07 2011 +0200
Implement partly the 5th step
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py
index b9afce0..a8b40dc 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.py
+++ b/wizards/com/sun/star/wizards/ui/ImageList.py
@@ -23,9 +23,21 @@ class ImageList(object):
HIDE_PAGE = 99
TRANSPARENT = -1
LINE_HEIGHT = 8
- IMAGE_PROPS = ("Border", "BackgroundColor", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "ScaleImage", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tabstop", PropertyNames.PROPERTY_WIDTH)
- MOVE_SELECTION = (PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP)
+ IMAGE_PROPS = ("Border", "BackgroundColor",
+ PropertyNames.PROPERTY_HEIGHT,
+ PropertyNames.PROPERTY_HELPURL,
+ PropertyNames.PROPERTY_POSITION_X,
+ PropertyNames.PROPERTY_POSITION_Y, "ScaleImage",
+ PropertyNames.PROPERTY_STEP,
+ PropertyNames.PROPERTY_TABINDEX, "Tabstop",
+ PropertyNames.PROPERTY_WIDTH)
+ MOVE_SELECTION = (PropertyNames.PROPERTY_POSITION_X,
+ PropertyNames.PROPERTY_POSITION_Y,
+ PropertyNames.PROPERTY_STEP)
lock = RLock()
+ listModel = []
+ btnNext = None
+ btnBack = None
def __init__(self):
self.benabled = True
@@ -52,29 +64,88 @@ class ImageList(object):
imageTextHeight = self.imageTextLines * ImageList.LINE_HEIGHT
opeerConfig = PeerConfig(dialog)
self.MOVE_SELECTION_VALS[2] = self.step
- imgContainer = dialog.insertImage(self.name + "lblContainer",("BackgroundColor", "Border", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH), (ImageList.BACKGROUND_COLOR, 1, (self.imageSize.Height + self.gap.Height) * self.rows + self.gap.Height + imageTextHeight + 1,self.pos.Width,self.pos.Height, self.step, (self.imageSize.Width + self.gap.Width) * self.cols + self.gap.Width))
+ imgContainer = dialog.insertImage(
+ self.name + "lblContainer",
+ ("BackgroundColor", "Border",
+ PropertyNames.PROPERTY_HEIGHT,
+ PropertyNames.PROPERTY_POSITION_X,
+ PropertyNames.PROPERTY_POSITION_Y,
+ PropertyNames.PROPERTY_STEP,
+ PropertyNames.PROPERTY_WIDTH),
+ (ImageList.BACKGROUND_COLOR, 1,
+ (self.imageSize.Height + self.gap.Height) \
+ * self.rows + self.gap.Height + imageTextHeight + 1,
+ self.pos.Width,self.pos.Height, self.step,
+ (self.imageSize.Width + self.gap.Width) \
+ * self.cols + self.gap.Width))
opeerConfig.setPeerProperties(imgContainer,"MouseTransparent", True)
if self.rowSelect:
- selectionWidth = (self.imageSize.Width + self.gap.Width) * self.cols - self.gap.Width + (self.selectionGap.Width * 2)
+ selectionWidth = (self.imageSize.Width + self.gap.Width) \
+ * self.cols - self.gap.Width + (self.selectionGap.Width * 2)
else:
selectionWidth = self.imageSize.Width + (self.selectionGap.Width * 2)
- self.grbxSelectedImage = dialog.insertLabel(self.name + "_grbxSelected", ("BackgroundColor", "Border", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, "Tabstop", PropertyNames.PROPERTY_WIDTH), (ImageList.TRANSPARENT, 1, self.imageSize.Height + (self.selectionGap.Height * 2), #height
- 0, #posx
- 0, #posy
- self.step, True, selectionWidth))
+ self.grbxSelectedImage = dialog.insertLabel(
+ self.name + "_grbxSelected",
+ ("BackgroundColor", "Border",
+ PropertyNames.PROPERTY_HEIGHT,
+ PropertyNames.PROPERTY_POSITION_X,
+ PropertyNames.PROPERTY_POSITION_Y,
+ PropertyNames.PROPERTY_STEP, "Tabstop",
+ PropertyNames.PROPERTY_WIDTH),
+ (ImageList.TRANSPARENT, 1,
+ self.imageSize.Height + (self.selectionGap.Height * 2),
+ 0, #height
+ 0, #posx
+ 0, #posy
+ self.step, True, selectionWidth))
xWindow = self.grbxSelectedImage
xWindow.addMouseListener(None)
- pNames1 = (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tabstop", PropertyNames.PROPERTY_WIDTH)
- self.lblImageText = dialog.insertLabel(self.name + "_imageText", pNames1, (imageTextHeight, "", self.pos.Width + 1, self.pos.Height + (self.imageSize.Height + self.gap.Height) * self.rows + self.gap.Height, self.step, 0, False, self.cols * (self.imageSize.Width + self.gap.Width) + self.gap.Width - 2))
+ pNames1 = (PropertyNames.PROPERTY_HEIGHT,
+ PropertyNames.PROPERTY_HELPURL,
+ PropertyNames.PROPERTY_POSITION_X,
+ PropertyNames.PROPERTY_POSITION_Y,
+ PropertyNames.PROPERTY_STEP,
+ PropertyNames.PROPERTY_TABINDEX, "Tabstop",
+ PropertyNames.PROPERTY_WIDTH)
+ self.lblImageText = dialog.insertLabel(
+ self.name + "_imageText", pNames1,
+ (imageTextHeight, "", self.pos.Width + 1,
+ self.pos.Height + (self.imageSize.Height + self.gap.Height) \
+ * self.rows + self.gap.Height, self.step, 0, False,
+ self.cols * (self.imageSize.Width + self.gap.Width) \
+ + self.gap.Width - 2))
if self.showButtons:
- self.btnBack = dialog.insertButton(self.name + "_btnBack", "prevPage", this, pNames1, (14, HelpIds.getHelpIdString((self.helpURL + 1)), self.pos.Width, self.pos.Height + (self.imageSize.Height + self.gap.Height) * self.rows + self.gap.Height + imageTextHeight + 1, self.step, self.tabIndex + 1, True, 14))
- self.btnNext = dialog.insertButton(self.name + "_btnNext", "nextPage", this, pNames1, (14, HelpIds.getHelpIdString((self.helpURL + 1)), self.pos.Width + (self.imageSize.Width + self.gap.Width) * self.cols + self.gap.Width - 14 + 1, self.pos.Height + (self.imageSize.Height + self.gap.Height) * self.rows + self.gap.Height + imageTextHeight + 1, self.step, self.tabIndex + 2, True, 14))
- self.lblCounter = dialog.insertLabel(self.name + "_lblCounter", pNames1, (ImageList.LINE_HEIGHT, "", self.pos.Width + 14 + 1, self.pos.Height + (self.imageSize.Height + self.gap.Height) * self.rows + self.gap.Height + imageTextHeight + ((14 - ImageList.LINE_HEIGHT) / 2), self.step, 0, False, self.cols * (self.imageSize.Width + self.gap.Width) + self.gap.Width - 2 * 14 - 1))
+ ImageList.btnBack = dialog.insertButton(
+ self.name + "_btnBack", "prevPage", pNames1,
+ (14, HelpIds.getHelpIdString((self.helpURL + 1)),
+ self.pos.Width, self.pos.Height + \
+ (self.imageSize.Height + self.gap.Height) * \
+ self.rows + self.gap.Height + imageTextHeight + 1,
+ self.step, self.tabIndex + 1, True, 14), self)
+ ImageList.btnNext = dialog.insertButton(
+ self.name + "_btnNext", "nextPage", pNames1,
+ (14, HelpIds.getHelpIdString((self.helpURL + 1)),
+ self.pos.Width + (self.imageSize.Width + self.gap.Width) * \
+ self.cols + self.gap.Width - 14 + 1,
+ self.pos.Height + (self.imageSize.Height + self.gap.Height) \
+ * self.rows + self.gap.Height + imageTextHeight + 1,
+ self.step, self.tabIndex + 2, True, 14), self)
+ self.lblCounter = dialog.insertLabel(
+ self.name + "_lblCounter", pNames1,
+ (ImageList.LINE_HEIGHT, "", self.pos.Width + 14 + 1,
+ self.pos.Height + (self.imageSize.Height + self.gap.Height) \
+ * self.rows + self.gap.Height + imageTextHeight + \
+ ((14 - ImageList.LINE_HEIGHT) / 2),
+ self.step, 0, False, self.cols * \
+ (self.imageSize.Width + self.gap.Width) + \
+ self.gap.Width - 2 * 14 - 1))
Helper.setUnoPropertyValue(self.lblCounter.Model, "Align", 1)
- Helper.setUnoPropertyValue(self.btnBack.Model, PropertyNames.PROPERTY_LABEL, "<")
- Helper.setUnoPropertyValue(self.btnNext.Model, PropertyNames.PROPERTY_LABEL, ">")
+ Helper.setUnoPropertyValue(ImageList.btnBack.Model,
+ PropertyNames.PROPERTY_LABEL, "<")
+ Helper.setUnoPropertyValue(ImageList.btnNext.Model,
+ PropertyNames.PROPERTY_LABEL, ">")
self.m_aImages = [None] * (self.rows * self.cols)
@@ -84,23 +155,32 @@ class ImageList(object):
self.refreshImages()
#COMMENTED
- #self.listModel.addListDataListener(None)
+ #ImageList.listModel.addListDataListener(None)
#used for optimization
def createImage(self, dialog, _row, _col):
imageName = self.name + "_image" + str(_row * self.cols + _col)
- image = dialog.insertImage(imageName, ImageList.IMAGE_PROPS, (ImageList.NO_BORDER, ImageList.BACKGROUND_COLOR, self.imageSize.Height, HelpIds.getHelpIdString(self.helpURL + 1), self.getImagePosX(_col), self.getImagePosY(_row), self.scaleImages, self.step, self.tabIndex, False, self.imageSize.Width))
+ image = dialog.insertImage(
+ imageName, ImageList.IMAGE_PROPS,
+ (ImageList.NO_BORDER, ImageList.BACKGROUND_COLOR,
+ self.imageSize.Height,
+ HelpIds.getHelpIdString(self.helpURL + 1),
+ self.getImagePosX(_col), self.getImagePosY(_row),
+ self.scaleImages, self.step, self.tabIndex,
+ False, self.imageSize.Width))
#COMMENTED
image.addMouseListener(None)
image.addKeyListener(None)
return image
def getImagePosX(self, col):
- return self.pos.Width + col * (self.imageSize.Width + self.gap.Width) + self.gap.Width
+ return self.pos.Width + col * \
+ (self.imageSize.Width + self.gap.Width) + self.gap.Width
def getImagePosY(self, row):
- return self.pos.Height + row * (self.imageSize.Height + self.gap.Height) + self.gap.Height
+ return self.pos.Height + row * \
+ (self.imageSize.Height + self.gap.Height) + self.gap.Height
def refreshImages(self):
if self.showButtons:
@@ -114,14 +194,18 @@ class ImageList(object):
focusable = True
for index, item in enumerate(self.m_aImages):
- oResources = self.renderer.getImageUrls(self.getObjectFor(index))
+ #COMMENTED
+ oResources = None #self.renderer.getImageUrls(self.getObjectFor(index))
if oResources is not None:
if len(oResources) == 1:
- Helper.setUnoPropertyValue(item.Model, PropertyNames.PROPERTY_IMAGEURL, oResources[0])
+ Helper.setUnoPropertyValue(item.Model,
+ PropertyNames.PROPERTY_IMAGEURL, oResources[0])
elif len(oResources) == 2:
- self.oUnoDialog.getPeerConfiguration().setImageUrl(item.Model, oResources[0], oResources[1])
+ self.oUnoDialog.getPeerConfiguration().setImageUrl(
+ item.Model, oResources[0], oResources[1])
- Helper.setUnoPropertyValue(item.Model, "Tabstop", bool(focusable))
+ Helper.setUnoPropertyValue(
+ item.Model, "Tabstop", bool(focusable))
if self.refreshOverNull:
item.Visible = True
@@ -130,23 +214,29 @@ class ImageList(object):
self.refreshSelection()
def refreshCounterText(self):
- Helper.setUnoPropertyValue(self.lblCounter.Model, PropertyNames.PROPERTY_LABEL, self.counterRenderer.render(Counter (self.pageStart + 1, pageEnd(), self.listModel.getSize())))
+ Helper.setUnoPropertyValue(
+ self.lblCounter.Model, PropertyNames.PROPERTY_LABEL,
+ self.counterRenderer.render(
+ self.Counter (self.pageStart + 1,
+ self.pageEnd, len(ImageList.listModel))))
def pageEnd(self):
i = self.pageStart + self.cols * self.rows
- if i > self.listModel.getSize() - 1:
- return self.listModel.getSize()
+ if i > ImageList.listModel.getSize() - 1:
+ return ImageList.listModel.getSize()
else:
return i
def refreshSelection(self):
- if self.selected < self.pageStart or self.selected >= (self.pageStart + self.rows * self.cols):
+ if self.selected < self.pageStart or \
+ self.selected >= (self.pageStart + self.rows * self.cols):
self.hideSelection()
else:
self.moveSelection(self.getImageIndexFor(self.selected))
def hideSelection(self):
- Helper.setUnoPropertyValue(self.grbxSelectedImage.Model, PropertyNames.PROPERTY_STEP, ImageList.HIDE_PAGE)
+ Helper.setUnoPropertyValue(self.grbxSelectedImage.Model,
+ PropertyNames.PROPERTY_STEP, ImageList.HIDE_PAGE)
self.grbxSelectedImage.Visible = False
'''
@@ -161,30 +251,36 @@ class ImageList(object):
else:
col = image - (row * self.cols)
- self.MOVE_SELECTION_VALS[0] = Integer.Integer_unknown(getImagePosX(col) - self.selectionGap.Width)
- self.MOVE_SELECTION_VALS[1] = Integer.Integer_unknown(getImagePosY(row) - self.selectionGap.Height)
- Helper.setUnoPropertyValues(self.grbxSelectedImage.Model, ImageList.MOVE_SELECTION, self.MOVE_SELECTION_VALS)
- if (Helper.getUnoPropertyValue(self.dialogModel, PropertyNames.PROPERTY_STEP)).shortValue() == self.step.shortValue():
+ self.MOVE_SELECTION_VALS[0] = \
+ (self.getImagePosX(col) - self.selectionGap.Width)
+ self.MOVE_SELECTION_VALS[1] = \
+ (self.getImagePosY(row) - self.selectionGap.Height)
+ Helper.setUnoPropertyValues(
+ self.grbxSelectedImage.Model, ImageList.MOVE_SELECTION,
+ self.MOVE_SELECTION_VALS)
+ if (Helper.getUnoPropertyValue(self.dialogModel,
+ PropertyNames.PROPERTY_STEP)) == self.step:
self.grbxSelectedImage.Visible = True
#now focus...
- for i in enumerate(self.m_aImages):
- if i != image:
- self.defocus(i)
+ for index,item in enumerate(self.m_aImages):
+ if index != image:
+ self.defocus(index)
else:
- Helper.setUnoPropertyValue(self.m_aImages[image].Model, "Tabstop", True)
+ Helper.setUnoPropertyValue(
+ self.m_aImages[image].Model, "Tabstop", True)
'''
@param i
- @return the Object in the list model corresponding to the given image index.
+ @return the Object in the list model corresponding to the given image index
'''
def getObjectFor(self, i):
ii = self.getIndexFor(i)
- if self.listModel.getSize() <= ii:
+ if ImageList.listModel.getSize() <= ii:
return None
else:
- return self.listModel.getElementAt(ii)
+ return ImageList.listModel.getElementAt(ii)
'''
@param i
@@ -202,7 +298,8 @@ class ImageList(object):
if event.getIndex1() <= self.selected:
self.selected += event.getIndex1() - event.getIndex0() + 1
- if event.getIndex0() < self.pageStart or event.getIndex1() < (self.pageStart + getRows() + getCols()):
+ if event.getIndex0() < self.pageStart or \
+ event.getIndex1() < (self.pageStart + getRows() + getCols()):
refreshImages()
'''
@@ -233,8 +330,8 @@ class ImageList(object):
'''
def fireItemSelected(self):
- with AgendaTemplate.lock:
- if self.itemListenerList == None:
+ with ImageList.lock:
+ if self.itemListenerList is None:
return
auxlist = self.itemListenerList.clone()
@@ -242,43 +339,41 @@ class ImageList(object):
for i in auxlist:
i.itemStateChanged(None)
- def setSelected(self, i):
- if self.rowSelect and (i >= 0):
- i = (i / self.cols) * self.cols
+ def setSelected(self, _object):
+ if not isinstance(_object, int):
+ _object = -1
+ if _object is not None:
+ for index, item in enumerate(ImageList.listModel):
+ if item == _object:
+ _object = index
+ return
- if self.selected == i:
- return
-
- self.selected = i
- refreshImageText()
- refreshSelection()
- fireItemSelected()
-
- def setSelected(self, object):
- if object == None:
- setSelected(-1)
- else:
- i = 0
- while i < getListModel().getSize():
- if getListModel().getElementAt(i).equals(object):
- setSelected(i)
- return
+ if self.rowSelect and (_object >= 0):
+ _object = (_object / self.cols) * self.cols
- i += 1
+ if self.selected == _object:
+ return
- setSelected(-1)
+ self.selected = _object
+ self.refreshImageText()
+ self.refreshSelection()
+ #COMMENTED
+ #self.fireItemSelected()
def refreshImageText(self):
if self.selected >= 0:
- item = getListModel().getElementAt(self.selected)
+ #COMMENTED
+ item = None #ImageList.listModel.getElementAt(self.selected)
else:
item = None
- Helper.setUnoPropertyValue(self.lblImageText.Model, PropertyNames.PROPERTY_LABEL, " " + self.renderer.render(item))
+ Helper.setUnoPropertyValue(
+ self.lblImageText.Model, PropertyNames.PROPERTY_LABEL,
+ " " + self.renderer.render(item))
def nextPage(self):
- if self.pageStart < getListModel().getSize() - self.rows * self.cols:
+ if self.pageStart < listModel().getSize() - self.rows * self.cols:
setPageStart(self.pageStart + self.rows * self.cols)
def prevPage(self):
@@ -292,55 +387,62 @@ class ImageList(object):
setPageStart(i)
def enableButtons(self):
- enable(self.btnNext, bool(self.pageStart + self.rows * self.cols < self.listModel.getSize()))
- enable(self.btnBack, bool(self.pageStart > 0))
+ self.enable(
+ ImageList.btnNext,
+ bool(self.pageStart + self.rows * self.cols < len(ImageList.listModel)))
+ self.enable(ImageList.btnBack, bool(self.pageStart > 0))
def enable(self, control, enable):
- Helper.setUnoPropertyValue(control.Model, PropertyNames.PROPERTY_ENABLED, enable)
+ Helper.setUnoPropertyValue(control.Model,
+ PropertyNames.PROPERTY_ENABLED, enable)
def setBorder(self, control, border):
Helper.setUnoPropertyValue(control.Model, "Border", border)
def getImageFromEvent(self, event):
image = (event).Source
- controlName = Helper.getUnoPropertyValue(image.Model, PropertyNames.PROPERTY_NAME)
+ controlName = Helper.getUnoPropertyValue(image.Model,
+ PropertyNames.PROPERTY_NAME)
return Integer.valueOf(controlName.substring(6 + self.name.length()))
def mousePressed(self, event):
image = getImageFromEvent(event)
index = getIndexFor(image)
- if index < self.listModel.getSize():
+ if index < ImageList.listModel.getSize():
focus(image)
setSelected(index)
def getSelectedObjects(self):
- return[getListModel().getElementAt(self.selected)]
+ return[listModel().getElementAt(self.selected)]
class SimpleCounterRenderer:
def render(self, counter):
- return "" + (counter).start + ".." + (counter).end + "/" + (counter).max
+ return \
+ "" + (counter).start + ".." + (counter).end + "/" + (counter).max
- '''class Counter:
+ class Counter(object):
- def __init__self, start_, end_, max_):
+ def __init__(self, start_, end_, max_):
self.start = start_
self.end = end_
- self.max = max_'''
+ self.max = max_
def getSelectedObject(self):
if self.selected >= 0:
- return getListModel().getElementAt(self.selected)
+ return listModel().getElementAt(self.selected)
return None
def showSelected(self):
oldPageStart = self.pageStart
if self.selected != -1:
- self.pageStart = (self.selected / self.m_aImages.length) * self.m_aImages.length
+ self.pageStart = \
+ (self.selected / len(self.m_aImages)) * len(self.m_aImages)
if oldPageStart != self.pageStart:
- enableButtons()
- refreshImages()
+ #COMMENTED
+ #self.enableButtons()
+ self.refreshImages()
def keyPressed(self, ke):
image = getImageFromEvent(ke)
@@ -355,54 +457,25 @@ class ImageList(object):
changeFocus(image, newImage)
def isFocusable(self, image):
- return (image >= 0) and (getIndexFor(image) < self.listModel.getSize())
+ return (image >= 0) and \
+ (getIndexFor(image) < ImageList.listModel.getSize())
def changeFocus(self, oldFocusImage, newFocusImage):
focus(newFocusImage)
defocus(oldFocusImage)
- def getKeyMove(self, ke, row, col):
- '''switch (ke.KeyCode)
- {
- case Key.UP:
- if (row > 0)
- {
- return 0 - getCols();
- }
- break;
- case Key.DOWN:
- if (row < getRows() - 1)
- {
- return getCols();
- }
- break;
- case Key.LEFT:
- if (col > 0)
- {
- return -1;
- }
- break;
- case Key.RIGHT:
- if (col < getCols() - 1)
- {
- return 1;
- }
- break;
- case Key.SPACE:
- select(ke);
- }
- return 0;'''
-
def select(self, ke):
setSelected(getIndexFor(getImageFromEvent(ke)))
def focus(self, image):
- Helper.setUnoPropertyValue(self.m_aImages[image].Model, "Tabstop", True)
+ Helper.setUnoPropertyValue(
+ self.m_aImages[image].Model, "Tabstop", True)
xWindow = self.m_aImages[image]
xWindow.setFocus()
def defocus(self, image):
- Helper.setUnoPropertyValue(self.m_aImages[image].Model, "Tabstop", False)
+ Helper.setUnoPropertyValue(
+ self.m_aImages[image].Model, "Tabstop", False)
'''jump to the given item (display the screen
that contains the given item).
@@ -411,7 +484,7 @@ class ImageList(object):
def display(self, i):
isAux = (getCols() * getRows())
- ps = (self.listModel.getSize() / isAux) * isAux
+ ps = (ImageList.listModel.getSize() / isAux) * isAux
setPageStart(ps)
def setenabled(self, b):
@@ -422,8 +495,8 @@ class ImageList(object):
UnoDialog2.setEnabled(self.grbxSelectedImage, b)
UnoDialog2.setEnabled(self.lblImageText, b)
if self.showButtons:
- UnoDialog2.setEnabled(self.btnBack, b)
- UnoDialog2.setEnabled(self.btnNext, b)
+ UnoDialog2.setEnabled(ImageList.btnBack, b)
+ UnoDialog2.setEnabled(ImageList.btnNext, b)
UnoDialog2.setEnabled(self.lblCounter, b)
self.benabled = b
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index 514978a..53519ec 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -262,7 +262,7 @@ class UnoDialog(object):
'''
def executeDialogFromParent(self, parent):
- return self.executeDialog(parent.xWindow.PosSize)
+ return self.executeDialog(parent.xUnoDialog.PosSize)
'''
@param XComponent
diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
index 8afef0a..483a569 100644
--- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
@@ -72,6 +72,7 @@ class UnoDataAware(DataAware):
checkBox.addItemListener(ItemListenerProcAdapter(method))
return uda
+ @classmethod
def attachLabel(self, data, prop, label, field):
return UnoDataAware(data, prop, label, PropertyNames.PROPERTY_LABEL)
diff --git a/wizards/com/sun/star/wizards/web/BackgroundsDialog.py b/wizards/com/sun/star/wizards/web/BackgroundsDialog.py
new file mode 100644
index 0000000..fad4a7c
--- /dev/null
+++ b/wizards/com/sun/star/wizards/web/BackgroundsDialog.py
@@ -0,0 +1,194 @@
+from ImageListDialog import *
+from WWHID import HID_BG
+from common.SystemDialog import SystemDialog
+from common.FileAccess import FileAccess
+
+class BackgroundsDialog(ImageListDialog):
+
+ def __init__(self, xmsf, set_, resources):
+ super(BackgroundsDialog, self).__init__(xmsf, HID_BG,
+ (resources.resBackgroundsDialog,
+ resources.resBackgroundsDialogCaption,
+ resources.resOK,
+ resources.resCancel,
+ resources.resHelp,
+ resources.resDeselect,
+ resources.resOther,
+ resources.resCounter))
+ self.sd = SystemDialog.createOpenDialog(xmsf)
+ self.sd.addFilter(
+ resources.resImages, "*.jpg;*.jpeg;*.jpe;*.gif", True)
+ self.sd.addFilter(resources.resAllFiles, "*.*", False)
+ self.settings = set_.root
+ self.fileAccess = FileAccess(xmsf)
+ #COMMENTED
+ #self.il.setListModel(Model(set_))
+ self.il.imageSize = Size (40, 40)
+ #self.il.setRenderer(BGRenderer (0))
+ self.build()
+
+ '''
+ trigered when the user clicks the "other" button.
+ opens a "file open" dialog, adds the selected
+ image to the list and to the web wizard configuration,
+ and then jumps to the new image, selecting it in the list.
+ @see add(String)
+ '''
+
+ def other(self):
+ filename = self.sd.callOpenDialog(
+ False, self.settings.cp_DefaultSession.cp_InDirectory)
+ if filename != None and filename.length > 0 and filename[0] != None:
+ self.settings.cp_DefaultSession.cp_InDirectory = \
+ FileAccess.getParentDir(filename[0])
+ i = add(filename[0])
+ il.setSelected(i)
+ il.display(i)
+
+ '''
+ adds the given image to the image list (to the model)
+ and to the web wizard configuration.
+ @param s
+ @return
+ '''
+
+ def add(self, s):
+ #first i check the item does not already exists in the list...
+ i = 0
+ while i < il.getListModel().getSize():
+ if il.getListModel().getElementAt(i).equals(s):
+ return i
+
+ i += 1
+ il.getListModel().addElement(s)
+ try:
+ configView = Configuration.getConfigurationRoot(
+ self.xMSF, FileAccess.connectURLs(
+ WebWizardConst.CONFIG_PATH, "BackgroundImages"), True)
+ i = Configuration.getChildrenNames(configView).length + 1
+ o = Configuration.addConfigNode(configView, "" + i)
+ Configuration.set(s, "Href", o)
+ Configuration.commit(configView)
+ except Exception, ex:
+ ex.printStackTrace()
+
+ return il.getListModel().getSize() - 1
+
+ '''
+ an ImageList Imagerenderer implemtation.
+ The image URL is the object given from the list model.
+ the image name, got from the "render" method is
+ the filename portion of the url.
+ @author rpiterman
+ '''
+
+ class BGRenderer(object):
+
+ def __init__(self, cut_):
+ ImageListDialog.ImageListDialog_body()
+ self.cut = cut_
+
+ def getImageUrls(self, listItem):
+ if listItem != None:
+ sRetUrls = range(1)
+ sRetUrls[0] = listItem
+ return sRetUrls
+
+ return None
+
+ def render(self, _object):
+ if _object is None:
+ return ""
+ else:
+ return FileAccess.getPathFilename(
+ self.fileAccess.getPath(_object, None))
+
+ '''
+ This is a list model for the image list of the
+ backgrounds dialog.
+ It takes the Backgrounds config set as an argument,
+ and "parses" it to a list of files:
+ It goes through each image in the set, and checks it:
+ if it is a directory it lists all image files in this directory.
+ if it is a file, it adds the file to the list.
+ @author rpiterman
+ '''
+
+ class Model(object):
+ '''
+ constructor. </br>
+ see class description for a description of
+ the handling of the given model
+ @param model the configuration set of the background images.
+ '''
+
+ def __init__(self, model):
+ try:
+ i = 0
+ while i < model.getSize():
+ image = model.getElementAt(i)
+ path = self.sd.xStringSubstitution.substituteVariables(
+ image.cp_Href, False)
+ if self.fileAccess.exists(path, False):
+ addDir(path)
+ else:
+ remove(model.getKey(image))
+
+ i += 1
+ except Exception, ex:
+ ex.printStackTrace()
+
+ '''
+ when instanciating the model, it checks if each image
+ exists. If it doesnot, it will be removed from
+ the configuration.
+ This is what this method does...
+ @param imageName
+ '''
+
+ def remove(self, imageName):
+ try:
+ conf = Configuration.getConfigurationRoot(
+ self.xMSF, WebWizardConst.CONFIG_PATH + "/BackgroundImages",
+ True)
+ Configuration.removeNode(conf, imageName)
+ except Exception, ex:
+ ex.printStackTrace()
+
+ '''
+ if the given url is a directory
+ adds the images in the given directory,
+ otherwise (if it is a file) adds the file to the list.
+ @param url
+ '''
+
+ def addDir(self, url):
+ if self.fileAccess.isDirectory(url):
+ add(self.fileAccess.listFiles(url, False))
+ else:
+ add(url)
+
+ '''
+ adds the given filenames (urls) to
+ the list
+ @param filenames
+ '''
+
+ def add(self, filenames):
+ i = 0
+ while i < filenames.length:
+ add(filenames[i])
+ i += 1
+
+ '''
+ adds the given image url to the list.
+ if and only if it ends with jpg, jpeg or gif
+ (case insensitive)
+ @param filename image url.
+ '''
+
+ def add(self, filename):
+ lcase = filename.toLowerCase()
+ if lcase.endsWith("jpg") or lcase.endsWith("jpeg") or \
+ lcase.endsWith("gif"):
+ Model.this.addElement(filename)
diff --git a/wizards/com/sun/star/wizards/web/IconsDialog.py b/wizards/com/sun/star/wizards/web/IconsDialog.py
new file mode 100644
index 0000000..cc9ef11
--- /dev/null
+++ b/wizards/com/sun/star/wizards/web/IconsDialog.py
@@ -0,0 +1,96 @@
+from ImageListDialog import *
+from WWHID import HID_IS
+from common.FileAccess import FileAccess
+
+'''
+ at author rpiterman
+The dialog class for choosing an icon set.
+This class simulates a model, though it does not functions really as one,
+since it does not cast events.
+It also implements the ImageList.ImageRenderer interface, to handle
+its own objects.
+'''
+
+class IconsDialog(ImageListDialog):
+
+ def __init__(self, xmsf, set_, resources):
+ super(IconsDialog, self).__init__(xmsf, HID_IS,
+ (resources.resIconsDialog,
+ resources.resIconsDialogCaption,
+ resources.resOK,
+ resources.resCancel,
+ resources.resHelp,
+ resources.resDeselect,
+ resources.resOther,
+ resources.resCounter))
+ self.htmlexpDirectory = FileAccess.getOfficePath2(
+ xmsf, "Gallery", "share", "")
+ self.icons = \
+ ["firs", "prev", "next", "last", "nav", "text", "up", "down"]
+ self.set = set_
+ self.objects = (self.set.getSize() * len(self.icons),)
+
+ self.il.listModel = self
+ self.il.renderer = self
+ self.il.rows = 4
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list