[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - 234 commits - accessibility/inc accessibility/prj accessibility/source automation/inc automation/prj automation/source basctl/inc basctl/prj basctl/sdi basctl/source basctl/uiconfig bean/com bean/native bean/prj crashrep/prj cui/Library_cui.mk cui/source embedserv/prj embedserv/source extensions/prj extensions/source extensions/test forms/Library_frm.mk forms/qa forms/source lingucomponent/prj lingucomponent/source MathMLDTD/prj package/inc package/prj package/qa package/source setup_native/prj setup_native/source UnoControls/prj wizards/com wizards/prj wizards/source xmlsecurity/inc xmlsecurity/prj xmlsecurity/qa xmlsecurity/source xmlsecurity/test_docs xmlsecurity/util
Xisco Fauli
xfauli at kemper.freedesktop.org
Tue Jul 12 08:41:48 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 | 42
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 | 26
automation/source/server/cmdbasestream.cxx | 158 -
automation/source/server/recorder.cxx | 26
automation/source/server/retstrm.cxx | 8
automation/source/server/retstrm.hxx | 22
automation/source/server/scmdstrm.cxx | 24
automation/source/server/scmdstrm.hxx | 4
automation/source/server/sta_list.cxx | 9
automation/source/server/statemnt.cxx | 375 +-
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 | 46
automation/source/testtool/cmdstrm.hxx | 12
automation/source/testtool/cretstrm.hxx | 4
automation/source/testtool/httprequest.cxx | 41
automation/source/testtool/httprequest.hxx | 24
automation/source/testtool/makefile.mk | 2
automation/source/testtool/objtest.cxx | 165 -
automation/source/testtool/tcommuni.cxx | 6
automation/source/testtool/testtool.ini | 1
basctl/inc/basidesh.hrc | 1
basctl/prj/d.lst | 40
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
basctl/uiconfig/basicide/toolbar/findbar.xml | 8
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 | 247 -
cui/source/dialogs/about.hrc | 7
cui/source/dialogs/about.src | 10
cui/source/dialogs/cuigaldlg.cxx | 180 -
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 | 3
cui/source/inc/about.hxx | 13
cui/source/inc/chardlg.hxx | 8
cui/source/inc/cuigaldlg.hxx | 194 -
cui/source/inc/cuitabline.hxx | 89
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/border.cxx | 15
cui/source/tabpages/chardlg.cxx | 288 -
cui/source/tabpages/numpages.cxx | 9
cui/source/tabpages/page.cxx | 17
cui/source/tabpages/tpline.cxx | 27
embedserv/prj/build.lst | 2
embedserv/prj/d.lst | 4
embedserv/source/inc/embservconst.h | 2
extensions/prj/build.lst | 8
extensions/prj/d.lst | 103
extensions/source/abpilot/abpservices.cxx | 3
extensions/source/dbpilots/dbpservices.cxx | 3
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/preload/makefile.mk | 93
extensions/source/preload/modulepreload.cxx | 34
extensions/source/preload/oemwiz.cxx | 445 ---
extensions/source/preload/oemwiz.hxx | 156 -
extensions/source/preload/preload.component | 34
extensions/source/preload/preload.hrc | 58
extensions/source/preload/preload.src | 290 -
extensions/source/preload/preloadservices.cxx | 73
extensions/source/preload/preloadservices.hxx | 57
extensions/source/preload/services.cxx | 87
extensions/source/preload/unoautopilot.hxx | 109
extensions/source/preload/unoautopilot.inl | 128
extensions/source/propctrlr/eventhandler.cxx | 3
extensions/source/propctrlr/pcrservices.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
extensions/test/sax/exports.dxp | 2
extensions/test/sax/factory.hxx | 33
extensions/test/sax/makefile.mk | 64
extensions/test/sax/testsax.cxx | 902 ------
extensions/test/sax/testwriter.cxx | 758 -----
forms/Library_frm.mk | 7
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 | 16
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 4
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 19
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 | 44
package/inc/ZipPackageEntry.hxx | 106
package/inc/ZipPackageFolder.hxx | 4
package/inc/ZipPackageStream.hxx | 218 +
package/prj/d.lst | 22
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 | 575 ++-
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 | 102
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/agenda/AgendaTemplate.java | 135
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java | 112
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 31
wizards/com/sun/star/wizards/agenda/CGAgenda.java | 5
wizards/com/sun/star/wizards/agenda/CGTopic.java | 3
wizards/com/sun/star/wizards/agenda/CallWizard.java | 5
wizards/com/sun/star/wizards/agenda/TopicsControl.java | 52
wizards/com/sun/star/wizards/common/ConfigSet.java | 4
wizards/com/sun/star/wizards/common/Configuration.java | 45
wizards/com/sun/star/wizards/common/Desktop.java | 80
wizards/com/sun/star/wizards/common/FileAccess.java | 180 -
wizards/com/sun/star/wizards/common/FileAccess.py | 4
wizards/com/sun/star/wizards/common/HelpIds.java | 726 ++--
wizards/com/sun/star/wizards/common/Helper.java | 49
wizards/com/sun/star/wizards/common/JavaTools.java | 59
wizards/com/sun/star/wizards/common/NamedValueCollection.java | 2
wizards/com/sun/star/wizards/common/NumberFormatter.java | 14
wizards/com/sun/star/wizards/common/NumericalHelper.java | 45
wizards/com/sun/star/wizards/common/PropertyNames.java | 19
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 6
wizards/com/sun/star/wizards/common/Resource.py | 1
wizards/com/sun/star/wizards/common/SystemDialog.java | 35
wizards/com/sun/star/wizards/common/UCB.java | 24
wizards/com/sun/star/wizards/common/XMLHelper.java | 2
wizards/com/sun/star/wizards/db/BlindtextCreator.java | 10
wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 8
wizards/com/sun/star/wizards/db/CommandMetaData.java | 938 +++---
wizards/com/sun/star/wizards/db/CommandName.java | 45
wizards/com/sun/star/wizards/db/DBMetaData.java | 93
wizards/com/sun/star/wizards/db/FieldColumn.java | 39
wizards/com/sun/star/wizards/db/QueryMetaData.java | 33
wizards/com/sun/star/wizards/db/RecordParser.java | 23
wizards/com/sun/star/wizards/db/RelationController.java | 7
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 161 -
wizards/com/sun/star/wizards/db/TableDescriptor.java | 42
wizards/com/sun/star/wizards/db/TypeInspector.java | 34
wizards/com/sun/star/wizards/document/Control.java | 12
wizards/com/sun/star/wizards/document/DatabaseControl.java | 12
wizards/com/sun/star/wizards/document/FormHandler.java | 137
wizards/com/sun/star/wizards/document/GridControl.java | 2
wizards/com/sun/star/wizards/document/OfficeDocument.java | 72
wizards/com/sun/star/wizards/document/OfficeDocument.py | 4
wizards/com/sun/star/wizards/document/Shape.java | 10
wizards/com/sun/star/wizards/document/TimeStampControl.java | 11
wizards/com/sun/star/wizards/fax/CallWizard.java | 5
wizards/com/sun/star/wizards/fax/FaxDocument.java | 27
wizards/com/sun/star/wizards/fax/FaxWizardDialog.java | 128
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 11
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 79
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 17
wizards/com/sun/star/wizards/form/CallFormWizard.java | 5
wizards/com/sun/star/wizards/form/DataEntrySetter.java | 26
wizards/com/sun/star/wizards/form/FieldLinker.java | 81
wizards/com/sun/star/wizards/form/Finalizer.java | 12
wizards/com/sun/star/wizards/form/FormConfiguration.java | 28
wizards/com/sun/star/wizards/form/FormControlArranger.java | 395 +-
wizards/com/sun/star/wizards/form/FormDocument.java | 40
wizards/com/sun/star/wizards/form/FormWizard.java | 72
wizards/com/sun/star/wizards/form/StyleApplier.java | 46
wizards/com/sun/star/wizards/form/UIControlArranger.java | 51
wizards/com/sun/star/wizards/letter/CallWizard.java | 5
wizards/com/sun/star/wizards/letter/LetterDocument.java | 43
wizards/com/sun/star/wizards/letter/LetterDocument.py | 56
wizards/com/sun/star/wizards/letter/LetterWizardDialog.java | 184 -
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 204 -
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 139
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 131
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 12
wizards/com/sun/star/wizards/query/Finalizer.java | 25
wizards/com/sun/star/wizards/query/QuerySummary.java | 81
wizards/com/sun/star/wizards/query/QueryWizard.java | 88
wizards/com/sun/star/wizards/report/CallReportWizard.java | 22
wizards/com/sun/star/wizards/report/DBColumn.java | 30
wizards/com/sun/star/wizards/report/Dataimport.java | 35
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 12
wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java | 8
wizards/com/sun/star/wizards/report/RecordTable.java | 12
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 36
wizards/com/sun/star/wizards/report/ReportLayouter.java | 40
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 190 -
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 75
wizards/com/sun/star/wizards/report/ReportWizard.java | 87
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java | 119
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java | 3
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java | 17
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 372 +-
wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java | 3
wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java | 3
wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java | 3
wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java | 44
wizards/com/sun/star/wizards/table/CGCategory.java | 5
wizards/com/sun/star/wizards/table/CallTableWizard.java | 9
wizards/com/sun/star/wizards/table/FieldDescription.java | 14
wizards/com/sun/star/wizards/table/FieldFormatter.java | 83
wizards/com/sun/star/wizards/table/Finalizer.java | 42
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 50
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 32
wizards/com/sun/star/wizards/table/TableWizard.java | 20
wizards/com/sun/star/wizards/text/TextDocument.java | 102
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 39
wizards/com/sun/star/wizards/text/TextFrameHandler.java | 5
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 37
wizards/com/sun/star/wizards/text/TextStyleHandler.java | 15
wizards/com/sun/star/wizards/text/TextTableHandler.java | 29
wizards/com/sun/star/wizards/text/ViewHandler.java | 18
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 47
wizards/com/sun/star/wizards/ui/ButtonList.java | 38
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 52
wizards/com/sun/star/wizards/ui/ControlScroller.java | 30
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 18
wizards/com/sun/star/wizards/ui/DocumentPreview.java | 17
wizards/com/sun/star/wizards/ui/FieldSelection.java | 58
wizards/com/sun/star/wizards/ui/FilterComponent.java | 131
wizards/com/sun/star/wizards/ui/ImageList.java | 42
wizards/com/sun/star/wizards/ui/PathSelection.java | 14
wizards/com/sun/star/wizards/ui/PeerConfig.java | 10
wizards/com/sun/star/wizards/ui/SortingComponent.java | 59
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 8
wizards/com/sun/star/wizards/ui/UIConsts.java | 16
wizards/com/sun/star/wizards/ui/UnoDialog.java | 195 -
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 24
wizards/com/sun/star/wizards/ui/WizardDialog.java | 53
wizards/com/sun/star/wizards/ui/WizardDialog.py | 18
wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 2
wizards/com/sun/star/wizards/ui/event/DataAware.java | 6
wizards/com/sun/star/wizards/ui/event/DataAware.py | 2
wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 14
wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 19
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java | 7
wizards/com/sun/star/wizards/ui/event/RadioDataAware.java | 4
wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java | 2
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 20
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py | 2
wizards/com/sun/star/wizards/web/BackgroundsDialog.java | 5
wizards/com/sun/star/wizards/web/CallWizard.java | 7
wizards/com/sun/star/wizards/web/FTPDialog.java | 69
wizards/com/sun/star/wizards/web/IconsDialog.java | 5
wizards/com/sun/star/wizards/web/ImageListDialog.java | 22
wizards/com/sun/star/wizards/web/LogTaskListener.java | 3
wizards/com/sun/star/wizards/web/Process.java | 19
wizards/com/sun/star/wizards/web/StatusDialog.java | 14
wizards/com/sun/star/wizards/web/StylePreview.java | 5
wizards/com/sun/star/wizards/web/TOCPreview.java | 5
wizards/com/sun/star/wizards/web/WWD_Events.java | 50
wizards/com/sun/star/wizards/web/WWD_General.java | 6
wizards/com/sun/star/wizards/web/WWD_Startup.java | 28
wizards/com/sun/star/wizards/web/WebWizardDialog.java | 204 -
wizards/com/sun/star/wizards/web/data/CGDesign.java | 2
wizards/com/sun/star/wizards/web/data/CGDocument.java | 80
wizards/com/sun/star/wizards/web/data/CGExporter.java | 5
wizards/com/sun/star/wizards/web/data/CGPublish.java | 5
wizards/com/sun/star/wizards/web/data/CGSettings.java | 10
wizards/com/sun/star/wizards/web/data/CGStyle.java | 4
wizards/com/sun/star/wizards/web/export/AbstractExporter.java | 6
wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java | 6
wizards/prj/build.lst | 2
wizards/prj/d.lst | 44
wizards/source/importwizard/FilesModul.xba | 1
wizards/source/tools/Misc.xba | 15
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 4
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 7
xmlsecurity/prj/build.lst | 3
xmlsecurity/prj/d.lst | 26
xmlsecurity/qa/certext/SanCertExt.cxx | 281 +
xmlsecurity/qa/certext/User_35_Root_11.crt | 64
xmlsecurity/qa/certext/export.map | 34
xmlsecurity/qa/certext/makefile.mk | 71
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 | 74
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 74
xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 34
xmlsecurity/source/xmlsec/saxhelper.cxx | 30
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
468 files changed, 11360 insertions(+), 16276 deletions(-)
New commits:
commit a9eda0eb4c8d40919feb6c9d47ff106afe1879a7
Author: Xisco Fauli <anistenis at gmail.com>
Date: Tue Jul 12 00:59:26 2011 +0200
fdo#37290: migrate Basic to new resource service
diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 7eca466..faa0f80 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -271,14 +271,18 @@ End Sub
Function InitResources(Description, ShortDescription as String) as boolean
+Dim xResource as Object
+Dim aArgs(0) as String
On Error Goto ErrorOcurred
- oResSrv = createUnoService( "com.sun.star.resource.VclStringResourceLoader" )
- If (IsNull(oResSrv)) then
+ aArgs(0) = ShortDescription
+ oConfigProvider = createUnoService("com.sun.star.configuration.ConfigurationProvider")
+ xResource = getProcessServiceManager().createInstanceWithArguments( "org.libreoffice.resource.ResourceIndexAccess", aArgs() )
+ If (IsNull(xResource)) then
InitResources = FALSE
- MsgBox( Description & ": No resource loader found", 16, GetProductName())
+ MsgBox("could not initialize ResourceIndexAccess")
Else
InitResources = TRUE
- oResSrv.FileName = ShortDescription
+ oResSrv = xResource.getByName( "String" )
End If
Exit Function
ErrorOcurred:
@@ -294,7 +298,7 @@ End Function
Function GetResText( nID as integer ) As string
On Error Goto ErrorOcurred
If Not IsNull(oResSrv) Then
- GetResText = oResSrv.getString( nID )
+ GetResText = oResSrv.getByIndex( nID )
Else
GetResText = ""
End If
@@ -814,4 +818,4 @@ End Sub
Function CalIsLeapYear(ByVal iYear as Integer) as Boolean
CalIsLeapYear = ((iYear Mod 4 = 0) And ((iYear Mod 100 <> 0) Or (iYear Mod 400 = 0)))
End Function
-</script:module>
\ No newline at end of file
+</script:module>
commit 7d23e260cce288878b61e78a1db523b7678ba299
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Sat Jul 2 17:26:05 2011 +0200
Move methods from component_getImplementationEnviron to component_getFactory
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 8703dc8..ef519a3 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -61,7 +61,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
uno_Environment ** /*ppEnv*/
)
{
- abp_initializeModule();
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -71,6 +70,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
void* pServiceManager,
void* /*pRegistryKey*/)
{
+ abp_initializeModule();
+
Reference< XInterface > xRet;
if (pServiceManager && pImplementationName)
{
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 0600af0..97eb697 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -65,7 +65,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
uno_Environment ** /*ppEnv*/
)
{
- dbp_initializeModule();
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -75,6 +74,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
void* pServiceManager,
void* /*pRegistryKey*/)
{
+ dbp_initializeModule();
+
Reference< XInterface > xRet;
if (pServiceManager && pImplementationName)
{
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 90ddc35..b85e344 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -97,7 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
uno_Environment ** /*ppEnv*/
)
{
- pcr_initializeModule();
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -107,6 +106,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
void* pServiceManager,
void* /*pRegistryKey*/)
{
+ pcr_initializeModule();
+
Reference< XInterface > xRet;
if (pServiceManager && pImplementationName)
{
commit d9a8459a5e80e648440a71a245809736b77b88e1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:52:41 2011 +0100
callcatcher: remove unused TpBorderRGBColor
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 9e29eba..a13cb49 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -88,21 +88,6 @@ static sal_uInt16 pRanges[] =
sal_Bool SvxBorderTabPage::bSync = sal_True;
-//------------------------------------------------------------------------
-
-#define RGBCOL(eColorName) (TpBorderRGBColor(eColorName))
-
-// LOKALE FUNKTION
-// Konvertiert in echte RGB-Farben, damit in den Listboxen
-// endlich mal richtig selektiert werden kann.
-
-Color TpBorderRGBColor( ColorData aColorData )
-{
- Color aRGBColor( aColorData );
-
- return( aRGBColor );
-}
-
// -----------------------------------------------------------------------
void lcl_SetDecimalDigitsTo1(MetricField& rField)
{
commit 0245c6d17aa378e2d563ce0a50ee8ce14517f195
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 00:26:10 2011 +0100
callcatcher: remove unused xmlchar_to_ous
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index 1af8b9e..8a8a00b 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -65,21 +65,6 @@ xmlChar* ous_to_nxmlstr( const rtl::OUString& oustr, int& length )
}
/**
- * The input parameter isn't necessaryly NULL terminated.
- */
-rtl::OUString xmlchar_to_ous( const xmlChar* pChar, int length )
-{
- if( pChar != NULL )
- {
- return rtl::OUString( ( sal_Char* )pChar , length , RTL_TEXTENCODING_UTF8 ) ;
- }
- else
- {
- return rtl::OUString() ;
- }
-}
-
-/**
* The return value and the referenced value must be NULL terminated.
* The application has the responsibilty to deallocte the return value.
*/
commit 7f8fd4372bba6fde150d32ad07ca96b032d077e1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jul 9 18:40:58 2011 +0200
Remove unused test/sax
diff --git a/extensions/test/sax/exports.dxp b/extensions/test/sax/exports.dxp
deleted file mode 100644
index e4bc69d..0000000
--- a/extensions/test/sax/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-exService_writeRegEntry
-exService_getFactory
diff --git a/extensions/test/sax/factory.hxx b/extensions/test/sax/factory.hxx
deleted file mode 100644
index a2d22ac..0000000
--- a/extensions/test/sax/factory.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-XInterfaceRef OSaxWriterTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
-UString OSaxWriterTest_getServiceName( ) THROWS( () );
-UString OSaxWriterTest_getImplementationName( ) THROWS( () );
-Sequence<UString> OSaxWriterTest_getSupportedServiceNames( ) THROWS( () );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/sax/makefile.mk b/extensions/test/sax/makefile.mk
deleted file mode 100644
index 62e2706..0000000
--- a/extensions/test/sax/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=extensions
-TARGET=testsax
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-
-
-OBJFILES = $(SLO)$/testsax.obj $(SLO)$/testwriter.obj
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(OBJFILES)
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(SALLIB) \
- $(TOOLSLIB)
-
-SHL1LIBS= $(LIB1TARGET)
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= makefile.mk $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
deleted file mode 100644
index 8f3ef90..0000000
--- a/extensions/test/sax/testsax.cxx
+++ /dev/null
@@ -1,902 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-
-#include <stdio.h>
-#include <string.h>
-#include <smart/com/sun/star/test/XSimpleTest.hxx>
-
-#include <rtl/wstring.hxx>
-#include <osl/time.h>
-#include <usr/weak.hxx>
-#include <tools/string.hxx>
-#include <osl/conditn.hxx>
-
-#include <smart/com/sun/star/io/XOutputStream.hxx>
-#include <smart/com/sun/star/xml/sax/SAXParseException.hxx>
-#include <smart/com/sun/star/xml/sax/XParser.hxx>
-#include <smart/com/sun/star/xml/sax/XExtendedDocumentHandler.hxx>
-
-#include <smart/com/sun/star/lang/XMultiServiceFactory.hxx> // for the multiservice-factories
-#include <usr/factoryhlp.hxx>
-
-#include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE
-
-#include "factory.hxx"
-
-using namespace usr;
-
-#define BUILD_ERROR(expr, Message)\
- {\
- m_seqErrors.realloc( m_seqErrors.getLen() + 1 ); \
- m_seqExceptions.realloc( m_seqExceptions.getLen() + 1 ); \
- String str; \
- str += __FILE__;\
- str += " "; \
- str += "(" ; \
- str += __LINE__ ;\
- str += ")\n";\
- str += "[ " ; \
- str += #expr; \
- str += " ] : " ; \
- str += Message; \
- m_seqErrors.getArray()[ m_seqErrors.getLen()-1] = StringToUString( str , CHARSET_SYSTEM ); \
- }\
- ((void)0)
-
-
-#define WARNING_ASSERT(expr, Message) \
- if( ! (expr) ) { \
- m_seqWarnings.realloc( m_seqErrors.getLen() +1 ); \
- String str;\
- str += __FILE__;\
- str += " "; \
- str += "(" ; \
- str += __LINE__ ;\
- str += ")\n";\
- str += "[ " ; \
- str += #expr; \
- str += " ] : " ; \
- str += Message; \
- m_seqWarnings.getArray()[ m_seqWarnings.getLen()-1] = StringToUString( str , CHARSET_SYSTEM ); \
- return; \
- }\
- ((void)0)
-
-#define ERROR_ASSERT(expr, Message) \
- if( ! (expr) ) { \
- BUILD_ERROR(expr, Message );\
- return; \
- }\
- ((void)0)
-
-#define ERROR_EXCEPTION_ASSERT(expr, Message, Exception) \
- if( !(expr)) { \
- BUILD_ERROR(expr,Message);\
- m_seqExceptions.getArray()[ m_seqExceptions.getLen()-1] = UsrAny( Exception );\
- return; \
- } \
- ((void)0)
-
-/****
-* test szenarios :
-****/
-
-
-class OSaxParserTest :
- public XSimpleTest,
- public OWeakObject
-{
-public:
- OSaxParserTest( const XMultiServiceFactoryRef & rFactory ) : m_rFactory( rFactory )
- {
-
- }
-
-public: // refcounting
- BOOL queryInterface( Uik aUik, XInterfaceRef & rOut );
- void acquire() { OWeakObject::acquire(); }
- void release() { OWeakObject::release(); }
- void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
-
-public:
- virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
- THROWS( ( IllegalArgumentException,
- UsrSystemException) );
-
- virtual INT32 test( const UString& TestName,
- const XInterfaceRef& TestObject,
- INT32 hTestHandle) THROWS( ( IllegalArgumentException,
- UsrSystemException) );
-
- virtual BOOL testPassed(void) THROWS( ( UsrSystemException) );
- virtual Sequence< UString > getErrors(void) THROWS( (UsrSystemException) );
- virtual Sequence< UsrAny > getErrorExceptions(void) THROWS( (UsrSystemException) );
- virtual Sequence< UString > getWarnings(void) THROWS( (UsrSystemException) );
-
-private:
- void testSimple( const XParserRef &r );
- void testNamespaces( const XParserRef &r );
- void testFile( const XParserRef &r );
- void testEncoding( const XParserRef &rParser );
- void testPerformance( const XParserRef &rParser );
-
-private:
- Sequence<UsrAny> m_seqExceptions;
- Sequence<UString> m_seqErrors;
- Sequence<UString> m_seqWarnings;
- XMultiServiceFactoryRef m_rFactory;
-};
-
-
-
-/**
-* for external binding
-**/
-XInterfaceRef OSaxParserTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
-{
- OSaxParserTest *p = new OSaxParserTest( rSMgr );
- XInterfaceRef xService = *p;
- return xService;
-}
-
-
-UString OSaxParserTest_getServiceName( ) THROWS( () )
-{
- return L"test.com.sun.star.xml.sax.Parser";
-}
-
-UString OSaxParserTest_getImplementationName( ) THROWS( () )
-{
- return L"test.extensions.xml.sax.Parser";
-}
-
-Sequence<UString> OSaxParserTest_getSupportedServiceNames( ) THROWS( () )
-{
- Sequence<UString> aRet(1);
-
- aRet.getArray()[0] = OSaxParserTest_getImplementationName( );
-
- return aRet;
-}
-
-
-BOOL OSaxParserTest::queryInterface( Uik uik , XInterfaceRef &rOut )
-{
- if( XSimpleTest::getSmartUik() == uik ) {
- rOut = (XSimpleTest *) this;
- }
- else {
- return OWeakObject::queryInterface( uik , rOut );
- }
- return TRUE;
-}
-
-
-void OSaxParserTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
- THROWS( ( IllegalArgumentException,
- UsrSystemException) )
-{
- if( L"com.sun.star.xml.sax.Parser" == TestName ) {
- XParserRef parser( TestObject , USR_QUERY );
-
- ERROR_ASSERT( parser.is() , "XDataInputStream cannot be queried" );
- }
-}
-
-
-INT32 OSaxParserTest::test( const UString& TestName,
- const XInterfaceRef& TestObject,
- INT32 hTestHandle) THROWS( ( IllegalArgumentException,
- UsrSystemException) )
-{
- if( L"com.sun.star.xml.sax.Parser" == TestName ) {
- try {
- if( 0 == hTestHandle ) {
- testInvariant( TestName , TestObject );
- }
- else {
-
- XParserRef parser( TestObject , USR_QUERY );
-
- if( 1 == hTestHandle ) {
- testSimple( parser );
- }
- else if( 2 == hTestHandle ) {
- testNamespaces( parser );
- }
- else if( 3 == hTestHandle ) {
- testEncoding( parser );
- }
- else if( 4 == hTestHandle ) {
- testFile( parser );
- }
- else if( 5 == hTestHandle ) {
- testPerformance( parser );
- }
- }
- }
- catch( Exception& e ) {
- BUILD_ERROR( 0 , UStringToString( e.getName() , CHARSET_SYSTEM ).GetCharStr() );
- }
- catch(...) {
- BUILD_ERROR( 0 , "unknown exception (Exception is not base class)" );
- }
-
- hTestHandle ++;
-
- if( hTestHandle >= 6) {
- // all tests finished.
- hTestHandle = -1;
- }
- }
- else {
- BUILD_ERROR( 0 , "service not supported by test." );
- }
- return hTestHandle;
-}
-
-
-
-BOOL OSaxParserTest::testPassed(void) THROWS( (UsrSystemException) )
-{
- return m_seqErrors.getLen() == 0;
-}
-
-
-Sequence< UString > OSaxParserTest::getErrors(void) THROWS( (UsrSystemException) )
-{
- return m_seqErrors;
-}
-
-
-Sequence< UsrAny > OSaxParserTest::getErrorExceptions(void) THROWS( (UsrSystemException) )
-{
- return m_seqExceptions;
-}
-
-
-Sequence< UString > OSaxParserTest::getWarnings(void) THROWS( (UsrSystemException) )
-{
- return m_seqWarnings;
-}
-
-XInputStreamRef createStreamFromSequence( const Sequence<BYTE> seqBytes , XMultiServiceFactoryRef &xSMgr )
-{
- XInterfaceRef xOutStreamService = xSMgr->createInstance( L"com.sun.star.io.Pipe" );
- OSL_ASSERT( xOutStreamService.is() );
- XOutputStreamRef rOutStream( xOutStreamService , USR_QUERY );
- OSL_ASSERT( rOutStream.is() );
-
- XInputStreamRef rInStream( xOutStreamService , USR_QUERY );
- OSL_ASSERT( rInStream.is() );
-
- rOutStream->writeBytes( seqBytes );
- rOutStream->flush();
- rOutStream->closeOutput();
-
- return rInStream;
-}
-
-XInputStreamRef createStreamFromFile( const char *pcFile , XMultiServiceFactoryRef &xSMgr )
-{
- FILE *f = fopen( pcFile , "rb" );
- XInputStreamRef r;
-
- if( f ) {
- fseek( f , 0 , SEEK_END );
- int nLength = ftell( f );
- fseek( f , 0 , SEEK_SET );
-
- Sequence<BYTE> seqIn(nLength);
- fread( seqIn.getArray() , nLength , 1 , f );
-
- r = createStreamFromSequence( seqIn , xSMgr );
- fclose( f );
- }
- return r;
-}
-
-
-
-
-
-
-
-
-
-#define PCHAR_TO_USTRING(x) StringToUString(String(x),CHARSET_PC_1252)
-#define USTRING_TO_PCHAR(x) UStringToString(x,CHARSET_PC_437).GetStr()
-
-
-
-class TestDocumentHandler :
- public XExtendedDocumentHandler,
- public XEntityResolver,
- public XErrorHandler,
- public OWeakObject
-{
-public:
- TestDocumentHandler( XMultiServiceFactoryRef &r , BOOL bPrint )
- {
- m_xSMgr = r;
- m_bPrint = bPrint;
- }
-
-
-public:
- BOOL queryInterface( Uik aUik, XInterfaceRef & rOut );
- void acquire() { OWeakObject::acquire(); }
- void release() { OWeakObject::release(); }
- void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
-
-
-public: // Error handler
- virtual void error(const UsrAny& aSAXParseException) THROWS( (SAXException, UsrSystemException) )
- {
- printf( "Error !\n" );
- THROW( SAXException( L"error from error handler" , XInterfaceRef() , aSAXParseException ) );
- }
- virtual void fatalError(const UsrAny& aSAXParseException) THROWS( (SAXException, UsrSystemException) )
- {
- printf( "Fatal Error !\n" );
- }
- virtual void warning(const UsrAny& aSAXParseException) THROWS( (SAXException, UsrSystemException) )
- {
- printf( "Warning !\n" );
- }
-
-
-public: // ExtendedDocumentHandler
-
- virtual void startDocument(void) THROWS( (SAXException, UsrSystemException) )
- {
- m_iLevel = 0;
- m_iElementCount = 0;
- m_iAttributeCount = 0;
- m_iWhitespaceCount =0;
- m_iCharCount=0;
- if( m_bPrint ) {
- printf( "document started\n" );
- }
- }
- virtual void endDocument(void) THROWS( (SAXException, UsrSystemException) )
- {
- if( m_bPrint ) {
- printf( "document finished\n" );
- printf( "(ElementCount %d),(AttributeCount %d),(WhitespaceCount %d),(CharCount %d)\n",
- m_iElementCount, m_iAttributeCount, m_iWhitespaceCount , m_iCharCount );
- }
- }
- virtual void startElement(const UString& aName, const XAttributeListRef& xAttribs)
- THROWS( (SAXException,UsrSystemException) )
- {
-
- if( m_rLocator.is() ) {
- if( m_bPrint )
- printf( "%s(%d):" , USTRING_TO_PCHAR( m_rLocator->getSystemId() ) ,
- m_rLocator->getLineNumber() );
- }
- if( m_bPrint ) {
- int i;
- for( i = 0; i < m_iLevel ; i ++ ) {
- printf( " " );
- }
- printf( "<%s> " , USTRING_TO_PCHAR( aName ) );
-
- for( i = 0 ; i < xAttribs->getLength() ; i ++ ) {
- printf( "(%s,%s,'%s')" , USTRING_TO_PCHAR( xAttribs->getNameByIndex( i ) ) ,
- USTRING_TO_PCHAR( xAttribs->getTypeByIndex( i ) ) ,
- USTRING_TO_PCHAR( xAttribs->getValueByIndex( i ) ) );
- }
- printf( "\n" );
- }
- m_iLevel ++;
- m_iElementCount ++;
- m_iAttributeCount += xAttribs->getLength();
- }
- virtual void endElement(const UString& aName) THROWS( (SAXException,UsrSystemException) )
- {
- OSL_ASSERT( m_iLevel );
- m_iLevel --;
- if( m_bPrint ) {
- int i;
- for( i = 0; i < m_iLevel ; i ++ ) {
- printf( " " );
- }
- printf( "</%s>\n" , USTRING_TO_PCHAR( aName ) );
- }
- }
-
- virtual void characters(const UString& aChars) THROWS( (SAXException,UsrSystemException) )
- {
- if( m_bPrint ) {
- int i;
- for( i = 0; i < m_iLevel ; i ++ ) {
- printf( " " );
- }
- printf( "%s\n" , USTRING_TO_PCHAR( aChars ) );
- }
- m_iCharCount += aChars.len();
- }
- virtual void ignorableWhitespace(const UString& aWhitespaces) THROWS( (SAXException,UsrSystemException) )
- {
- m_iWhitespaceCount += aWhitespaces.len();
- }
-
- virtual void processingInstruction(const UString& aTarget, const UString& aData) THROWS( (SAXException,UsrSystemException) )
- {
- if( m_bPrint )
- printf( "PI : %s,%s\n" , USTRING_TO_PCHAR( aTarget ) , USTRING_TO_PCHAR( aData ) );
- }
-
- virtual void setDocumentLocator(const XLocatorRef& xLocator) THROWS( (SAXException,UsrSystemException) )
- {
- m_rLocator = xLocator;
- }
-
- virtual InputSource resolveEntity(const UString& sPublicId, const UString& sSystemId)
- THROWS( (SAXException,UsrSystemException) )
- {
- InputSource source;
- source.sSystemId = sSystemId;
- source.sPublicId = sPublicId;
- source.aInputStream = createStreamFromFile( USTRING_TO_PCHAR( sSystemId ) , m_xSMgr );
-
- return source;
- }
-
- virtual void startCDATA(void) THROWS( (SAXException,UsrSystemException) )
- {
- if( m_bPrint ) {
- printf( "CDataStart :\n" );
- }
- }
- virtual void endCDATA(void) THROWS( (SAXException,UsrSystemException) )
- {
- if( m_bPrint ) {
- printf( "CEndStart :\n" );
- }
- }
- virtual void comment(const UString& sComment) THROWS( (SAXException,UsrSystemException) )
- {
- if( m_bPrint ) {
- printf( "<!--%s-->\n" , USTRING_TO_PCHAR( sComment ) );
- }
- }
- virtual void unknown(const UString& sString) THROWS( (SAXException,UsrSystemException) )
- {
- if( m_bPrint ) {
- printf( "UNKNOWN : {%s}\n" , USTRING_TO_PCHAR( sString ) );
- }
- }
-
- virtual void allowLineBreak( void) THROWS( (SAXException, UsrSystemException ) )
- {
-
- }
-
-
-public:
- int m_iLevel;
- int m_iElementCount;
- int m_iAttributeCount;
- int m_iWhitespaceCount;
- int m_iCharCount;
- BOOL m_bPrint;
-
- XMultiServiceFactoryRef m_xSMgr;
- XLocatorRef m_rLocator;
-};
-
-BOOL TestDocumentHandler::queryInterface( Uik aUik , XInterfaceRef & rOut )
-{
- if( aUik == XDocumentHandler::getSmartUik() ) {
- rOut = (XDocumentHandler * )this;
- }
- else if ( aUik == XExtendedDocumentHandler::getSmartUik() ) {
- rOut = (XExtendedDocumentHandler *) this;
- }
- else if ( aUik == XEntityResolver::getSmartUik() ) {
- rOut = (XEntityResolver *) this;
- }
- else if ( aUik == XErrorHandler::getSmartUik() ) {
- rOut = (XErrorHandler * ) this;
- }
- else {
- return OWeakObject::queryInterface( aUik , rOut );
- }
- return TRUE;
-}
-
-
-
-
-void OSaxParserTest::testSimple( const XParserRef &rParser )
-{
-
- char TestString[] =
- "<!DOCTYPE personnel [\n"
- "<!ENTITY testInternal \"internal Test!\">\n"
- "<!ENTITY test SYSTEM \"external_entity.xml\">\n"
- "]>\n"
-
- "<personnel>\n"
- "<person> fjklsfdklsdfkl\n"
- "fjklsfdklsdfkl\n"
- "<?testpi pidata?>\n"
- "&testInternal;\n"
- "<HUHU x='5' y='kjfd'> blahuhu\n"
- "<HI> blahi\n"
- " <![CDATA[<greeting>Hello, '+1+12world!</greeting>]]>\n"
- " <!-- huhu <jdk> -->\n"
- "<?testpi pidata?>\n"
- "</HI>\n"
- "aus XMLTest\n"
- "</HUHU>\n"
- "</person>\n"
- "</personnel>\n\n\n";
-
- Sequence<BYTE> seqBytes( strlen( TestString ) );
- memcpy( seqBytes.getArray() , TestString , strlen( TestString ) );
-
-
- XInputStreamRef rInStream;
- UString sInput;
- rInStream = createStreamFromSequence( seqBytes , m_rFactory );
- sInput = UString( L"internal" );
-
- if( rParser.is() ) {
- InputSource source;
-
- source.aInputStream = rInStream;
- source.sSystemId = sInput;
-
- TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
- XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
- XEntityResolverRef rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
-
- rParser->setDocumentHandler( rDocHandler );
- rParser->setEntityResolver( rEntityResolver );
-
- try {
- rParser->parseStream( source );
- ERROR_ASSERT( pDocHandler->m_iElementCount == 4 , "wrong element count" );
- ERROR_ASSERT( pDocHandler->m_iAttributeCount == 2 , "wrong attribut count" );
- ERROR_ASSERT( pDocHandler->m_iCharCount == 130 , "wrong char count" );
- ERROR_ASSERT( pDocHandler->m_iWhitespaceCount == 0, "wrong whitespace count" );
- }
- catch( SAXParseException& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
- }
- catch( SAXException& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
-
- }
- catch( Exception& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
- }
- catch(...) {
- BUILD_ERROR( 1 , "unknown exception" );
- }
-
- }
-
-
-}
-
-void OSaxParserTest::testNamespaces( const XParserRef &rParser )
-{
-
- char TestString[] =
- "<?xml version='1.0'?>\n"
- "<!-- all elements here are explicitly in the HTML namespace -->\n"
- "<html:html xmlns:html='http://www.w3.org/TR/REC-html40'>\n"
- "<html:head><html:title>Frobnostication</html:title></html:head>\n"
- "<html:body><html:p>Moved to \n"
- "<html:a href='http://frob.com'>here.</html:a></html:p></html:body>\n"
- "</html:html>\n";
-
- Sequence<BYTE> seqBytes( strlen( TestString ) );
- memcpy( seqBytes.getArray() , TestString , strlen( TestString ) );
-
-
- XInputStreamRef rInStream;
- UString sInput;
-
- rInStream = createStreamFromSequence( seqBytes , m_rFactory );
- sInput = UString( L"internal" );
-
- if( rParser.is() ) {
- InputSource source;
-
- source.aInputStream = rInStream;
- source.sSystemId = sInput;
-
- TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
- XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
- XEntityResolverRef rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
-
- rParser->setDocumentHandler( rDocHandler );
- rParser->setEntityResolver( rEntityResolver );
-
- try {
- rParser->parseStream( source );
- ERROR_ASSERT( pDocHandler->m_iElementCount == 6 , "wrong element count" );
- ERROR_ASSERT( pDocHandler->m_iAttributeCount == 2 , "wrong attribut count" );
- ERROR_ASSERT( pDocHandler->m_iCharCount == 33, "wrong char count" );
- ERROR_ASSERT( pDocHandler->m_iWhitespaceCount == 0 , "wrong whitespace count" );
- }
- catch( SAXParseException& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
- }
- catch( SAXException& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
-
- }
- catch( Exception& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
- }
- catch(...) {
- BUILD_ERROR( 1 , "unknown exception" );
- }
- }
-}
-
-void OSaxParserTest::testEncoding( const XParserRef &rParser )
-{
- char TestString[] =
- "<?xml version='1.0' encoding=\"iso-8859-1\"?>\n"
- "<!-- all elements here are explicitly in the HTML namespace -->\n"
- "<html:html xmlns:html='http://www.w3.org/TR/REC-html40'>\n"
- "<html:head><html:title>Frobnostication</html:title></html:head>\n"
- "<html:body><html:p>Moved to ß\n"
- "<html:a href='http://frob.com'>here.</html:a></html:p></html:body>\n"
- "</html:html>\n";
-
- Sequence<BYTE> seqBytes( strlen( TestString ) );
- memcpy( seqBytes.getArray() , TestString , strlen( TestString ) );
-
-
- XInputStreamRef rInStream;
- UString sInput;
-
- rInStream = createStreamFromSequence( seqBytes , m_rFactory );
- sInput = UString( L"internal" );
-
- if( rParser.is() ) {
- InputSource source;
-
- source.aInputStream = rInStream;
- source.sSystemId = sInput;
-
- TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
- XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
- XEntityResolverRef rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
-
- rParser->setDocumentHandler( rDocHandler );
- rParser->setEntityResolver( rEntityResolver );
- try {
- rParser->parseStream( source );
- }
- catch( SAXParseException& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
- }
- catch( SAXException& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
-
- }
- catch( Exception& e ) {
- BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
- }
- catch(...) {
- BUILD_ERROR( 1 , "unknown exception" );
- }
-
- }
-
-}
-
-void OSaxParserTest::testFile( const XParserRef & rParser )
-{
-
- XInputStreamRef rInStream = createStreamFromFile( "testsax.xml" , m_rFactory );
- UString sInput = UString( PCHAR_TO_USTRING( "testsax.xml" ) );
-
-
- if( rParser.is() && rInStream.is() ) {
- InputSource source;
-
- source.aInputStream = rInStream;
- source.sSystemId = sInput;
-
- TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , TRUE );
- XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
- XEntityResolverRef rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
- XErrorHandlerRef rErrorHandler( ( XErrorHandler * )pDocHandler , USR_QUERY );
-
- rParser->setDocumentHandler( rDocHandler );
- rParser->setEntityResolver( rEntityResolver );
- rParser->setErrorHandler( rErrorHandler );
-
- try {
- rParser->parseStream( source );
- }
- catch( SAXParseException& e ) {
- UsrAny any;
- any.set( &e , SAXParseException_getReflection() );
- while(TRUE) {
- SAXParseException *pEx;
- if( any.getReflection() == SAXParseException_getReflection() ) {
- pEx = ( SAXParseException * ) any.get();
- printf( "%s\n" , UStringToString( pEx->Message , CHARSET_SYSTEM ).GetStr() );
- any = pEx->WrappedException;
- }
- else {
- break;
- }
- }
- }
- catch( SAXException& e ) {
- printf( "%s\n" , UStringToString( e.Message , CHARSET_SYSTEM ).GetStr() );
-
- }
- catch( Exception& e ) {
- printf( "normal exception ! %s\n", e.getName() );
- }
- catch(...) {
- printf( "any exception !!!!\n" );
- }
- }
-}
-
-void OSaxParserTest::testPerformance( const XParserRef & rParser )
-{
-
- XInputStreamRef rInStream = createStreamFromFile( "testPerformance.xml" , m_rFactory );
- UString sInput = UString( PCHAR_TO_USTRING( "testperformance.xml" ) );
-
- if( rParser.is() && rInStream.is() ) {
- InputSource source;
-
- source.aInputStream = rInStream;
- source.sSystemId = sInput;
-
- TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
- XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
- XEntityResolverRef rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
- XErrorHandlerRef rErrorHandler( ( XErrorHandler * )pDocHandler , USR_QUERY );
-
- rParser->setDocumentHandler( rDocHandler );
- rParser->setEntityResolver( rEntityResolver );
- rParser->setErrorHandler( rErrorHandler );
-
- try {
- TimeValue aStartTime, aEndTime;
- osl_getSystemTime( &aStartTime );
- rParser->parseStream( source );
- osl_getSystemTime( &aEndTime );
-
- double fStart = (double)aStartTime.Seconds + ((double)aStartTime.Nanosec / 1000000000.0);
- double fEnd = (double)aEndTime.Seconds + ((double)aEndTime.Nanosec / 1000000000.0);
-
- printf( "Performance reading : %g s\n" , fEnd - fStart );
-
- }
- catch( SAXParseException& e ) {
- UsrAny any;
- any.set( &e , SAXParseException_getReflection() );
- while(TRUE) {
- SAXParseException *pEx;
- if( any.getReflection() == SAXParseException_getReflection() ) {
- pEx = ( SAXParseException * ) any.get();
- printf( "%s\n" , UStringToString( pEx->Message , CHARSET_SYSTEM ).GetStr() );
- any = pEx->WrappedException;
- }
- else {
- break;
- }
- }
- }
- catch( SAXException& e ) {
- printf( "%s\n" , UStringToString( e.Message , CHARSET_SYSTEM ).GetStr() );
-
- }
- catch( Exception& e ) {
- printf( "normal exception ! %s\n", e.getName() );
- }
- catch(...) {
- printf( "any exception !!!!\n" );
- }
- }
-
-}
-
-
-extern "C"
-{
-BOOL EXTERN_SERVICE_CALLTYPE exService_writeRegEntry(
- const UNO_INTERFACE(XRegistryKey)* xUnoKey)
-
-{
- XRegistryKeyRef xKey;
- uno2smart(xKey, *xUnoKey);
-
- UString str = UString( L"/" ) + OSaxParserTest_getImplementationName() + UString( L"/UNO/SERVICES" );
- XRegistryKeyRef xNewKey = xKey->createKey( str );
- xNewKey->createKey( OSaxParserTest_getServiceName() );
-
- str = UString( L"/" ) + OSaxWriterTest_getImplementationName() + UString( L"/UNO/SERVICES" );
- xNewKey = xKey->createKey( str );
- xNewKey->createKey( OSaxWriterTest_getServiceName() );
-
- return TRUE;
-}
-
-
-UNO_INTERFACE(XInterface) EXTERN_SERVICE_CALLTYPE exService_getFactory
-(
- const wchar_t* implementationName,
- const UNO_INTERFACE(XMultiServiceFactory)* xUnoFact,
- const UNO_INTERFACE(XRegistryKey)*
-)
-{
- UNO_INTERFACE(XInterface) xUnoRet = {0, 0};
-
- XInterfaceRef xRet;
- XMultiServiceFactoryRef xSMgr;
- UString aImplementationName(implementationName);
-
- uno2smart(xSMgr, *xUnoFact);
-
- if (aImplementationName == OSaxWriterTest_getImplementationName() )
- {
- xRet = createSingleFactory( xSMgr, implementationName,
- OSaxWriterTest_CreateInstance,
- OSaxWriterTest_getSupportedServiceNames() );
- }
- else if (aImplementationName == OSaxParserTest_getImplementationName() )
- {
- xRet = createSingleFactory( xSMgr, implementationName,
- OSaxParserTest_CreateInstance,
- OSaxParserTest_getSupportedServiceNames() );
- }
- if (xRet.is())
- {
- smart2uno(xRet, xUnoRet);
- }
-
- return xUnoRet;
-}
-
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
deleted file mode 100644
index 5877e39..0000000
--- a/extensions/test/sax/testwriter.cxx
+++ /dev/null
@@ -1,758 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-
-#include <vector>
-#include <smart/com/sun/star/test/XSimpleTest.hxx>
-#include <smart/com/sun/star/lang/XMultiServiceFactory.hxx> // for the multiservice-factories
-
-#include <stdio.h>
-
-#include <smart/com/sun/star/io/XActiveDataSource.hxx>
-#include <smart/com/sun/star/io/XOutputStream.hxx>
-#include <smart/com/sun/star/xml/sax/SAXParseException.hxx>
-#include <smart/com/sun/star/xml/sax/XParser.hxx>
-#include <smart/com/sun/star/xml/sax/XExtendedDocumentHandler.hxx>
-
-#include <rtl/wstring.hxx>
-#include <osl/time.h>
-#include <usr/weak.hxx>
-#include <tools/string.hxx>
-
-#include <usr/factoryhlp.hxx>
-
-#include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE
-
-using namespace std;
-using namespace usr;
-
-#define BUILD_ERROR(expr, Message)\
- {\
- m_seqErrors.realloc( m_seqErrors.getLen() + 1 ); \
- m_seqExceptions.realloc( m_seqExceptions.getLen() + 1 ); \
- String str; \
- str += __FILE__;\
- str += " "; \
- str += "(" ; \
- str += __LINE__ ;\
- str += ")\n";\
- str += "[ " ; \
- str += #expr; \
- str += " ] : " ; \
- str += Message; \
- m_seqErrors.getArray()[ m_seqErrors.getLen()-1] = StringToUString( str , CHARSET_SYSTEM ); \
- }\
- ((void)0)
-
-
-#define WARNING_ASSERT(expr, Message) \
- if( ! (expr) ) { \
- m_seqWarnings.realloc( m_seqErrors.getLen() +1 ); \
- String str;\
- str += __FILE__;\
- str += " "; \
- str += "(" ; \
- str += __LINE__ ;\
- str += ")\n";\
- str += "[ " ; \
- str += #expr; \
- str += " ] : " ; \
- str += Message; \
- m_seqWarnings.getArray()[ m_seqWarnings.getLen()-1] = StringToUString( str , CHARSET_SYSTEM ); \
- return; \
- }\
- ((void)0)
-
-#define ERROR_ASSERT(expr, Message) \
- if( ! (expr) ) { \
- BUILD_ERROR(expr, Message );\
- return; \
- }\
- ((void)0)
-
-#define ERROR_EXCEPTION_ASSERT(expr, Message, Exception) \
- if( !(expr)) { \
- BUILD_ERROR(expr,Message);\
- m_seqExceptions.getArray()[ m_seqExceptions.getLen()-1] = UsrAny( Exception );\
- return; \
- } \
- ((void)0)
-
-/****
-* test szenarios :
-****/
-
-
-class OFileWriter :
- public XOutputStream,
- public OWeakObject
-{
-public:
- OFileWriter( char *pcFile ) { strcpy( m_pcFile , pcFile ); m_f = 0; }
-
-
-public: // refcounting
- BOOL queryInterface( Uik aUik, XInterfaceRef & rOut )
- {
- if( XOutputStream::getSmartUik() == aUik ) {
- rOut = (XOutputStream *) this;
- }
- else return OWeakObject::queryInterface( aUik , rOut );
-
- return TRUE;
- }
- void acquire() { OWeakObject::acquire(); }
- void release() { OWeakObject::release(); }
- void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
-
-public:
- virtual void writeBytes(const Sequence< BYTE >& aData)
- THROWS( (NotConnectedException, BufferSizeExceededException, UsrSystemException) );
- virtual void flush(void)
- THROWS( (NotConnectedException, BufferSizeExceededException, UsrSystemException) );
- virtual void closeOutput(void)
- THROWS( (NotConnectedException, BufferSizeExceededException, UsrSystemException) );
-
-
-private:
- char m_pcFile[256];
- FILE *m_f;
-};
-
-
-void OFileWriter::writeBytes(const Sequence< BYTE >& aData)
- THROWS( (NotConnectedException, BufferSizeExceededException, UsrSystemException) )
-{
- if( ! m_f ) {
- m_f = fopen( m_pcFile , "w" );
- }
-
- fwrite( aData.getConstArray() , 1 , aData.getLen() , m_f );
-
-}
-
-
-void OFileWriter::flush(void)
- THROWS( (NotConnectedException, BufferSizeExceededException, UsrSystemException) )
-{
- fflush( m_f );
-}
-
-void OFileWriter::closeOutput(void)
- THROWS( (NotConnectedException, BufferSizeExceededException, UsrSystemException) )
-{
- fclose( m_f );
- m_f = 0;
-}
-
-
-class OSaxWriterTest :
- public XSimpleTest,
- public OWeakObject
-{
-public:
- OSaxWriterTest( const XMultiServiceFactoryRef & rFactory ) : m_rFactory( rFactory )
- {
-
- }
- ~OSaxWriterTest() {}
-
-public: // refcounting
- BOOL queryInterface( Uik aUik, XInterfaceRef & rOut );
- void acquire() { OWeakObject::acquire(); }
- void release() { OWeakObject::release(); }
- void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
-
-public:
- virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
- THROWS( ( IllegalArgumentException,
- UsrSystemException) );
-
- virtual INT32 test( const UString& TestName,
- const XInterfaceRef& TestObject,
- INT32 hTestHandle) THROWS( ( IllegalArgumentException,
- UsrSystemException) );
-
- virtual BOOL testPassed(void) THROWS( ( UsrSystemException) );
- virtual Sequence< UString > getErrors(void) THROWS( (UsrSystemException) );
- virtual Sequence< UsrAny > getErrorExceptions(void) THROWS( (UsrSystemException) );
- virtual Sequence< UString > getWarnings(void) THROWS( (UsrSystemException) );
-
-private:
- void testSimple( const XExtendedDocumentHandlerRef &r );
- void testExceptions( const XExtendedDocumentHandlerRef &r );
- void testDTD( const XExtendedDocumentHandlerRef &r );
- void testPerformance( const XExtendedDocumentHandlerRef &r );
- void writeParagraph( const XExtendedDocumentHandlerRef &r , const UString & s);
-
-private:
- Sequence<UsrAny> m_seqExceptions;
- Sequence<UString> m_seqErrors;
- Sequence<UString> m_seqWarnings;
- XMultiServiceFactoryRef m_rFactory;
-
-};
-
-
-
-/*----------------------------------------
-*
-* Attributlist implementation
-*
-*----------------------------------------*/
-struct AttributeListImpl_impl;
-class AttributeListImpl :
- public XAttributeList,
- public OWeakObject
-{
-public:
- AttributeListImpl();
- AttributeListImpl( const AttributeListImpl & );
- ~AttributeListImpl();
-
-public:
- BOOL queryInterface( Uik aUik, XInterfaceRef & rOut );
- void acquire() { OWeakObject::acquire(); }
- void release() { OWeakObject::release(); }
- void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
-
-public:
- virtual INT16 getLength(void) THROWS( (UsrSystemException) );
- virtual UString getNameByIndex(INT16 i) THROWS( (UsrSystemException) );
- virtual UString getTypeByIndex(INT16 i) THROWS( (UsrSystemException) );
- virtual UString getTypeByName(const UString& aName) THROWS( (UsrSystemException) );
- virtual UString getValueByIndex(INT16 i) THROWS( (UsrSystemException) );
- virtual UString getValueByName(const UString& aName) THROWS( (UsrSystemException) );
-
-public:
- void addAttribute( const UString &sName , const UString &sType , const UString &sValue );
- void clear();
-
-private:
- struct AttributeListImpl_impl *m_pImpl;
-};
-
-
-struct TagAttribute
-{
- TagAttribute(){}
- TagAttribute( const UString &sName, const UString &sType , const UString &sValue )
- {
- this->sName = sName;
- this->sType = sType;
- this->sValue = sValue;
- }
-
- UString sName;
- UString sType;
- UString sValue;
-};
-
-struct AttributeListImpl_impl
-{
- AttributeListImpl_impl()
- {
- // performance improvement during adding
- vecAttribute.reserve(20);
- }
- vector<struct TagAttribute> vecAttribute;
-};
-
-
-
-INT16 AttributeListImpl::getLength(void) THROWS( (UsrSystemException) )
-{
- return m_pImpl->vecAttribute.size();
-}
-
-
-AttributeListImpl::AttributeListImpl( const AttributeListImpl &r )
-{
- m_pImpl = new AttributeListImpl_impl;
- *m_pImpl = *(r.m_pImpl);
-}
-
-UString AttributeListImpl::getNameByIndex(INT16 i) THROWS( (UsrSystemException) )
-{
- if( i < m_pImpl->vecAttribute.size() ) {
- return m_pImpl->vecAttribute[i].sName;
- }
- return UString();
-}
-
-
-UString AttributeListImpl::getTypeByIndex(INT16 i) THROWS( (UsrSystemException) )
-{
- if( i < m_pImpl->vecAttribute.size() ) {
- return m_pImpl->vecAttribute[i].sType;
- }
- return UString();
-}
-
-UString AttributeListImpl::getValueByIndex(INT16 i) THROWS( (UsrSystemException) )
-{
- if( i < m_pImpl->vecAttribute.size() ) {
- return m_pImpl->vecAttribute[i].sValue;
- }
- return UString();
-
-}
-
-UString AttributeListImpl::getTypeByName( const UString& sName ) THROWS( (UsrSystemException) )
-{
- vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
-
- for (; ii != m_pImpl->vecAttribute.end(); ++ii)
- {
- if( (*ii).sName == sName )
- {
- return (*ii).sType;
- }
- }
- return UString();
-}
-
-UString AttributeListImpl::getValueByName(const UString& sName) THROWS( (UsrSystemException) )
-{
- vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
-
- for (; ii != m_pImpl->vecAttribute.end(); ++ii)
- {
- if( (*ii).sName == sName )
- {
- return (*ii).sValue;
- }
- }
- return UString();
-}
-
-
-BOOL AttributeListImpl::queryInterface( Uik aUik, XInterfaceRef & rOut )
-{
- if( aUik == XAttributeList::getSmartUik() ) {
- rOut = (XAttributeList * )this;
- }
- else {
- return OWeakObject::queryInterface( aUik , rOut );
- }
- return TRUE;
-}
-
-
-AttributeListImpl::AttributeListImpl()
-{
- m_pImpl = new AttributeListImpl_impl;
-}
-
-
-
-AttributeListImpl::~AttributeListImpl()
-{
- delete m_pImpl;
-}
-
-
-void AttributeListImpl::addAttribute( const UString &sName ,
- const UString &sType ,
- const UString &sValue )
-{
- m_pImpl->vecAttribute.push_back( TagAttribute( sName , sType , sValue ) );
-}
-
-void AttributeListImpl::clear()
-{
- vector<struct TagAttribute> dummy;
- m_pImpl->vecAttribute.swap( dummy );
-
- OSL_ASSERT( ! getLength() );
-}
-
-/**
-* for external binding
-**/
-XInterfaceRef OSaxWriterTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
-{
- OSaxWriterTest *p = new OSaxWriterTest( rSMgr );
- XInterfaceRef xService = *p;
- return xService;
-}
-
-UString OSaxWriterTest_getServiceName( ) THROWS( () )
-{
- return L"test.com.sun.star.xml.sax.Writer";
-}
-
-UString OSaxWriterTest_getImplementationName( ) THROWS( () )
-{
- return L"test.extensions.xml.sax.Writer";
-}
-
-Sequence<UString> OSaxWriterTest_getSupportedServiceNames( ) THROWS( () )
-{
- Sequence<UString> aRet(1);
-
- aRet.getArray()[0] = OSaxWriterTest_getImplementationName( );
-
- return aRet;
-}
-
-
-BOOL OSaxWriterTest::queryInterface( Uik uik , XInterfaceRef &rOut )
-{
- if( XSimpleTest::getSmartUik() == uik ) {
- rOut = (XSimpleTest *) this;
- }
- else {
- return OWeakObject::queryInterface( uik , rOut );
- }
- return TRUE;
-}
-
-
-void OSaxWriterTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
- THROWS( ( IllegalArgumentException,
- UsrSystemException) )
-{
- if( L"com.sun.star.xml.sax.Writer" == TestName ) {
- XDocumentHandlerRef doc( TestObject , USR_QUERY );
- XExtendedDocumentHandlerRef ext( TestObject , USR_QUERY );
- XActiveDataSourceRef source( TestObject , USR_QUERY );
-
- ERROR_ASSERT( doc.is() , "XDocumentHandler cannot be queried" );
- ERROR_ASSERT( ext.is() , "XExtendedDocumentHandler cannot be queried" );
- ERROR_ASSERT( source.is() , "XActiveDataSource cannot be queried" );
- }
- else {
- BUILD_ERROR( 0 , "wrong test" );
- }
-}
-
-
-INT32 OSaxWriterTest::test( const UString& TestName,
- const XInterfaceRef& TestObject,
- INT32 hTestHandle) THROWS( ( IllegalArgumentException,
- UsrSystemException) )
-{
- if( L"com.sun.star.xml.sax.Writer" == TestName ) {
- try {
- if( 0 == hTestHandle ) {
- testInvariant( TestName , TestObject );
- }
- else {
-
- XExtendedDocumentHandlerRef writer( TestObject , USR_QUERY );
-
- if( 1 == hTestHandle ) {
- testSimple( writer );
- }
- else if( 2 == hTestHandle ) {
- testExceptions( writer );
- }
- else if( 3 == hTestHandle ) {
- testDTD( writer );
- }
- else if( 4 == hTestHandle ) {
- testPerformance( writer );
- }
- }
- }
- catch( Exception& e ) {
- BUILD_ERROR( 0 , UStringToString( e.getName() , CHARSET_SYSTEM ).GetCharStr() );
- }
- catch(...) {
- BUILD_ERROR( 0 , "unknown exception (Exception is not base class)" );
- }
-
- hTestHandle ++;
-
- if( hTestHandle >= 5) {
- // all tests finished.
- hTestHandle = -1;
- }
- }
- else {
- BUILD_ERROR( 0 , "service not supported by test." );
- }
- return hTestHandle;
-}
-
-
-
-BOOL OSaxWriterTest::testPassed(void) THROWS( (UsrSystemException) )
-{
- return m_seqErrors.getLen() == 0;
-}
-
-
-Sequence< UString > OSaxWriterTest::getErrors(void) THROWS( (UsrSystemException) )
-{
- return m_seqErrors;
-}
-
-
-Sequence< UsrAny > OSaxWriterTest::getErrorExceptions(void) THROWS( (UsrSystemException) )
-{
- return m_seqExceptions;
-}
-
-
-Sequence< UString > OSaxWriterTest::getWarnings(void) THROWS( (UsrSystemException) )
-{
- return m_seqWarnings;
-}
-
-void OSaxWriterTest::writeParagraph( const XExtendedDocumentHandlerRef &r , const UString & s)
-{
- int nMax = s.len();
- int nStart = 0;
-
- Sequence<UINT16> seq( s.len() );
- memcpy( seq.getArray() , s.getStr() , s.len() * sizeof( UINT16 ) );
-
- for( int n = 1 ; n < nMax ; n++ ){
- if( 32 == seq.getArray()[n] ) {
- r->allowLineBreak();
- r->characters( s.copy( nStart , n - nStart ) );
- nStart = n;
- }
- }
- r->allowLineBreak();
- r->characters( s.copy( nStart , n - nStart ) );
-
-
-}
-
-
-
-void OSaxWriterTest::testSimple( const XExtendedDocumentHandlerRef &r )
-{
- UString testParagraph = L"Dies ist ein bloeder Test um zu uberpruefen, ob der SAXWriter "
- L"wohl Zeilenumbrueche halbwegs richtig macht oder ob er die Zeile "
- L"bis zum bitteren Ende schreibt.";
-
- OFileWriter *pw = new OFileWriter("output.xml");
- AttributeListImpl *pList = new AttributeListImpl;
-
- XAttributeListRef rList( (XAttributeList *) pList , USR_QUERY );
- XOutputStreamRef ref( ( XOutputStream * ) pw , USR_QUERY );
-
- XActiveDataSourceRef source( r , USR_QUERY );
-
- ERROR_ASSERT( ref.is() , "no output stream" );
- ERROR_ASSERT( source.is() , "no active data source" );
-
- source->setOutputStream( ref );
-
- r->startDocument();
-
- pList->addAttribute( L"Arg1" , L"CDATA" , L"bla\n u" );
- pList->addAttribute( L"Arg2" , L"CDATA" , L"blub" );
-
- r->startElement( L"tag1" , rList );
- r->ignorableWhitespace( L"" );
-
- r->characters( L"huhu" );
- r->ignorableWhitespace( L"" );
-
- r->startElement( L"hi" , rList );
- r->ignorableWhitespace( L"" );
-
- // the enpassant must be converted & -> &
- r->characters( L"ü" );
-
- // Test added for mib. Tests if errors during conversions occurs
- r->ignorableWhitespace( UString() );
- sal_Char array[256];
- for( sal_Int32 n = 32 ; n < 254 ; n ++ ) {
- array[n-32] = n;
- }
- array[254-32] = 0;
- r->characters(
- StringToUString( array , RTL_TEXTENCODING_SYMBOL )
- );
- r->ignorableWhitespace( UString() );
-
- // '>' must not be converted
- r->startCDATA();
- r->characters( L">fsfsdf<" );
- r->endCDATA();
- r->ignorableWhitespace( UString() );
-
- writeParagraph( r , testParagraph );
-
-
- r->ignorableWhitespace( UString() );
- r->comment( L"Dies ist ein Kommentar !" );
- r->ignorableWhitespace( UString() );
-
- r->startElement( L"emptytagtest" , rList );
- r->endElement( L"emptytagtest" );
-
- r->endElement( L"hi" );
- r->ignorableWhitespace( L"" );
-
- r->endElement( L"tag1" );
- r->endDocument();
-
-}
-
-void OSaxWriterTest::testExceptions( const XExtendedDocumentHandlerRef & r )
-{
-
- OFileWriter *pw = new OFileWriter("output2.xml");
- AttributeListImpl *pList = new AttributeListImpl;
-
- XAttributeListRef rList( (XAttributeList *) pList , USR_QUERY );
- XOutputStreamRef ref( ( XOutputStream * ) pw , USR_QUERY );
-
- XActiveDataSourceRef source( r , USR_QUERY );
-
- ERROR_ASSERT( ref.is() , "no output stream" );
- ERROR_ASSERT( source.is() , "no active data source" );
-
- source->setOutputStream( ref );
-
- { // startDocument must be called before start element
- BOOL bException = TRUE;
- try {
- r->startElement( L"huhu" , rList );
- bException = FALSE;
- }
- catch( SAXException& e ) {
-
- }
- ERROR_ASSERT( bException , "expected exception not thrown !" );
- }
-
- r->startDocument();
-
- r->startElement( L"huhu" , rList );
- r->startCDATA();
-
- {
- BOOL bException = TRUE;
- try {
- r->startElement( L"huhu" , rList );
- bException = FALSE;
- }
- catch( SAXException& e ) {
-
- }
- ERROR_ASSERT( bException , "expected exception not thrown !" );
- }
-
- r->endCDATA();
- r->endElement( L"hi" );
-
- r->endDocument();
-}
-
-
-void OSaxWriterTest::testDTD(const XExtendedDocumentHandlerRef &r )
-{
- OFileWriter *pw = new OFileWriter("outputDTD.xml");
- AttributeListImpl *pList = new AttributeListImpl;
-
- XAttributeListRef rList( (XAttributeList *) pList , USR_QUERY );
- XOutputStreamRef ref( ( XOutputStream * ) pw , USR_QUERY );
-
- XActiveDataSourceRef source( r , USR_QUERY );
-
- ERROR_ASSERT( ref.is() , "no output stream" );
- ERROR_ASSERT( source.is() , "no active data source" );
-
- source->setOutputStream( ref );
-
-
- r->startDocument();
- r->unknown( L"<!DOCTYPE iCalendar >\n" );
- r->startElement( L"huhu" , rList );
-
- r->endElement( L"huhu" );
- r->endDocument();
-}
-
-void OSaxWriterTest::testPerformance(const XExtendedDocumentHandlerRef &r )
-{
- OFileWriter *pw = new OFileWriter("testPerformance.xml");
- AttributeListImpl *pList = new AttributeListImpl;
-
- UString testParagraph = L"Dies ist ein bloeder Test um zu uberpruefen, ob der SAXWriter "
- L"wohl > Zeilenumbrueche halbwegs richtig macht oder ob er die Zeile "
- L"bis zum bitteren Ende schreibt.";
-
-
- XAttributeListRef rList( (XAttributeList *) pList , USR_QUERY );
- XOutputStreamRef ref( ( XOutputStream * ) pw , USR_QUERY );
-
- XActiveDataSourceRef source( r , USR_QUERY );
-
- ERROR_ASSERT( ref.is() , "no output stream" );
- ERROR_ASSERT( source.is() , "no active data source" );
-
- source->setOutputStream( ref );
-
- TimeValue aStartTime, aEndTime;
- osl_getSystemTime( &aStartTime );
-
-
- r->startDocument();
- // just write a bunch of xml tags !
- // for performance testing
- sal_Int32 i2;
- for( i2 = 0 ; i2 < 15 ; i2 ++ )
- {
- r->startElement( UString( L"tag" ) + UString::valueOf( i2 ), rList );
- for( sal_Int32 i = 0 ; i < 450 ; i ++ )
- {
- r->ignorableWhitespace( L"");
- r->startElement( L"huhu" , rList );
- r->characters( testParagraph );
- r->ignorableWhitespace( L"");
- r->endElement( L"huhu" );
- }
- }
- for( i2 = 14 ; i2 >= 0 ; i2-- )
- {
- r->ignorableWhitespace( L"");
- r->endElement( UString( L"tag" ) + UString::valueOf( i2 ) );
- }
-
- r->endDocument();
-
- osl_getSystemTime( &aEndTime );
-
- double fStart = (double)aStartTime.Seconds + ((double)aStartTime.Nanosec / 1000000000.0);
- double fEnd = (double)aEndTime.Seconds + ((double)aEndTime.Nanosec / 1000000000.0);
-
- printf( "Performance writing : %g s\n" , fEnd - fStart );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d32fd9c1046b42da3d0d4141047aed8bd4f6d481
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jul 9 16:23:20 2011 +0200
Mark this as TODO
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 595eed4..d056fba 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -279,17 +279,11 @@ sal_Bool SAXParser::Parse( ParseAction aAct )
}
catch( class SAXParseException & rPEx)
{
-#ifdef DBG_ERROR
- String aMemo( rPEx.Message );
- aMemo = String( aMemo );
-#endif
+ // TODO
}
catch( class Exception & rEx)
{
-#ifdef DBG_ERROR
- String aMemo( rEx.Message );
- aMemo = String( aMemo );
-#endif
+ // TODO
}
xParser->setErrorHandler( NULL ); // otherwile Object holds itself
if ( aAction == COLLECT_DATA || aAction == COLLECT_DATA_IGNORE_WHITESPACE )
commit 376d378c8a78aea5cf5e76b437f3ed49d3755fca
Author: Xisco Fauli <anistenis at gmail.com>
Date: Fri Jul 8 15:56:49 2011 +0200
Duplicate code
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 9323215..e040f24 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -4,12 +4,6 @@ from FaxWizardDialogConst import *
from com.sun.star.awt.FontUnderline import SINGLE
class FaxWizardDialog(WizardDialog):
- #Image Control
- #Fixed Line
- #File Control
- #Image Control
- #Font Descriptors as Class members.
- #Resources Object
def __init__(self, xmsf):
super(FaxWizardDialog,self).__init__(xmsf, HIDMAIN )
@@ -42,8 +36,9 @@ class FaxWizardDialog(WizardDialog):
self.fontDescriptor4.Weight = 100
self.fontDescriptor5.Weight = 150
- #build components
-
+ '''
+ build components
+ '''
def buildStep1(self):
self.optBusinessFax = self.insertRadioButton("optBusinessFax",
OPTBUSINESSFAX_ITEM_CHANGED,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 94ffa54..c047589 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -5,7 +5,6 @@ from ui.PathSelection import *
from common.FileAccess import *
from ui.event.UnoDataAware import *
from ui.event.RadioDataAware import *
-from ui.XPathSelectionListener import XPathSelectionListener
from common.Configuration import *
from document.OfficeDocument import OfficeDocument
from text.TextFieldHandler import TextFieldHandler
@@ -39,7 +38,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.mainDA = []
self.faxDA = []
self.bSaveSuccess = False
- self.__filenameChanged = False
+ self.filenameChanged = False
self.UserTemplatePath = ""
self.sTemplatePath = ""
@@ -146,7 +145,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
#first, if the filename was not changed, thus
#it is coming from a saved session, check if the
# file exists and warn the user.
- if not self.__filenameChanged:
+ if not self.filenameChanged:
if fileAccess.exists(self.sPath, True):
answer = SystemDialog.showMessageBox(
self.xMSF, "MessBox", YES_NO + DEF_NO,
@@ -241,14 +240,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.setRoadmapComplete(True)
self.setCurrentRoadmapItemID(1)
- class __myPathSelectionListener(XPathSelectionListener):
-
- def validatePath(self):
- if self.myPathSelection.usedPathPicker:
- self.__filenameChanged = True
-
- self.myPathSelection.usedPathPicker = False
-
def insertPathSelectionControl(self):
self.myPathSelection = PathSelection(self.xMSF,
self, PathSelection.TransferMode.SAVE,
@@ -261,7 +252,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.myPathSelection.sDefaultName = "myFaxTemplate.ott"
self.myPathSelection.sDefaultFilter = "writer8_template"
self.myPathSelection.addSelectionListener( \
- self.__myPathSelectionListener())
+ self.myPathSelectionListener())
def __updateUI(self):
UnoDataAware.updateUIs(self.mainDA)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index ca37b8d..e2bffcd 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -10,7 +10,6 @@ from CGLetterWizard import CGLetterWizard
from ui.event.UnoDataAware import *
from ui.event.RadioDataAware import *
from document.OfficeDocument import OfficeDocument
-from ui.XPathSelectionListener import XPathSelectionListener
from text.TextFieldHandler import TextFieldHandler
from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
@@ -145,6 +144,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
def finishWizard(self):
self.switchToStep(self.getCurrentStep(), self.nMaxStep)
+ endWizard = True
try:
fileAccess = FileAccess(self.xMSF)
self.sPath = self.myPathSelection.getSelectedPath()
@@ -160,6 +160,8 @@ class LetterWizardDialogImpl(LetterWizardDialog):
self.resources.resOverwriteWarning,
self.xUnoDialog.Peer)
if answer == 3:
+ # user said: no, do not overwrite...
+ endWizard = False
return False
self.myLetterDoc.setWizardTemplateDocInfo(
@@ -227,8 +229,9 @@ class LetterWizardDialogImpl(LetterWizardDialog):
except Exception, e:
traceback.print_exc()
finally:
- self.xUnoDialog.endExecute()
- self.running = False
+ if endWizard:
+ self.xUnoDialog.endExecute()
+ self.running = False
return True;
@@ -1086,14 +1089,6 @@ class LetterWizardDialogImpl(LetterWizardDialog):
self.setRoadmapComplete(True)
self.setCurrentRoadmapItemID(1)
- class myPathSelectionListener(XPathSelectionListener):
-
- def validatePath(self):
- if self.myPathSelection.usedPathPicker:
- self.filenameChanged = True
-
- self.myPathSelection.usedPathPicker = False
-
def insertPathSelectionControl(self):
self.myPathSelection = \
PathSelection(self.xMSF, self, PathSelection.TransferMode.SAVE,
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index 30e55da..ee0f7c6 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -6,6 +6,7 @@ from com.sun.star.lang import IllegalArgumentException
from com.sun.star.frame import TerminationVetoException
from common.HelpIds import *
from com.sun.star.awt.PushButtonType import HELP, STANDARD
+from ui.XPathSelectionListener import XPathSelectionListener
class WizardDialog(UnoDialog2):
@@ -488,3 +489,11 @@ class WizardDialog(UnoDialog2):
def queryTermination(self):
self.activate()
raise TerminationVetoException()
+
+ class myPathSelectionListener(XPathSelectionListener):
+
+ def validatePath(self):
+ if self.myPathSelection.usedPathPicker:
+ self.filenameChanged = True
+
+ self.myPathSelection.usedPathPicker = False
commit c989ee10e5a849d07c2b4ecd191d8a8144ab390d
Author: Xisco Fauli <anistenis at gmail.com>
Date: Thu Jul 7 13:47:20 2011 +0200
Show wizard dialog on top
diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py
index c6afce2..ce2c9e1 100644
--- a/wizards/com/sun/star/wizards/common/Resource.py
+++ b/wizards/com/sun/star/wizards/common/Resource.py
@@ -23,7 +23,6 @@ class Resource(object):
self.xStringIndexAccess = xResource.getByName("String")
self.xStringListIndexAccess = xResource.getByName("StringList")
-
if self.xStringListIndexAccess is None:
raise Exception ("could not initialize xStringListIndexAccess")
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index f4495e2..94ffa54 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -422,7 +422,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
#set correct Configuration tree:
if self.optBusinessFax.State:
self.optBusinessFaxItemChanged()
- if self.optPrivateFax.State:
+ elif self.optPrivateFax.State:
self.optPrivateFaxItemChanged()
def optBusinessFaxItemChanged(self):
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index bc1e3ec..ca37b8d 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -77,7 +77,6 @@ class LetterWizardDialogImpl(LetterWizardDialog):
self.buildStep4()
self.buildStep5()
self.buildStep6()
-
self.__initializePaths()
self.initializeNorms()
self.initializeSalutation()
@@ -379,7 +378,6 @@ class LetterWizardDialogImpl(LetterWizardDialog):
self.chkBusinessPaperItemChanged()
self.setElements(False)
self.myLetterDoc.xTextDocument.unlockControllers()
- self.activate()
def lstPrivOfficialStyleItemChanged(self):
TextDocument.xTextDocument = \
@@ -391,7 +389,6 @@ class LetterWizardDialogImpl(LetterWizardDialog):
self.setPossibleSenderData(True)
self.setElements(False)
self.myLetterDoc.xTextDocument.unlockControllers()
- self.activate()
def lstPrivateStyleItemChanged(self):
TextDocument.xTextDocument = \
@@ -402,7 +399,6 @@ class LetterWizardDialogImpl(LetterWizardDialog):
self.initializeElements()
self.setElements(True)
self.myLetterDoc.xTextDocument.unlockControllers()
- self.activate()
def numLogoHeightTextChanged(self):
self.BusCompanyLogo.iHeight = int(self.numLogoHeight.Value * 1000)
@@ -892,10 +888,10 @@ class LetterWizardDialogImpl(LetterWizardDialog):
if self.optBusinessLetter.State:
self.lstBusinessStyleItemChanged()
- if optPrivOfficialLetter.State:
+ elif optPrivOfficialLetter.State:
self.lstPrivOfficialStyleItemChanged()
- if optPrivateLetter.State:
+ elif optPrivateLetter.State:
self.lstPrivateStyleItemChanged()
def initializeSalutation(self):
@@ -928,6 +924,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
found = False
cIsoCode = ""
MSID = ""
+ LanguageLabels = []
for i in nameList:
found = False
@@ -950,13 +947,10 @@ class LetterWizardDialogImpl(LetterWizardDialog):
if found:
self.Norms.append(cIsoCode)
self.NormPaths.append(i)
- #LanguageLabelsVector.add(lc.getLanguageString(MSID))
+ #LanguageLabels.append(lc.getLanguageString(MSID))
- #COMMENTED
- #LanguageLabels = [LanguageLabelsVector.size()]
- #LanguageLabelsVector.toArray(LanguageLabels)
- #self.setControlProperty(
- # "lstLetterNorm", "StringItemList", LanguageLabels)
+ self.setControlProperty(
+ "lstLetterNorm", "StringItemList", tuple(LanguageLabels))
def getCurrentLetter(self):
if self.myConfig.cp_LetterType == 0:
@@ -1029,10 +1023,10 @@ class LetterWizardDialogImpl(LetterWizardDialog):
if self.optBusinessLetter.State:
self.optBusinessLetterItemChanged()
- if self.optPrivOfficialLetter.State:
+ elif self.optPrivOfficialLetter.State:
self.optPrivOfficialLetterItemChanged()
- if self.optPrivateLetter.State:
+ elif self.optPrivateLetter.State:
self.optPrivateLetterItemChanged()
def setElements(self, privLetter):
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index f32f01a..30e55da 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -47,15 +47,6 @@ class WizardDialog(UnoDialog2):
def getResource(self):
return self.__oWizardResource
- def activate(self):
- try:
- if self.xUnoDialog is not None:
- self.xUnoDialog.toFront()
-
- except Exception, ex:
- pass
- # do nothing;
-
def itemStateChanged(self, itemEvent):
try:
self.nNewStep = itemEvent.ItemId
commit 7e87b3f97b9ccb83dbe70fc213cdda50718225f2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 7 00:15:13 2011 +0100
ByteString::CreateFromInt32->rtl::OString::valueOf
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index c34915b..23641de 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -1001,7 +1001,8 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
aID.Assign("Help");
break;
default:
- aID = ByteString::CreateFromInt32( pBD->GetButtonId(i) );
+ aID = rtl::OString::valueOf(
+ static_cast<sal_Int32>(pBD->GetButtonId(i)));
break;
}
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index cddd2d4..2fb5092 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -168,7 +168,8 @@ sal_uLong GetTTPortConfig()
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
aConf.SetGroup("Communication");
- GETSET( abPortToTalk, "TTPort", ByteString::CreateFromInt32( TESTTOOL_DEFAULT_PORT ) );
+ GETSET( abPortToTalk, "TTPort",
+ rtl::OString::valueOf(static_cast<sal_Int32>(TESTTOOL_DEFAULT_PORT)) );
return (sal_uLong)abPortToTalk.ToInt64();
}
@@ -194,7 +195,8 @@ sal_uLong GetUnoPortConfig()
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
aConf.SetGroup("Communication");
- GETSET( abPortToTalk, "UnoPort", ByteString::CreateFromInt32( UNO_DEFAULT_PORT ) );
+ GETSET( abPortToTalk, "UnoPort",
+ rtl::OString::valueOf(static_cast<sal_Int32>(UNO_DEFAULT_PORT)) );
return (sal_uLong)abPortToTalk.ToInt64();
}
commit a17a95aeab757e35240c7cbfd720b9586f1422ee
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Thu Jul 7 11:28:13 2011 +0200
Remove an unused platform list.
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 0b42553..050458e 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -414,63 +414,6 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den
aConf.SetGroup("GUI Platform");
- String aGP;
- ByteString abGP;
-#if defined WNT && defined INTEL
- abGP.Append( "501" ); // Windows on x86
-#elif defined WNT && defined X86_64
- abGP.Append( "502" ); // Windows on x64
-#elif defined SOLARIS && defined SPARC
- abGP.Append( "01" ); // Solaris SPARC
-#elif defined LINUX && defined INTEL
- abGP.Append( "03" ); // Linux
-#elif defined AIX
- abGP.Append( "04" );
-#elif defined SOLARIS && defined INTEL
- abGP.Append( "05" ); // Solaris x86
-#elif defined FREEBSD
- abGP.Append( "08" );
-#elif defined MACOSX
- abGP.Append( "12" );
-#elif defined LINUX && defined PPC
- abGP.Append( "13" );
-#elif defined NETBSD && defined INTEL
- abGP.Append( "14" ); // NetBSD/i386
-#elif defined LINUX && defined X86_64
- abGP.Append( "15" ); // Linux x86-64
-#elif defined LINUX && defined SPARC
- abGP.Append( "16" ); // Linux SPARC
-#elif defined LINUX && defined MIPS
- abGP.Append( "18" ); // Linux MIPS
-#elif defined LINUX && defined ARM
- abGP.Append( "19" ); // Linux ARM
-#elif defined LINUX && defined IA64
- abGP.Append( "20" ); // Linux ia64
-#elif defined LINUX && defined S390
- abGP.Append( "21" ); // Linux S390
-#elif defined LINUX && defined HPPA
- abGP.Append( "22" ); // Linux PA-RISC
-#elif defined LINUX && defined AXP
- abGP.Append( "23" ); // Linux ALPHA
-#elif defined NETBSD && defined X86_64
- abGP.Append( "24" ); // NetBSD/amd64
-#elif defined OPENBSD && defined X86
- abGP.Append( "25" ); // OpenBSD/i386
-#elif defined OPENBSD && defined X86_64
- abGP.Append( "26" ); // OpenBSD/amd64
-#elif defined DRAGONFLY && defined X86
- abGP.Append( "27" ); // DragonFly/i386
-#elif defined DRAGONFLY && defined X86_64
- abGP.Append( "28" ); // DragonFly/x86-64
-#elif defined IOS && defined ARM
- abGP.Append( "29" ); // iOS
-#elif defined ANDROID && defined ARM
- abGP.Append( "30" ); // Android
-#else
-#error ("unknown platform. please request an ID for your platform on qa/dev")
-#endif
- GETSET( aGP, "Current", abGP );
-
// #i68804# Write default Communication section to testtoolrc/.ini
// this is not fastest but too keep defaultsettings in one place in the code
GetHostConfig();
commit 811df4a1faed5f6b6527c6cbd34f3dd720ecfcfc
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Sat Jul 2 18:10:01 2011 +0200
Remove preload library related code
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index b3e7b22..fd883a2 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -25,14 +25,13 @@ ex extensions\source\abpilot nmake - all ex_abpilot ex_in
ex extensions\source\logging nmake - all ex_logging ex_inc NULL
ex extensions\source\oooimprovecore nmake - all ex_oooimprovecore ex_inc NULL
ex extensions\source\oooimprovement nmake - all ex_oooimprovement ex_inc NULL
-ex extensions\source\preload nmake - all ex_preload ex_inc NULL
ex extensions\source\config\ldap nmake - all ex_ldap ex_inc NULL
ex extensions\source\nsplugin\source nmake - u ex_nsplugin ex_inc NULL
ex extensions\source\nsplugin\source nmake - w ex_nsplugin ex_inc NULL
ex extensions\source\update\feed nmake - all ex_updchkfeed ex_inc NULL
ex extensions\source\update\check nmake - all ex_updchk ex_inc NULL
ex extensions\source\update\ui nmake - all ex_updchkui ex_inc NULL
-ex extensions\util nmake - all ex_util ex_preload ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
+ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
# Fails at the moment
# ex extensions\qa\complex\extensions nmake - all ex_complex ex_util NULL
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst
index 9d7b7de..8f726eb 100644
--- a/extensions/prj/d.lst
+++ b/extensions/prj/d.lst
@@ -49,7 +49,6 @@ mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\misc\oooimprovement.component %_DEST%\xml\oooimprovement.component
..\%__SRC%\misc\pcr.component %_DEST%\xml\pcr.component
..\%__SRC%\misc\pl.component %_DEST%\xml\pl.component
-..\%__SRC%\misc\preload.component %_DEST%\xml\preload.component
..\%__SRC%\misc\res.component %_DEST%\xml\res.component
..\%__SRC%\misc\scn.component %_DEST%\xml\scn.component
..\%__SRC%\misc\updatefeed.component %_DEST%\xml\updatefeed.component
diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk
deleted file mode 100644
index 8bd6226..0000000
--- a/extensions/source/preload/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=preload
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=preload
-CDEFS+=-DCOMPMOD_RESPREFIX=preload
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/services.obj\
- $(SLO)$/modulepreload.obj\
- $(SLO)$/preloadservices.obj\
- $(SLO)$/oemwiz.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= preload.src
-
-RESLIB1NAME=preload
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= $(SRS)$/preload.srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
- $(SFXLIB) \
- $(SVTOOLLIB)\
- $(VCLLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/preload.component
-
-$(MISC)/preload.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- preload.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt preload.component
diff --git a/extensions/source/preload/modulepreload.cxx b/extensions/source/preload/modulepreload.cxx
deleted file mode 100644
index ead9753..0000000
--- a/extensions/source/preload/modulepreload.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-
-#include "componentmodule.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
deleted file mode 100644
index a41acf0..0000000
--- a/extensions/source/preload/oemwiz.cxx
+++ /dev/null
@@ -1,445 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_extensions.hxx"
-#include "oemwiz.hxx"
-#include "componentmodule.hxx"
-#include <tools/debug.hxx>
-#include <sfx2/docfile.hxx>
-#include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
-#include <vcl/msgbox.hxx>
-#include <unotools/pathoptions.hxx>
-#include "preload.hrc"
-#include <svx/svxids.hrc>
-#include <sfx2/app.hxx>
-#include <svtools/xtextedt.hxx>
-#include "osl/diagnose.h"
-#include "tools/urlobj.hxx"
-
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svx/dialogs.hrc>
-
-//.........................................................................
-namespace preload
-{
-//.........................................................................
-
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::beans;
-//.........................................................................
-
- struct OEMPreloadDialog_Impl
- {
- SfxItemSet* pSet;
- TabPage* pWelcomePage;
- TabPage* pLicensePage;
- TabPage* pUserDataPage;
-
- OEMPreloadDialog_Impl(OEMPreloadDialog* pDialog);
- ~OEMPreloadDialog_Impl()
- {
- delete pWelcomePage;
- delete pLicensePage;
- delete pUserDataPage;
- delete pSet;
- }
- void WriteUserData();
- };
-
- OEMPreloadDialog_Impl::OEMPreloadDialog_Impl(OEMPreloadDialog* pDialog)
- {
- SfxItemPool& rPool = SFX_APP()->GetPool();
- pSet = new SfxItemSet(rPool, SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS);
- SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- if ( pFact )
- {
- CreateTabPage pFunc = pFact->GetTabPageCreatorFunc(RID_SFXPAGE_GENERAL);
- pUserDataPage = (*pFunc)(pDialog, *pSet);
- ((SfxTabPage*)pUserDataPage)->Reset(*pSet);
- }
- else
- pUserDataPage = NULL;
- pWelcomePage = new OEMWelcomeTabPage(pDialog);
- pLicensePage = new OEMLicenseTabPage(pDialog);
- }
-
- void OEMPreloadDialog_Impl::WriteUserData()
- {
- if ( pUserDataPage )
- ((SfxTabPage*)pUserDataPage)->FillItemSet(*pSet);
- }
-
- //=====================================================================
- //= OEMPreloadDialog
- //=====================================================================
- //---------------------------------------------------------------------
- OEMPreloadDialog::OEMPreloadDialog( Window* _pParent,
- const Reference< XPropertySet >& /*_rxObjectModel*/, const Reference< XMultiServiceFactory >& /*_rxORB*/ )
- :WizardDialog(_pParent, ModuleRes(RID_DLG_OEMWIZARD)/*, _rxObjectModel, _rxORB*/)
- ,aPrevPB(this, ModuleRes(PB_PREV ))
- ,aNextPB(this, ModuleRes(PB_NEXT ))
- ,aCancelPB(this, ModuleRes(PB_CANCEL ))
- ,aAcceptST(ModuleRes(ST_ACCEPT))
- ,aFinishST(ModuleRes(ST_FINISH))
- ,aLicense(ModuleRes(ST_LICENSE_AGREEMENT))
- ,aUserData(ModuleRes(ST_INSERT_USER_DATA))
- ,pImpl(new OEMPreloadDialog_Impl(this))
- {
- FreeResource();
- aDlgTitle = GetText();
- aPrevPB.Enable(sal_False);
- aNextST = aNextPB.GetText();
- aPrevPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
- aNextPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
- AddButton( &aPrevPB, WIZARDDIALOG_BUTTON_STDOFFSET_X );
- AddButton( &aNextPB, WIZARDDIALOG_BUTTON_STDOFFSET_X );
- AddButton( &aCancelPB, WIZARDDIALOG_BUTTON_STDOFFSET_X );
-
- SetPrevButton(&aPrevPB);
- SetNextButton(&aNextPB);
-
- AddPage( pImpl->pWelcomePage );
- AddPage( pImpl->pLicensePage );
- if ( pImpl->pUserDataPage )
- AddPage( pImpl->pUserDataPage );
- SetPage( OEM_WELCOME, pImpl->pWelcomePage );
- SetPage( OEM_LICENSE, pImpl->pLicensePage );
- if ( pImpl->pUserDataPage )
- SetPage( OEM_USERDATA, pImpl->pUserDataPage );
- ShowPage( OEM_WELCOME );
- }
-
- OEMPreloadDialog::~OEMPreloadDialog( )
- {
- delete pImpl;
- }
-
- IMPL_LINK(OEMPreloadDialog, NextPrevPageHdl, PushButton*, pButton)
- {
- if(pButton == &aPrevPB)
- {
- if(GetCurLevel())
- ShowPage(GetCurLevel() - 1);
- }
- else if(OEM_USERDATA > GetCurLevel())
- ShowPage(GetCurLevel() + 1);
- else
- {
- pImpl->WriteUserData();
- Finnish(RET_OK);
- }
-
- String sTitle(aDlgTitle);
-
- switch(GetCurLevel())
- {
- case OEM_WELCOME:
- aNextPB.SetText(aNextST);
- aNextPB.Enable(sal_True);
- break;
- case OEM_LICENSE:
- sTitle += aLicense;
- aNextPB.SetText(aNextST);
- aCancelPB.GrabFocus();
- break;
- case OEM_USERDATA:
- sTitle += aUserData;
- aNextPB.SetText(aFinishST);
- break;
- }
- SetText(sTitle);
- aPrevPB.Enable(GetCurLevel() != OEM_WELCOME);
- return 0;
- }
-
- sal_Bool OEMPreloadDialog::LoadFromLocalFile(const String& rFileName, String& rContent)
- {
- SvtPathOptions aPathOpt;
- String sFileName = aPathOpt.GetUserConfigPath();//GetModulePath();
- INetURLObject aURLObject(sFileName);
- OSL_ASSERT(aURLObject.getSegmentCount() >= 2);
- aURLObject.removeSegment(); //remove '/config'
- aURLObject.removeSegment(); //remove '/user'
- sFileName = aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI);
- sFileName += rFileName;
-
- SfxMedium aMedium( sFileName,STREAM_READ, sal_True );
- SvStream* pInStream = aMedium.GetInStream();
- if( !pInStream )
- return sal_False;
-
- pInStream->ReadCString( rContent, RTL_TEXTENCODING_UTF8 );
-
- xub_StrLen nPos;
- while ( ( nPos = rContent.Search( 12 )) != STRING_NOTFOUND )
- rContent.Erase( nPos, 1 );
- return sal_True;
- }
-
-
- void OEMPreloadDialog::SetCancelString( const String& rText )
- {
- aCancelPB.SetText(rText);
- }
-
- OEMWelcomeTabPage::OEMWelcomeTabPage(Window* pParent) :
- TabPage(pParent, ModuleRes(RID_TP_WELCOME)),
- aInfoFT(this, ModuleRes(FT_INFO))
- {
- FreeResource();
- }
-
- OEMWelcomeTabPage::~OEMWelcomeTabPage()
- {
- }
-
- OEMLicenseTabPage::OEMLicenseTabPage(OEMPreloadDialog* pParent) :
- TabPage(pParent, ModuleRes(RID_TP_LICENSE)),
- aLicenseML(this, ModuleRes(ML_LICENSE)),
- aInfo1FT(this, ModuleRes(FT_INFO1)),
- aInfo2FT(this, ModuleRes(FT_INFO2)),
- aInfo3FT(this, ModuleRes(FT_INFO3)),
- aInfo2_1FT(this, ModuleRes(FT_INFO2_1)),
- aInfo3_1FT(this, ModuleRes(FT_INFO3_1)),
- aCBAccept(this, ModuleRes(CB_ACCEPT)),
- aPBPageDown(this, ModuleRes(PB_PAGEDOWN)),
- aArrow(this, ModuleRes(IMG_ARROW)),
- aStrAccept( ModuleRes(LICENCE_ACCEPT) ),
- aStrNotAccept( ModuleRes(LICENCE_NOTACCEPT) ),
- bEndReached(sal_False),
- pPreloadDialog(pParent)
- {
- FreeResource();
-
- aLicenseML.SetEndReachedHdl( LINK(this, OEMLicenseTabPage, EndReachedHdl) );
- aLicenseML.SetScrolledHdl( LINK(this, OEMLicenseTabPage, ScrolledHdl) );
-
- aPBPageDown.SetClickHdl( LINK(this, OEMLicenseTabPage, PageDownHdl) );
- aCBAccept.SetClickHdl( LINK(this, OEMLicenseTabPage, AcceptHdl) );
-
- // We want a automatic repeating page down button
- WinBits aStyle = aPBPageDown.GetStyle();
- aStyle |= WB_REPEAT;
- aPBPageDown.SetStyle( aStyle );
-
- aOldCancelText = pPreloadDialog->GetCancelString();
- pPreloadDialog->SetCancelString( aStrNotAccept );
-
- String aText = aInfo2FT.GetText();
- aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"), aPBPageDown.GetText() );
- aInfo2FT.SetText( aText );
- }
-
- OEMLicenseTabPage::~OEMLicenseTabPage()
- {
- }
-
- void OEMLicenseTabPage::ActivatePage()
- {
- if(!aLicenseML.GetText().Len())
- {
- aLicenseML.SetLeftMargin( 5 );
- String sLicense;
-#ifdef UNX
- OEMPreloadDialog::LoadFromLocalFile(String::CreateFromAscii("LICENSE"), sLicense);
-#else
- OEMPreloadDialog::LoadFromLocalFile(String::CreateFromAscii("license.txt"), sLicense);
-#endif
- aLicenseML.SetText( sLicense );
- }
-
- EnableControls();
- }
-
- //------------------------------------------------------------------------
- IMPL_LINK( OEMLicenseTabPage, AcceptHdl, CheckBox *, EMPTYARG )
- {
- EnableControls();
- return 0;
- }
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list