From 2b4fd2c89a38ccac13c72f2e94501a8702e7da4b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 6 Nov 2012 12:12:33 +0000 Subject: re-base on ALv2 code. Includes: Patches contributed by Pedro Giffuni: Avoid some uses of non portable #!/bin/bash in shell scripts. http://svn.apache.org/viewvc?view=revision&revision=1235297 Reduce the dependencies on non standard GNU copy. http://svn.apache.org/viewvc?view=revision&revision=1238684 Correct /usr/bin/env path. http://svn.apache.org/viewvc?view=revision&revision=1235619 Complex Toolbar Controls Extension from the SDK Patches contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1190390 i118615 - make epm more verbose http://svn.apache.org/viewvc?view=revision&revision=1204288 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 Patches contributed by Juergen Schmidt: jsc341: i117327: take care if no dependency node in current description exists, create one http://svn.apache.org/viewvc?view=revision&revision=1172101 jsc341: i117327: add extra extension dependency check http://svn.apache.org/viewvc?view=revision&revision=1172098 make initial branding changes http://svn.apache.org/viewvc?view=revision&revision=1231878 Patches contributed by Ingo Schmidt native373: #i117733# no linux jre installation on 64 bit systems http://svn.apache.org/viewvc?view=revision&revision=1167536 native373: ##164464# improve debian support http://svn.apache.org/viewvc?view=revision&revision=1167537 Patch contribtued by Armin Le-Grand: Changed various aspects concerning usages of old vendor names http://svn.apache.org/viewvc?view=revision&revision=1293313 fix for neon webdav, remove coinmp bits, improve odk script, cleanup & remove OS/2 conditionals, system ucpp fixes, remove OS/2 conditionals, restore our license filenames. --- cui/source/dialogs/about.cxx | 3 - .../deployment/inc/dp_descriptioninfoset.hxx | 51 +-- .../deployment/misc/dp_descriptioninfoset.cxx | 158 ++++++-- odk/cfgWin.js | 17 + odk/configure.pl | 4 +- odk/docs/common/ref/idl.css | 18 +- odk/docs/images/orc-main-app_32.png | Bin 2496 -> 0 bytes odk/docs/install.html | 222 ++++++----- odk/docs/notsupported.html | 72 ++-- odk/docs/sdk_styles.css | 18 +- odk/docs/tools.html | 442 +++++++++++---------- odk/examples/CLI/CSharp/Spreadsheet/Makefile | 17 + odk/examples/CLI/VB.NET/WriterDemo/WriterDemo.vb | 61 ++- .../ToolkitControls/ToolkitControls/FileDialog.xba | 17 + .../ToolkitControls/FileDialogDlg.xdl | 17 + .../ToolkitControls/ToolkitControls/MultiPage.xba | 17 + .../ToolkitControls/MultiPageDlg.xdl | 17 + .../ToolkitControls/ProgressBar.xba | 17 + .../ToolkitControls/ProgressBarDlg.xdl | 17 + .../ToolkitControls/ToolkitControls/ScrollBar.xba | 17 + .../ToolkitControls/ScrollBarDlg.xdl | 17 + .../Components/Addons/JobsAddon/Addons.xcu | 17 + .../Components/Addons/JobsAddon/Jobs.xcu | 17 + .../Addons/ProtocolHandlerAddon_cpp/Addons.xcu | 17 + .../ProtocolHandlerAddon_cpp/ProtocolHandler.xcu | 18 +- .../Addons/ProtocolHandlerAddon_java/Addons.xcu | 17 + .../ProtocolHandlerAddon_java/ProtocolHandler.xcu | 17 + .../Components/SimpleLicense/description.xml | 17 + .../DevelopersGuide/Components/Thumbs/thumbs.mk | 18 + .../DriverSkeleton/How_to_write_my_own_driver.txt | 22 +- .../Extensions/DialogWithHelp/Addons.xcu | 20 +- .../DialogWithHelp/DialogWithHelp/Dialog1.xdl | 19 +- .../DialogWithHelp/DialogWithHelp/Module1.xba | 17 + .../DialogWithHelp/META-INF/manifest.xml | 19 +- .../Extensions/DialogWithHelp/description.xml | 19 +- .../help/de/com.foocorp.foo-ext/page1.xhp | 19 +- .../help/de/com.foocorp.foo-ext/page2.xhp | 19 +- .../com.foocorp.foo-ext/subfolder/anotherpage.xhp | 19 +- .../help/en/com.foocorp.foo-ext/page1.xhp | 19 +- .../help/en/com.foocorp.foo-ext/page2.xhp | 19 +- .../com.foocorp.foo-ext/subfolder/anotherpage.xhp | 19 +- .../FirstSteps/build_FirstUnoContact.xml | 17 + odk/examples/DevelopersGuide/Forms/URLHelper.java | 33 +- .../AsciiFilter/TypeDetection.xcu | 17 + .../FlatXmlTypeDetection.xcu | 17 + .../FlatXmlFilter_cpp/FlatXmlFilter_cpp.uno.xml | 17 + .../FlatXmlFilter_cpp/FlatXmlFilter_cpp.xcu | 17 + .../FlatXmlFilter_java/FlatXmlFilter_java.xcu | 17 + .../SayHello/SayHello/parcel-descriptor.xml | 18 +- .../ScriptingFramework/SayHello/build.xml | 18 + .../ScriptSelector/parcel-descriptor.xml | 18 +- .../ScriptingFramework/ScriptSelector/build.xml | 18 + .../Spreadsheet/DataPilotReadme.txt | 28 +- odk/examples/DevelopersGuide/examples.html | 22 +- odk/examples/OLE/activex/example.html | 18 + odk/examples/cpp/complextoolbarcontrols/Addons.xcu | 33 +- .../cpp/complextoolbarcontrols/CalcWindowState.xcu | 17 + odk/examples/cpp/complextoolbarcontrols/Jobs.xcu | 18 +- .../cpp/complextoolbarcontrols/ListenerHelper.cxx | 37 +- .../cpp/complextoolbarcontrols/ListenerHelper.h | 48 ++- odk/examples/cpp/complextoolbarcontrols/MyJob.cxx | 48 +-- odk/examples/cpp/complextoolbarcontrols/MyJob.h | 99 +---- .../cpp/complextoolbarcontrols/MyListener.cxx | 61 ++- .../cpp/complextoolbarcontrols/MyListener.h | 22 +- .../complextoolbarcontrols/MyProtocolHandler.cxx | 270 ++++++------- .../cpp/complextoolbarcontrols/MyProtocolHandler.h | 28 +- .../cpp/complextoolbarcontrols/ProtocolHandler.xcu | 17 + .../complextoolbarcontrols/WriterWindowState.xcu | 17 + .../cpp/complextoolbarcontrols/exports.cxx | 68 +--- odk/examples/examples.html | 22 +- .../java/ConverterServlet/ConverterServlet.html | 18 + odk/examples/java/ConverterServlet/web.xml | 89 ++++- .../EmbeddedObject/EmbeddedObject.xcu | 17 + odk/examples/java/Inspector/Addon.xcu | 28 -- odk/examples/java/Inspector/Addons.xcu | 17 + odk/examples/java/Inspector/ObjectInspector.xcs | 30 +- odk/examples/java/Inspector/ObjectInspector.xcu | 17 + odk/examples/java/Inspector/ProtocolHandler.xcu | 17 + .../MinimalComponent/BuildMinimalComponent.xml | 20 +- odk/inc/makefile.mk | 33 +- odk/index.html | 155 ++++---- odk/pack/checkinc/makefile.mk | 33 +- odk/pack/copying/addsym-macosx.sh | 19 +- odk/pack/copying/makefile.mk | 34 +- odk/pack/gendocu/makefile.mk | 33 +- odk/setsdkenv_unix | 17 + odk/setsdkenv_unix.csh.in | 17 + odk/setsdkenv_unix.sh.in | 31 +- odk/setsdkenv_windows.bat | 18 + odk/setsdkenv_windows.template | 18 + odk/setsdkname.bat | 17 + odk/settings/settings.mk | 18 + odk/settings/std.mk | 18 + odk/settings/stdtarget.mk | 18 + .../sun/star/lib/loader/InstallationFinder.java | 37 +- odk/source/com/sun/star/lib/loader/Loader.java | 37 +- odk/source/unoapploader/unx/makefile.mk | 33 +- odk/source/unoapploader/unx/unoapploader.c | 37 +- odk/source/unoapploader/win/unoapploader.c | 37 +- odk/source/unowinreg/win/makefile.mk | 33 +- odk/util/check.pl | 36 +- odk/util/makefile.mk | 18 + odk/util/makefile.pmk | 36 +- odk/util/odk_rules.pmk | 33 +- officecfg/Configuration_officecfg.mk | 1 + .../openoffice/Office/ExtensionDependencies.xcu | 122 ++++++ officecfg/registry/files.mk | 1 + .../openoffice/Office/ExtensionDependencies.xcs | 44 ++ postprocess/packcomponents/makefile.mk | 37 +- .../macosx/macosx_menubar_modification.xsl | 23 +- postprocess/packregistry/makefile.mk | 35 +- setup_native/scripts/admin.pl | 33 +- setup_native/scripts/downloadscript.sh | 17 + setup_native/scripts/fake-db.spec | 20 +- setup_native/scripts/install_linux.sh | 17 + setup_native/scripts/install_solaris.sh | 19 +- setup_native/scripts/javaloader.sh | 73 +++- setup_native/scripts/langpackscript.sh | 17 + setup_native/scripts/linuxpatchscript.sh | 17 + setup_native/scripts/mac_install.script | 17 + setup_native/scripts/makefile.mk | 33 +- .../scripts/osx_install_languagepack.applescript | 17 + setup_native/scripts/osx_install_patch.applescript | 17 + setup_native/scripts/source/makefile.mk | 33 +- setup_native/scripts/uninstall_linux.sh | 17 + setup_native/scripts/uninstall_solaris.sh | 19 +- setup_native/scripts/unpack_update.sh | 17 + setup_native/scripts/update.sh | 17 + setup_native/source/mac/Info.plist.langpack | 19 +- setup_native/source/mac/makefile.mk | 33 +- setup_native/source/packinfo/finals_instsetoo.txt | 18 + .../source/packinfo/packinfo_accessories.txt | 18 + setup_native/source/packinfo/packinfo_brand.txt | 65 ++- .../source/packinfo/packinfo_extensions.txt | 38 +- setup_native/source/packinfo/packinfo_office.txt | 212 +++++----- .../source/packinfo/packinfo_office_help.txt | 22 +- .../source/packinfo/packinfo_office_lang.txt | 68 ++-- setup_native/source/packinfo/packinfo_sdkoo.txt | 35 +- setup_native/source/packinfo/packinfo_test.txt | 45 +-- setup_native/source/packinfo/packinfo_ure.txt | 39 +- .../source/packinfo/shellscripts_core01.txt | 18 + .../source/packinfo/shellscripts_module.txt | 18 + .../source/packinfo/spellchecker_selection.txt | 18 + .../indexingfilter/restartindexingservice.cxx | 37 +- .../win32/customactions/javafilter/makefile.mk | 33 +- .../languagepacks/lngpckinsthelper.cxx | 37 +- .../win32/customactions/languagepacks/makefile.mk | 33 +- .../customactions/languagepacks/respintest.cxx | 37 +- .../source/win32/customactions/patch/makefile.mk | 33 +- .../win32/customactions/patch/swappatchfiles.cxx | 37 +- .../win32/customactions/quickstarter/makefile.mk | 33 +- .../customactions/quickstarter/quickstarter.cxx | 18 + .../win32/customactions/reg4allmsdoc/makefile.mk | 33 +- .../customactions/reg4allmsdoc/reg4allmsi.cxx | 37 +- .../win32/customactions/regactivex/makefile.mk | 33 +- .../win32/customactions/regactivex/regactivex.cxx | 37 +- .../customactions/regpatchactivex/makefile.mk | 33 +- .../source/win32/customactions/sellang/makefile.mk | 35 +- .../source/win32/customactions/sellang/sellang.cxx | 39 +- .../win32/customactions/sellang/sorttree.cxx | 2 +- .../shellextensions/completeinstallpath.cxx | 37 +- .../shellextensions/copyextensiondata.cxx | 37 +- .../customactions/shellextensions/layerlinks.cxx | 37 +- .../customactions/shellextensions/makefile.mk | 33 +- .../shellextensions/migrateinstallpath.cxx | 37 +- .../shellextensions/postuninstall.cxx | 37 +- .../shellextensions/startmenuicon.cxx | 37 +- .../customactions/shellextensions/vistaspecial.cxx | 37 +- .../win32/customactions/thesaurus/makefile.mk | 35 +- .../win32/customactions/thesaurus/thesaurus.cxx | 41 +- .../source/win32/customactions/tools/makefile.mk | 33 +- .../source/win32/wintools/makecab/parseddf.h | 8 + solenv/Makefile | 7 + solenv/bin/add-modelines | 11 +- solenv/bin/addsym-macosx.sh | 19 +- solenv/bin/callcatchEnv.Set.sh | 7 + solenv/bin/callcatcher.Makefile | 7 + solenv/bin/concat-deps.pl | 7 + solenv/bin/create-ids | 7 + solenv/bin/create-tags | 8 +- solenv/bin/dbgsv.ini | 33 +- solenv/bin/guw.pl | 33 +- solenv/bin/id-lang.map | 7 + solenv/bin/image-sort.pl | 20 +- solenv/bin/linkoo | 54 +-- solenv/bin/macosx-dylib-link-list.pl | 33 +- solenv/bin/makemani.pl | 33 +- solenv/bin/mkdocs.sh | 6 + solenv/bin/mkout.pl | 33 +- solenv/bin/modules/installer/epmfile.pm | 71 ++-- solenv/bin/modules/installer/scppatchsoname.pm | 33 +- solenv/bin/modules/installer/windows/assembly.pm | 33 +- solenv/bin/modules/installer/windows/binary.pm | 33 +- solenv/bin/modules/installer/windows/font.pm | 33 +- solenv/bin/modules/installer/windows/language.pm | 33 +- solenv/bin/modules/par2script/files.pm | 33 +- solenv/bin/modules/par2script/globals.pm | 33 +- solenv/bin/modules/par2script/systemactions.pm | 33 +- solenv/bin/modules/pre2par/files.pm | 33 +- solenv/bin/modules/pre2par/parameter.pm | 33 +- solenv/bin/modules/pre2par/systemactions.pm | 33 +- solenv/bin/ooinstall | 7 + solenv/bin/packager.pl | 33 +- solenv/bin/packimages.pl | 33 +- solenv/bin/packregistry.xslt | 44 +- solenv/bin/pre2par.pl | 33 +- solenv/bin/relocate | 50 +-- solenv/bin/striplanguagetags.sh | 20 +- solenv/inc/productversion.mk | 38 +- solenv/src/default_description.xml | 17 + svtools/inc/svtools/fixedhyper.hxx | 38 +- svtools/source/control/fixedhyper.cxx | 38 +- sysui/desktop/debian/makefile.mk | 33 +- sysui/desktop/debian/postinst | 17 + sysui/desktop/freedesktop/freedesktop-menus.spec | 49 ++- sysui/desktop/freedesktop/makefile.mk | 33 +- sysui/desktop/icons/makefile.mk | 33 +- sysui/desktop/macosx/Info.plist | 17 + sysui/desktop/macosx/makefile.mk | 33 +- sysui/desktop/mandriva/mandriva-menus.spec | 23 +- sysui/desktop/menus/base.desktop | 17 + sysui/desktop/menus/calc.desktop | 17 + sysui/desktop/menus/draw.desktop | 17 + sysui/desktop/menus/impress.desktop | 17 + sysui/desktop/menus/javafilter.desktop | 17 + sysui/desktop/menus/math.desktop | 17 + sysui/desktop/menus/printeradmin.desktop | 17 + sysui/desktop/menus/qstart.desktop | 17 + sysui/desktop/menus/startcenter.desktop | 21 +- sysui/desktop/menus/writer.desktop | 17 + sysui/desktop/mimetypes/drawing-template.desktop | 17 + sysui/desktop/mimetypes/drawing.desktop | 17 + sysui/desktop/mimetypes/extension.desktop | 17 + sysui/desktop/mimetypes/formula.desktop | 17 + sysui/desktop/mimetypes/master-document.desktop | 17 + sysui/desktop/mimetypes/ms-excel-sheet-12.desktop | 17 + .../mimetypes/ms-excel-sheet-binary-12.desktop | 17 + sysui/desktop/mimetypes/ms-excel-sheet.desktop | 17 + .../desktop/mimetypes/ms-excel-template-12.desktop | 17 + .../ms-powerpoint-presentation-12.desktop | 17 + .../mimetypes/ms-powerpoint-presentation.desktop | 17 + .../mimetypes/ms-powerpoint-template-12.desktop | 17 + .../desktop/mimetypes/ms-word-document-12.desktop | 17 + sysui/desktop/mimetypes/ms-word-document.desktop | 17 + sysui/desktop/mimetypes/ms-word-document2.desktop | 17 + .../desktop/mimetypes/ms-word-template-12.desktop | 17 + sysui/desktop/mimetypes/oasis-database.desktop | 17 + .../mimetypes/oasis-drawing-template.desktop | 17 + sysui/desktop/mimetypes/oasis-drawing.desktop | 17 + sysui/desktop/mimetypes/oasis-formula.desktop | 17 + .../mimetypes/oasis-master-document.desktop | 17 + .../mimetypes/oasis-presentation-template.desktop | 17 + sysui/desktop/mimetypes/oasis-presentation.desktop | 17 + .../mimetypes/oasis-spreadsheet-template.desktop | 17 + sysui/desktop/mimetypes/oasis-spreadsheet.desktop | 17 + .../desktop/mimetypes/oasis-text-template.desktop | 17 + sysui/desktop/mimetypes/oasis-text.desktop | 17 + sysui/desktop/mimetypes/oasis-web-template.desktop | 17 + ...icedocument-presentationml-presentation.desktop | 17 + ...-officedocument-presentationml-template.desktop | 17 + ...mats-officedocument-spreadsheetml-sheet.desktop | 17 + ...s-officedocument-spreadsheetml-template.desktop | 17 + ...fficedocument-wordprocessingml-document.desktop | 17 + ...fficedocument-wordprocessingml-template.desktop | 17 + .../mimetypes/presentation-template.desktop | 17 + sysui/desktop/mimetypes/presentation.desktop | 17 + .../desktop/mimetypes/spreadsheet-template.desktop | 17 + sysui/desktop/mimetypes/spreadsheet.desktop | 17 + sysui/desktop/mimetypes/text-template.desktop | 17 + sysui/desktop/mimetypes/text.desktop | 17 + sysui/desktop/productversion.mk | 35 +- sysui/desktop/share/brand.pl | 33 +- sysui/desktop/share/create_mime_xml.pl | 18 + sysui/desktop/share/create_tree.sh | 18 + sysui/desktop/share/launcher_comment.ulf | 18 + sysui/desktop/share/makefile.mk | 37 +- sysui/desktop/share/translate.pl | 33 +- sysui/desktop/slackware/makefile.mk | 33 +- sysui/desktop/slackware/slack-desc | 4 +- sysui/desktop/solaris/mailcap | 20 +- sysui/desktop/solaris/makefile.mk | 33 +- sysui/desktop/solaris/mime.types | 18 + sysui/desktop/solaris/pkginfo | 4 +- sysui/desktop/solaris/postinstall | 17 + sysui/desktop/solaris/postremove | 17 + sysui/desktop/suse/suse-menus.spec | 51 ++- sysui/desktop/tg_rpm.mk | 33 +- sysui/desktop/util/makefile.mk | 33 +- sysui/source/win32/misc/WinImplHelper.cxx | 37 +- sysui/source/win32/misc/resourceprovider.cxx | 37 +- vcl/Library_desktop_detector.mk | 35 +- vcl/Library_vclplug_gen.mk | 33 +- vcl/Library_vclplug_gtk.mk | 33 +- vcl/Library_vclplug_gtk3.mk | 33 +- vcl/Module_vcl.mk | 34 +- vcl/Package_inc.mk | 33 +- vcl/WinResTarget_vcl.mk | 33 +- vcl/aqua/source/app/vclnsapp.mm | 86 ++-- .../source/gdi/coretext/salcoretextfontutils.cxx | 17 + vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx | 17 + vcl/aqua/source/gdi/coretext/salcoretextstyle.cxx | 17 + vcl/aqua/source/gdi/coretext/salgdi.cxx | 17 + vcl/aqua/source/gdi/salgdicommon.cxx | 4 +- vcl/aqua/source/gdi/salprn.cxx | 38 +- vcl/aqua/source/window/salframe.cxx | 37 +- vcl/generic/app/gendisp.cxx | 38 +- vcl/generic/app/geninst.cxx | 38 +- vcl/generic/app/gensys.cxx | 38 +- vcl/generic/fontmanager/fontsubst.cxx | 37 +- vcl/generic/glyphs/gcach_ftyp.cxx | 43 +- vcl/generic/glyphs/gcach_ftyp.hxx | 37 +- vcl/generic/glyphs/gcach_layout.cxx | 37 +- vcl/generic/glyphs/gcach_rbmp.cxx | 37 +- vcl/generic/glyphs/glyphcache.cxx | 37 +- vcl/generic/glyphs/graphite_serverfont.cxx | 37 +- vcl/inc/aqua/common.h | 20 +- vcl/inc/aqua/coretext/salcoretextfontutils.hxx | 17 + vcl/inc/aqua/coretext/salcoretextlayout.hxx | 17 + vcl/inc/aqua/coretext/salcoretextstyle.hxx | 18 +- vcl/inc/aqua/saldata.hxx | 37 +- vcl/inc/aqua/salgdi.h | 16 +- vcl/inc/generic/gendisp.hxx | 37 +- vcl/inc/generic/geninst.h | 38 +- vcl/inc/generic/glyphcache.hxx | 37 +- vcl/inc/headless/svpbmp.hxx | 43 +- vcl/inc/headless/svpdummies.hxx | 37 +- vcl/inc/headless/svpelement.hxx | 43 +- vcl/inc/headless/svpframe.hxx | 37 +- vcl/inc/headless/svpinst.hxx | 37 +- vcl/inc/headless/svpprn.hxx | 43 +- vcl/inc/headless/svpvd.hxx | 43 +- vcl/inc/ios/common.h | 17 + vcl/inc/ios/salcoretextfontutils.hxx | 37 +- vcl/inc/ios/salcoretextlayout.hxx | 37 +- vcl/inc/ios/salcoretextstyle.hxx | 17 + vcl/inc/ios/saldata.hxx | 37 +- vcl/inc/ios/salframe.h | 37 +- vcl/inc/ios/salframeview.h | 43 +- vcl/inc/ios/salgdi.h | 2 +- vcl/inc/ios/saluimenu.h | 43 +- vcl/inc/ios/salvd.h | 37 +- vcl/inc/ios/vcluiapp.h | 43 +- vcl/inc/sft.hxx | 37 +- vcl/inc/toolbox.h | 37 +- vcl/inc/unx/wmadaptor.hxx | 37 +- vcl/inc/vcl/ctrl.hxx | 37 +- vcl/inc/vcl/help.hxx | 37 +- vcl/inc/vcl/pdfextoutdevdata.hxx | 37 +- vcl/inc/vcl/rendergraphic.hxx | 123 ------ vcl/inc/vcl/rendergraphicrasterizer.hxx | 114 ------ vcl/inc/vcl/scopedbitmapaccess.hxx | 37 +- vcl/inc/vcl/settings.hxx | 37 +- vcl/inc/vcl/solarmutex.hxx | 38 +- vcl/inc/vcl/svgread.hxx | 86 ---- vcl/inc/vcl/sysdata.hxx | 37 +- vcl/inc/vcl/window.hxx | 37 +- vcl/ios/source/app/saldata.cxx | 37 +- vcl/ios/source/app/salinst.cxx | 37 +- vcl/ios/source/app/saltimer.cxx | 37 +- vcl/ios/source/app/vcluiapp.mm | 37 +- vcl/ios/source/dtrans/iOSTransferable.cxx | 37 +- vcl/ios/source/dtrans/service_entry.cxx | 43 +- vcl/ios/source/gdi/salcoretextfontutils.cxx | 37 +- vcl/ios/source/gdi/salcoretextlayout.cxx | 37 +- vcl/ios/source/gdi/salcoretextstyle.cxx | 17 + vcl/ios/source/gdi/salgdicommon.cxx | 33 +- vcl/ios/source/gdi/salnativewidgets.cxx | 37 +- vcl/ios/source/window/salframe.cxx | 37 +- vcl/ios/source/window/salframeview.mm | 37 +- vcl/ios/source/window/salmenu.cxx | 43 +- vcl/source/app/brand.cxx | 3 - vcl/source/app/help.cxx | 37 +- vcl/source/app/settings.cxx | 37 +- vcl/source/app/solarmutex.cxx | 43 +- vcl/source/control/ctrl.cxx | 37 +- vcl/source/gdi/bitmap3.cxx | 37 +- vcl/source/gdi/pdfextoutdevdata.cxx | 37 +- vcl/source/gdi/rendergraphic.cxx | 231 ----------- vcl/source/gdi/rendergraphicrasterizer.cxx | 405 ------------------- vcl/source/gdi/svgread.cxx | 143 ------- vcl/source/glyphs/graphite_layout.cxx | 37 +- vcl/source/src/fpicker.src | 20 + vcl/source/window/dndlcon.cxx | 37 +- vcl/source/window/menu.cxx | 37 +- vcl/source/window/toolbox2.cxx | 37 +- vcl/source/window/wrkwin.cxx | 37 +- vcl/unx/generic/app/saldata.cxx | 37 +- vcl/unx/generic/app/wmadaptor.cxx | 37 +- vcl/unx/generic/gdi/salgdi3.cxx | 37 +- vcl/unx/generic/plugadapt/salplug.cxx | 38 +- vcl/unx/generic/window/salframe.cxx | 37 +- vcl/unx/gtk/app/gtkdata.cxx | 37 +- vcl/unx/gtk/window/gtkframe.cxx | 37 +- vcl/unx/kde/FPServiceInfo.hxx | 44 +- vcl/unx/kde/UnxCommandThread.cxx | 37 +- vcl/unx/kde/UnxCommandThread.hxx | 37 +- vcl/unx/kde/UnxFilePicker.cxx | 38 +- vcl/unx/kde/UnxFilePicker.hxx | 38 +- vcl/unx/kde/UnxNotifyThread.cxx | 38 +- vcl/unx/kde/UnxNotifyThread.hxx | 38 +- vcl/unx/kde/fpicker/kdecommandthread.cxx | 37 +- vcl/unx/kde/fpicker/kdecommandthread.hxx | 37 +- vcl/unx/kde/fpicker/kdefilepicker.cxx | 37 +- vcl/unx/kde/fpicker/kdefilepicker.hxx | 37 +- vcl/unx/kde/fpicker/kdefpmain.cxx | 37 +- vcl/unx/kde/fpicker/kdemodalityfilter.cxx | 43 +- vcl/unx/kde/fpicker/kdemodalityfilter.hxx | 43 +- vcl/unx/x11/x11sys.cxx | 38 +- vcl/win/source/app/salinfo.cxx | 37 +- vcl/win/source/gdi/salgdi3.cxx | 37 +- vcl/win/source/gdi/winlayout.cxx | 37 +- vcl/win/source/window/salframe.cxx | 37 +- 412 files changed, 7233 insertions(+), 6674 deletions(-) delete mode 100644 odk/docs/images/orc-main-app_32.png delete mode 100644 odk/examples/java/Inspector/Addon.xcu create mode 100644 officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu create mode 100644 officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs mode change 100755 => 100644 solenv/bin/guw.pl mode change 100755 => 100644 solenv/bin/packimages.pl mode change 100755 => 100644 sysui/desktop/share/brand.pl mode change 100755 => 100644 sysui/desktop/share/translate.pl delete mode 100644 vcl/inc/vcl/rendergraphic.hxx delete mode 100644 vcl/inc/vcl/rendergraphicrasterizer.hxx delete mode 100644 vcl/inc/vcl/svgread.hxx delete mode 100644 vcl/source/gdi/rendergraphic.cxx delete mode 100644 vcl/source/gdi/rendergraphicrasterizer.cxx delete mode 100644 vcl/source/gdi/svgread.cxx diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index f89081a053d5..1c28e53bd482 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -44,9 +44,6 @@ #include #include #include -#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE -# include -#endif #include using namespace ::com::sun::star::uno; diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index d16e9127af8a..8a5361be372e 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DESCRIPTIONINFOSET_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_DESCRIPTIONINFOSET_HXX @@ -277,6 +268,20 @@ private: SAL_DLLPRIVATE ::rtl::OUString getNodeValueFromExpression(::rtl::OUString const & expression) const; + /** Check the extensions blacklist if additional extension meta data (e.g. dependencies) + are defined for this extension and have to be taken into account. + */ + SAL_DLLPRIVATE void + checkBlacklist() const; + + /** Helper method to compare the versions with the current version + */ + SAL_DLLPRIVATE bool + checkBlacklistVersion(::rtl::OUString currentversion, + ::com::sun::star::uno::Sequence< ::rtl::OUString > const & versions) const; + + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XComponentContext > m_context; ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > m_element; ::com::sun::star::uno::Reference< diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 48054bd77102..534b1c6afabc 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -1,31 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dp_descriptioninfoset.hxx" @@ -33,10 +23,15 @@ #include "sal/config.h" #include "comphelper/sequence.hxx" +#include "comphelper/seqstream.hxx" #include "comphelper/makesequence.hxx" #include "comphelper/processfactory.hxx" #include "boost/optional.hpp" +#include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/beans/Optional.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/io/SequenceInputStream.hpp" #include "com/sun/star/lang/XMultiComponentFactory.hpp" #include "com/sun/star/lang/Locale.hpp" #include "com/sun/star/uno/Reference.hxx" @@ -361,6 +356,7 @@ DescriptionInfoset getDescriptionInfoset(OUString const & sExtensionFolderURL) DescriptionInfoset::DescriptionInfoset( css::uno::Reference< css::uno::XComponentContext > const & context, css::uno::Reference< css::xml::dom::XNode > const & element): + m_context(context), m_element(element) { css::uno::Reference< css::lang::XMultiComponentFactory > manager( @@ -403,6 +399,117 @@ DescriptionInfoset::~DescriptionInfoset() {} return n.is() ? getNodeValue(n) : ::rtl::OUString(); } +void DescriptionInfoset::checkBlacklist() const +{ + if (m_element.is()) { + boost::optional< OUString > id(getIdentifier()); + if (!id) + return; // nothing to check + OUString currentversion(getVersion()); + if (currentversion.getLength() == 0) + return; // nothing to check + + css::uno::Reference< css::lang::XMultiComponentFactory > manager( + m_context->getServiceManager(), css::uno::UNO_QUERY_THROW); + css::uno::Reference< css::lang::XMultiServiceFactory> provider( + manager->createInstanceWithContext( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), m_context), + css::uno::UNO_QUERY_THROW); + + css::uno::Sequence< css::uno::Any > args = css::uno::Sequence< css::uno::Any >(1); + css::beans::PropertyValue prop; + prop.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); + prop.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.ExtensionDependencies/Extensions")); + args[0] <<= prop; + + css::uno::Reference< css::container::XNameAccess > blacklist( + provider->createInstanceWithArguments( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), args), + css::uno::UNO_QUERY_THROW); + + // check first if a blacklist entry is available + if (blacklist.is() && blacklist->hasByName(*id)) { + css::uno::Reference< css::beans::XPropertySet > extProps( + blacklist->getByName(*id), css::uno::UNO_QUERY_THROW); + + css::uno::Any anyValue = extProps->getPropertyValue( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Versions"))); + + css::uno::Sequence< ::rtl::OUString > blversions; + anyValue >>= blversions; + + // check if the current version requires further dependency checks from the blacklist + if (checkBlacklistVersion(currentversion, blversions)) { + anyValue = extProps->getPropertyValue( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dependencies"))); + ::rtl::OUString udeps; + anyValue >>= udeps; + + if (udeps.getLength() == 0) + return; // nothing todo + + ::rtl::OString xmlDependencies = ::rtl::OUStringToOString(udeps, RTL_TEXTENCODING_UNICODE); + + css::uno::Reference< css::xml::dom::XDocumentBuilder> docbuilder( + manager->createInstanceWithContext( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder")), m_context), + css::uno::UNO_QUERY_THROW); + + css::uno::Sequence< sal_Int8 > byteSeq((const sal_Int8*)xmlDependencies.getStr(), xmlDependencies.getLength()); + + css::uno::Reference< css::io::XInputStream> inputstream( css::io::SequenceInputStream::createStreamFromSequence(m_context, byteSeq), + css::uno::UNO_QUERY_THROW); + + css::uno::Reference< css::xml::dom::XDocument > xDocument(docbuilder->parse(inputstream)); + css::uno::Reference< css::xml::dom::XElement > xElement(xDocument->getDocumentElement()); + css::uno::Reference< css::xml::dom::XNodeList > xDeps(xElement->getChildNodes()); + sal_Int32 nLen = xDeps->getLength(); + + // get the parent xml document of current description info for the import + css::uno::Reference< css::xml::dom::XDocument > xCurrentDescInfo(m_element->getOwnerDocument()); + + // get dependency node of current description info to merge the new dependencies from the blacklist + css::uno::Reference< css::xml::dom::XNode > xCurrentDeps( + m_xpath->selectSingleNode(m_element, ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("desc:dependencies")))); + + // if no dependency node exists, create a new one in the current description info + if (!xCurrentDeps.is()) { + css::uno::Reference< css::xml::dom::XNode > xNewDepNode( + xCurrentDescInfo->createElementNS( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://openoffice.org/extensions/description/2006")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dependencies"))), css::uno::UNO_QUERY_THROW); + m_element->appendChild(xNewDepNode); + xCurrentDeps = m_xpath->selectSingleNode(m_element, ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("desc:dependencies"))); + } + + for (sal_Int32 i=0; i xNode(xDeps->item(i)); + css::uno::Reference< css::xml::dom::XElement > xDep(xNode, css::uno::UNO_QUERY); + if (xDep.is()) { + // found valid blacklist dependency, import the node first and append it to the existing dependency node + css::uno::Reference< css::xml::dom::XNode > importedNode = xCurrentDescInfo->importNode(xNode, true); + xCurrentDeps->appendChild(importedNode); + } + } + } + } + } +} + +bool DescriptionInfoset::checkBlacklistVersion( + ::rtl::OUString currentversion, + ::com::sun::star::uno::Sequence< ::rtl::OUString > const & versions) const +{ + sal_Int32 nLen = versions.getLength(); + for (sal_Int32 i=0; i DescriptionInfoset::getDependencies() const { if (m_element.is()) { try { + // check the extension blacklist first and expand the dependencies if applicable + checkBlacklist(); + return m_xpath->selectNodeList(m_element, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("desc:dependencies/*"))); } catch (const css::xml::xpath::XPathException &) { diff --git a/odk/cfgWin.js b/odk/cfgWin.js index 81fed0585805..b6dd4e7686b7 100644 --- a/odk/cfgWin.js +++ b/odk/cfgWin.js @@ -1,3 +1,20 @@ +// +// This file is part of the LibreOffice project. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// +// This file incorporates work covered by the following license notice: +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed +// with this work for additional information regarding copyright +// ownership. The ASF licenses this file to you under the Apache +// License, Version 2.0 (the "License"); you may not use this file +// except in compliance with the License. You may obtain a copy of +// the License at http://www.apache.org/licenses/LICENSE-2.0 . +// // This script asks for variables, which are necessary for building the // examples of the Office Development Kit. The script duplicates the template // script and inserts the variables into the copied script. diff --git a/odk/configure.pl b/odk/configure.pl index 1a42c921e54b..8cd2a54978dd 100644 --- a/odk/configure.pl +++ b/odk/configure.pl @@ -743,12 +743,12 @@ sub testVersion for ($i=0; $i <= $length; $i++ ) { - if ( @testVersion->[$i] > @mustBeVersion->[$i] ) + if ( $testVersion[$i] > $mustBeVersion[$i] ) { return 1; # 1 indicates a correct version } - if ( @testVersion->[$i] < @mustBeVersion->[$i] ) + if ( $testVersion[$i] < $mustBeVersion[$i] ) { if ( $#checkOnly == 1 ) { print " The command '$toolName' has the version $tmpTestVersion.\n"; diff --git a/odk/docs/common/ref/idl.css b/odk/docs/common/ref/idl.css index ab94520bb93f..b9c89a22127c 100644 --- a/odk/docs/common/ref/idl.css +++ b/odk/docs/common/ref/idl.css @@ -1,5 +1,21 @@ /* Autodoc css file for IDL documentation */ - +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /*See bottom of file for explanations.*/ diff --git a/odk/docs/images/orc-main-app_32.png b/odk/docs/images/orc-main-app_32.png deleted file mode 100644 index b596295abba1..000000000000 Binary files a/odk/docs/images/orc-main-app_32.png and /dev/null differ diff --git a/odk/docs/install.html b/odk/docs/install.html index 6ec68344da1a..2bc5f27378c8 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -1,3 +1,21 @@ + + LibreOffice %PRODUCT_RELEASE% SDK - Installation Guide @@ -12,64 +30,64 @@

- Software Development Kit %PRODUCT_RELEASE% + Software Development Kit %PRODUCT_RELEASE%

-
+
-
+

Installation Guide

- + - + - +
+ - + - +
+ - + - - + + - - - + + - + - + - + - - + - + - - + - + - + - + - - + - + - +

The LibreOffice %PRODUCT_RELEASE% SDK comes with a set of development tools, base - libraries, header files and helper class files that can be used to + libraries, header files and helper class files that can be used to develop Java/C++ components, to embed the LibreOffice %PRODUCT_RELEASE% application in - your own programs, or to use the API (scripting or remote control the - office). For a complete working environment, we have some additional + your own programs, or to use the API (scripting or remote control the + office). For a complete working environment, we have some additional requirements:

LibreOffice %PRODUCT_RELEASE% installationThe SDK works on top of an existing office + The SDK works on top of an existing office installation and uses the same libraries as the office installation.
JDK (1.5 or higher)

A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on http://java.sun.com/products.

Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only.

Note: The Java compiler is optional!
C++ compilerA C++ compiler is necessary for developing C++ - components or applications. UNO depends on a compiler dependent language - binding, so that we use the appropriate compiler where a language binding + A C++ compiler is necessary for developing C++ + components or applications. UNO depends on a compiler dependent language + binding, so that we use the appropriate compiler where a language binding exists: @@ -87,65 +105,65 @@

Note: The C++ compiler is optional! If you use the Express edition you have to ensure that the Microsoft Visual Studio 2008 Redistributable Package is also installed. You can download this package from Microsoft directly.
Microsoft .NET Framework SDK version 1.0 or higherThe SDK is required for building CLI applications. + The SDK is required for building CLI applications. That is, programs written in languages, such as C# or VB.NET.

Note: The .NET Framework is optional!
GNU make (3.79.1 or higher)

GNU make is used to build the examples of the SDK. GNU make is available from http://www.gnu.org. It can be ftped via ftp://ftp.gnu.org/gnu/make

Note: Windows user can find an executable of gnu make under http://www.mingw.org/wiki/Getting_Started (see the mingw32-make link under "Manual Installation"). Do not use the Cygwin make, because it does not work well. On Solaris gnu make can be found often under /usr/sfw/bin/gmake, but keep in mind that you have to use 'gmake' then. Or you can find gnu make also under http://www.sunfreeware.com/.
zip tool (2.3 or higher)The zip tool is used to create UNO packages. zip is + The zip tool is used to create UNO packages. zip is a new requirement to make the SDK independent of a Java SDK.
- If you do not have these already, you can download them from http://www.info-zip.org. Note: The cygwin zip.exe does not work for the build under + If you do not have these already, you can download them from http://www.info-zip.org. Note: The cygwin zip.exe does not work for the build under the 4NT shell. You have to use the native w32 version.

The SDK provides an implicit configuration mechanism, which - configures the SDK build environment to your personal needs the first - time you use the SDK environment. This configuration step creates one or + configures the SDK build environment to your personal needs the first + time you use the SDK environment. This configuration step creates one or two new setsdkenv_XXX scripts in the user's home directory:

  • $HOME/$OO_SDK_NAME/setsdkenv_unix.sh and $HOME/$OO_SDK_NAME/setsdkenv_unix.csh  -> for Unix
  • C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat  -> for Windows2000/XP or later
-

The automatically started configure script (Unix and Windows2000/XP) +

The automatically started configure script (Unix and Windows2000/XP) requests relevant information and directories (SDK, LibreOffice, GNU make, - Java, C++), in order to prepare a working SDK environment. After completing the - configure script once, the newly created script is always used to set the - necessary environment variables for using the SDK and the required + Java, C++), in order to prepare a working SDK environment. After completing the + configure script once, the newly created script is always used to set the + necessary environment variables for using the SDK and the required tools.

-

On UNIX operating systems, the configure script uses Perl. LINUX systems should have - installed a working Perl version, and on Solaris you can find a working - Perl version under http://www.sunfreeware.com/ if - necessary. On Windows, the configure script uses Windows Script and - a JScipt. If you have problems with Windows Script, you can download a +

On UNIX operating systems, the configure script uses Perl. LINUX systems should have + installed a working Perl version, and on Solaris you can find a working + Perl version under http://www.sunfreeware.com/ if + necessary. On Windows, the configure script uses Windows Script and + a JScipt. If you have problems with Windows Script, you can download a newer version of Windows Script.

-

On other versions of Windows, use the batch - file template <OO_SDK_HOME>\setsdkenv_windows.template, +

On other versions of Windows, use the batch + file template <OO_SDK_HOME>\setsdkenv_windows.template, rename it to *.bat, and adapt it to your local environment.

-

If you use the template batch file, edit and set +

If you use the template batch file, edit and set the following variables:

@@ -158,11 +176,11 @@ - @@ -174,28 +192,28 @@ - - - - @@ -209,37 +227,37 @@ - -
OO_SDK_NAMEThe configuration uses the - directory name of the SDK, but you can use another name as well. - It is important that the name does not contain spaces, because of a limitation - of gnu make which cannot handle spaces correctly. This name is, for - example, used to create an output directory in the users home directory + The configuration uses the + directory name of the SDK, but you can use another name as well. + It is important that the name does not contain spaces, because of a limitation + of gnu make which cannot handle spaces correctly. This name is, for + example, used to create an output directory in the users home directory for any generated output when you use the SDK build environment.
OO_SDK_HOMEPath to the SDK root directory, e.g. + Path to the SDK root directory, e.g. "/opt/libreoffice/sdk"
OO_SDK_JAVA_HOMEPath to a JDK root directory. The JDK is - optional and only necessary if you like to run the Java examples - or if you like to use the SDK environment to develop your own Java + Path to a JDK root directory. The JDK is + optional and only necessary if you like to run the Java examples + or if you like to use the SDK environment to develop your own Java solution.
OO_SDK_CPP_HOMEPath to the C++ compiler (on Windows, the directory - where the "vcvar32.bat" file can be found). The C++ - compiler is optional and only necessary for building the C++ + Path to the C++ compiler (on Windows, the directory + where the "vcvar32.bat" file can be found). The C++ + compiler is optional and only necessary for building the C++ examples.
OO_SDK_CLI_HOMEPath to the C# compiler and VB.NET compiler (on - Windows, this directory can be found under the system directory (e.g. - c:\WINXP\Microsoft.NET\Framework\v1.0.3705). The compilers are + Path to the C# compiler and VB.NET compiler (on + Windows, this directory can be found under the system directory (e.g. + c:\WINXP\Microsoft.NET\Framework\v1.0.3705). The compilers are optional and only necessary for building the CLI examples.
Note: Windows only!
OO_SDK_OUTPUT_DIRPath to an existing directory where the example output - is generated. The output directory is optional, by default - the output is generated in the SDK directory itself. If an output - directory is specified, the output is generated in a SDK dependent + Path to an existing directory where the example output + is generated. The output directory is optional, by default + the output is generated in the SDK directory itself. If an output + directory is specified, the output is generated in a SDK dependent subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR> /LibreOffice %PRODUCT_RELEASE%/LINUXExample.out)
SDK_AUTO_DEPLOYMENTIf this variable is set, the component examples are automatically deployed into the Office installation referenced by + If this variable is set, the component examples are automatically deployed into the Office installation referenced by OFFICE_HOME. See also chapter "Extension Manager - unopkg" from the Developer's Guide. This variable is only relevant when OFFICE_HOME is set.
-

You must run the setsdkenv_XXX script every time you want to +

You must run the setsdkenv_XXX script every time you want to use the configured SDK environment. The settings are local for the current - shell on Windows or the new started shell on UNIX. On UNIX you - can now source one of the prepared environment - script files ("setsdkenv_unix.sh" or - "setsdkenv_unix.csh" dependending on the shell you use) to prepare + shell on Windows or the new started shell on UNIX. On UNIX you + can now source one of the prepared environment + script files ("setsdkenv_unix.sh" or + "setsdkenv_unix.csh" dependending on the shell you use) to prepare your current shell instead of starting a new shell.

Manual Setting

-

If you do not want to use the script to set your working - environment, you must set the appropriate environment variables +

If you do not want to use the script to set your working + environment, you must set the appropriate environment variables yourself. The script sets the following environment variables:

Common Environment Variables

@@ -277,7 +295,7 @@ $OO_SDK_URE_JAVA_DIR/unoloader.jar; [$OO_SDK_URE_JAVA_DIR/unoil.jar;] $CLASSPATH
-

The classpath will be set or extended to the necessary jar files of +

The classpath will be set or extended to the necessary jar files of the specified office installation. (unoil.jar is only included when OFFICE_HOME is set.)

@@ -285,7 +303,7 @@ @@ -293,8 +311,8 @@ @@ -318,8 +336,8 @@ @@ -336,7 +354,7 @@ @@ -344,8 +362,8 @@ @@ -362,40 +380,42 @@ -
OFFICE_PROGRAM_PATH =$OFFICE_HOME/program
-

This variable is used to find, for example, the office type library and +

This variable is used to find, for example, the office type library and the UNO package deployment tool. This variable is only relevant when OFFICE_HOME is set.

UNO_PATH =$OFFICE_PROGRAM_PATH
-

This variable is used to ensure that the new C++ UNO bootstrap - mechanism uses the configured office installation of the SDK. Normally +

This variable is used to ensure that the new C++ UNO bootstrap + mechanism uses the configured office installation of the SDK. Normally the bootstrap mechanism finds the default office installation for the user on the system. This variable is optional but is set from the scripts to ensure a homogeneous environment. Especially useful during development @@ -310,7 +328,7 @@

LD_LIBRARY_PATH =$OO_SDK_URE_LIB_DIR: $OO_SDK_HOME/(solsparc|solintel)/lib: $LD_LIBRARY_PATH

The LD_LIBRARY_PATH will be set or will be extended by the office/URE - library path, the platform dependent lib directory for several additional + library path, the platform dependent lib directory for several additional libraries.
PATH =$OO_SDK_HOME/(solsparc|solintel)/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH

The PATH variable will be extended by the paths for the SDK development - tools, the compiler, the JDK, GNU make, the zip tool and the - OO_SDK_URE_BIN_DIR, where the compiler or the JDK are + tools, the compiler, the JDK, GNU make, the zip tool and the + OO_SDK_URE_BIN_DIR, where the compiler or the JDK are optional.
LD_LIBRARY_PATH =$OO_SDK_URE_LIB_DIR: $SDK_HOME/linux/lib: $LD_LIBRARY_PATH

The LD_LIBRARY_PATH will be set or will be extended by the office/URE - library path, the platform dependent lib directory for some additional + library path, the platform dependent lib directory for some additional libraries.
PATH =$OO_SDK_HOME/linux/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH

The PATH variable will be extended by the paths for the SDK development - tools, the compiler, the JDK, GNU make, the zip tool and the - OO_SDK_URE_BIN_DIR, where the compiler and the JDK are + tools, the compiler, the JDK, GNU make, the zip tool and the + OO_SDK_URE_BIN_DIR, where the compiler and the JDK are optional.
PATH =%OO_SDK_HOME%\windows\bin; %OO_SDK_MAKE_HOME%; %OO_SDK_ZIP_HOME%; [%OO_SDK_CLI_HOME%;] [%OO_SDK_CPP_HOME%;] [%OO_SDK_JAVA_HOME%\bin;] %OO_SDK_URE_BIN_DIR%; %PATH%

The PATH variable will be extended by the paths for the SDK development - tools, the compiler, the JDK, GNU make, the zip tool and the + tools, the compiler, the JDK, GNU make, the zip tool and the OO_SDK_URE_BIN_DIR.
LIB =%OO_SDK_HOME%\windows\lib; %LIB%
-

The LIB variable will be extended by the path to the import libraries +

The LIB variable will be extended by the path to the import libraries that are necessary for Windows.
In addition to setting these environment - variables, the script calls the "vcvar32.bat" batch file - which is provided by the Microsoft Developer Studio to set the necessary + In addition to setting these environment + variables, the script calls the "vcvar32.bat" batch file + which is provided by the Microsoft Developer Studio to set the necessary environment variables for the compiler.
-
-
-
+
- - - - + + + + + + diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index b7376c1944f3..441f3f5c3bed 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -1,22 +1,40 @@ + + - LibreOffice 3.4 SDK - Not supported page + LibreOffice 3.4 SDK - Not supported page - +

- Software Development Kit 3.4 + Software Development Kit 3.4

-
+
-
+

@@ -31,36 +49,38 @@

- - + + - - + +

- This page is currently not supported! + This page is currently not supported!

- - - - - + + + + + - - - -

+ + + +
- - - - + + + + + + diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index 5be9eb78c772..de1afb46c08b 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -1,4 +1,21 @@ /* Core Styles */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ * { margin: 0; @@ -961,6 +978,5 @@ hr { .content87 { width: 87%; } .centertext {align:center; text-align:center; font-size: 12;} -.oraclelogo {vertical-align:middle;} diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 7fda224269bf..ba5051abb6af 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -1,3 +1,21 @@ + + LibreOffice %PRODUCT_RELEASE% SDK - Development Tools @@ -12,41 +30,41 @@

- Software Development Kit %PRODUCT_RELEASE% + Software Development Kit %PRODUCT_RELEASE%

-
+
-
+

Development Tools

- + - + - - + - - - @@ -237,31 +255,31 @@ - + - - + - - + - - + - - + - - + - - + - +
+ - + - - + - +
+
- - @@ -54,42 +72,42 @@ - - - + - - - - @@ -105,37 +123,37 @@ - - -
unopkgThe new UNO package deployment tool. It comes + The new UNO package deployment tool. It comes with the office installation and can be found in the program directory of the office installation.
unoTool to provide a UNO runtime environment and + Tool to provide a UNO runtime environment and provide configured (deployed) or single components. This tool comes with the office installation and can be found in the program directory of the office installation.
regmergeTool to merge several registry (e.g. type + Tool to merge several registry (e.g. type libraries) files into one file. Note: Since OpenOffice.org 3 it is not longer part of the SDK but it comes directly with the office as part of the ure.
regviewTool to view the content of a registry file - in a human readable manner. Special support for type library + Tool to view the content of a registry file + in a human readable manner. Special support for type library nodes. Note: Since OpenOffice.org 3 it is not longer part of the SDK but it comes directly with the office as part of the ure.
idlcThe UNOIDL compiler, generates a common - binary type library format as base for all codemaker tools and + The UNOIDL compiler, generates a common + binary type library format as base for all codemaker tools and the UNO runtime type library.
cppumakerTool for generating C++ code for the UNOIDL + Tool for generating C++ code for the UNOIDL types stored in a type library.
javamakerTool for generating Java class files for the + Tool for generating Java class files for the UNOIDL types stored in a type library.
climakerTool for generating CLI assemblies for the + Tool for generating CLI assemblies for the UNOIDL types stored in a type library (windows only).
regmergeTool to merge several registry (e.g. type + Tool to merge several registry (e.g. type libraries) files into one file.
regviewTool to view the content of a registry file - in a human readable manner. Special support for type library + Tool to view the content of a registry file + in a human readable manner. Special support for type library nodes.
autodocTool to generate javadoc-like documentation + Tool to generate javadoc-like documentation for C/C++ and UNOIDL files.
+ - + - @@ -188,7 +206,7 @@ -
unopkg @@ -143,16 +161,16 @@
-

'unopkg' is a tool for easy deployment of UNO packages in an existing - office installation. UNO packages are UNO components (single libraries or +

'unopkg' is a tool for easy deployment of UNO packages in an existing + office installation. UNO packages are UNO components (single libraries or Jar files or more complex zip files that contains one or more libraries| - Jar files, type libraries and configuration items), scripts and - LibreOffice %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the - SDK but comes with the office directly and is a development tool as well + Jar files, type libraries and configuration items), scripts and + LibreOffice %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the + SDK but comes with the office directly and is a development tool as well as an end user tool to deploy extension into an office installation.

-

More details concerning deployment and this tool can be find in the +

More details concerning deployment and this tool can be find in the Developer's Guide: Extension Manager - unopkg.

-

Note: This tool works only in the <office>/program +

Note: This tool works only in the <office>/program directory!

Usage:

@@ -179,7 +197,7 @@
reinstallexport feature: reinstall all deployed + export feature: reinstall all deployed packages
guiraise Package Manager Graphical User Interface + raise Package Manager Graphical User Interface (GUI)
@@ -215,13 +233,13 @@
--log-file <file>custom log file; default: + custom log file; default: <cache-dir>/log.txt.
--sharedexpert feature: operate on shared installation - deployment context; run only when no concurrent Office process(es) are + expert feature: operate on shared installation + deployment context; run only when no concurrent Office process(es) are running!
+ - + - + - +
uno
-

The UNO-starter is for running a component or service process, and - providing a runtime environment. Raising a component might look like +

The UNO-starter is for running a component or service process, and + providing a runtime environment. Raising a component might look like this

-

[c:\] uno.exe -c MyComponent -l mycomp.dll -r myregistry.rdb +

[c:\] uno.exe -c MyComponent -l mycomp.dll -r myregistry.rdb -- foo bar

or

-

[c:\] uno.exe -s foo.bar.FooBarService -r myregistry.rdb +

[c:\] uno.exe -s foo.bar.FooBarService -r myregistry.rdb -- foo bar

-

The starter loads the component and instantiates it. The component +

The starter loads the component and instantiates it. The component must export the interface com.sun.star.lang.XMain:

interface XMain : com::sun::star::uno::XInterface
@@ -275,9 +293,9 @@ };

-

Method run() will be called and returns the error code given, back - to the system. If the uno starter is executed with the -u (URL) option, - then XInitialization is used instead of XMain. The -u option is described +

Method run() will be called and returns the error code given, back + to the system. If the uno starter is executed with the -u (URL) option, + then XInitialization is used instead of XMain. The -u option is described later.

Usage:

@@ -294,8 +312,8 @@ - @@ -304,7 +322,7 @@ - @@ -313,51 +331,51 @@ (e.g., c:\myreg.rdb) are used by the ServiceManager. The ro ones are opened for reading only; whereas, a single rw one will be opened for reading and writing. If the rw one does - not exist, then it may be created. Components may read and write to + not exist, then it may be created. Components may read and write to store their persistent state. - -
<HostName>Specifying a host name might be necessary to - distinguish the network interface to be used,if a machine is part of + Specifying a host name might be necessary to + distinguish the network interface to be used,if a machine is part of two networks.
<Name>Identifier for demanded called component + Identifier for demanded called component instances.
--singleacceptThe uno starter will accept one connection, + The uno starter will accept one connection, provide the component instance and die.
--singleinstanceThe uno starter will accept any number of - connections, but will provide the same single component instance any + The uno starter will accept any number of + connections, but will provide the same single component instance any time instead of creating a new instance for each connection.

Service com.sun.star.bridge.UnoUrlResolver

-

You can easily connect to a server started with the - -u (url) option by using this service, giving the same url +

You can easily connect to a server started with the + -u (url) option by using this service, giving the same url to resolve. The service provides you an instance from remote.
+ - + - + - +
idlc
-

'idlc' is the UNOIDL compiler. It is a full featured compiler used - to check UNODL type definitions and transform valid type definitions - into a binary type library format, which is later used by all codemaker +

'idlc' is the UNOIDL compiler. It is a full featured compiler used + to check UNODL type definitions and transform valid type definitions + into a binary type library format, which is later used by all codemaker tools. It is also used as a dynamic type library for UNO at runtime.
You can find a syntax description for UNOIDL here.

Usage:

@@ -368,12 +386,12 @@ - -
file_1 ... file_nspecifies one or more idl files. Only files with + specifies one or more idl files. Only files with the extension '.idl' are valid.
@<filename>filename specifies the name of a command + filename specifies the name of a command file.
@@ -383,14 +401,14 @@ - - @@ -399,7 +417,7 @@ - @@ -409,31 +427,31 @@
-O<path>path describes the output directory. The - generated output is a registry file with the same name as the idl + path describes the output directory. The + generated output is a registry file with the same name as the idl input file.
-I<path>path specifies a directory where included files - that will be searched by the preprocessor are located. Multiple + path specifies a directory where included files + that will be searched by the preprocessor are located. Multiple directories can be combined with ';'.
-Cgenerates complete type information, including + generates complete type information, including additional service information and documentation.

+ - + - + - +
cppumaker
-

The 'cppumaker' generates a C++ representation for idl types. The - cppumaker works on a typelibrary, which is generated by the UNOIDL +

The 'cppumaker' generates a C++ representation for idl types. The + cppumaker works on a typelibrary, which is generated by the UNOIDL compiler ( - idlc). It generates the output for all specified types and for all + idlc). It generates the output for all specified types and for all types the specified types depend on.

Usage:

@@ -444,115 +462,115 @@ - - - - - - - -
-O<path>path describes the root directory for the - generated output. The output directory tree is generated under this + path describes the root directory for the + generated output. The output directory tree is generated under this directory.
-T<name>
|-T<t1>;<t2>...		name specifies a type or a list of types. The - output for this type and all dependent types are generated. If no '-T' - option is specified, then output for all types is generated. It is also - possible to use a wildcard 'xy.*' to generate a complete module - inclusive all subdirectories. The use of '-T*' is equivalent to no '-T' - option. Example: 'com.sun.star.uno.XInterface' or + name specifies a type or a list of types. The + output for this type and all dependent types are generated. If no '-T' + option is specified, then output for all types is generated. It is also + possible to use a wildcard 'xy.*' to generate a complete module + inclusive all subdirectories. The use of '-T*' is equivalent to no '-T' + option. Example: 'com.sun.star.uno.XInterface' or 'com.sun.star.uno.*' are valid types.
-B<name>name specifies the base node. All types are - searched under this node. Default is the root '/' of the registry + name specifies the base node. All types are + searched under this node. Default is the root '/' of the registry files.
-LUNO type functions are generated lightweight, that - means only the name and typeclass are given and everything else is - retrieved from the type library dynamically. The default is that UNO + UNO type functions are generated lightweight, that + means only the name and typeclass are given and everything else is + retrieved from the type library dynamically. The default is that UNO type functions provides enough type information for boostrapping C++. '-L' should be the default for external components.
-CUNO type functions are generated comprehensive - that means all necessary information is available for bridging the + UNO type functions are generated comprehensive + that means all necessary information is available for bridging the type in UNO.
-Ggenerate only target files which do not + generate only target files which do not exist.
-Gcgenerate only target files whose content will + generate only target files whose content will be changed.
-X<name>extra types, which are not be taken into account + extra types, which are not be taken into account for generation.

+ - + - + - +
javamaker
-

The 'javamaker' generates the appropriate Java class file for each idl - type. The javamaker works on a typelibrary which is generated by the +

The 'javamaker' generates the appropriate Java class file for each idl + type. The javamaker works on a typelibrary which is generated by the UNOIDL compiler ( - idlc). It generates the output for all specified types and for all + idlc). It generates the output for all specified types and for all types the specified types depend on.

Usage:

javamaker [-options] file_1 ... file_n -Xfile_n+1 -Xfile_n+2 -
+

Options:

- - - @@ -561,52 +579,52 @@ types the specified types depend on.

- - -
-O<path>path describes the root directory for the - generated output. The output directory tree is generated under this + path describes the root directory for the + generated output. The output directory tree is generated under this directory.
-T<name>|-T<t1>;<t2>...name specifies a type or a list of types. The - output for this type and all dependent types are generated. If no '-T' - option is specified, then output for all types is generated. It is also - possible to use a wildcard 'xy.*' to generate a complete module - inclusive all subdirectories. The use of '-T*' is equivalent to no '-T' - option. Example: 'com.sun.star.uno.XInterface' + name specifies a type or a list of types. The + output for this type and all dependent types are generated. If no '-T' + option is specified, then output for all types is generated. It is also + possible to use a wildcard 'xy.*' to generate a complete module + inclusive all subdirectories. The use of '-T*' is equivalent to no '-T' + option. Example: 'com.sun.star.uno.XInterface' or 'com.sun.star.uno.*' are valid types.
-B<name>name specifies the base node. All types are - searched under this node. Default is the root '/' of the registry + name specifies the base node. All types are + searched under this node. Default is the root '/' of the registry files.
-Ggenerate only target files which do not + generate only target files which do not exist.
-Gcgenerate only target files whose content will + generate only target files whose content will be changed.
-X<name>extra types, which will not be taken into account + extra types, which will not be taken into account for generation.

+ - + - + - + - - +
climaker
-

The 'climaker' (windows only) generates the appropriate CLI assemblies file for each idl - type. The climaker works on a typelibrary which is generated by the +

The 'climaker' (windows only) generates the appropriate CLI assemblies file for each idl + type. The climaker works on a typelibrary which is generated by the UNOIDL compiler ( - idlc). It generates the output for all specified types and for all + idlc). It generates the output for all specified types and for all types the specified types depend on.

Usage:

climaker <switches> [registry-file-1 registry-file-2 ...] -
+

Options:

@@ -671,25 +689,25 @@ types the specified types depend on.

Example: climaker --out cli_mytypes.dll --reference cli_uretypes.dll --extra types.rdb mytypes.rdb

- +

+ - + - +
uno-skeletonmaker

The 'uno-skeletonmaker' is a tool to simplify the UNO component development. It has different modes, from simply dumping code definitions for different languages on stdout up to generating complete code skeletons. The generation of code skeletons support common component skeletons as well as specialized skeletons for special service provider interfaces.

@@ -798,28 +816,28 @@ types the specified types depend on.
+ - + - + - +
regcomp
-

'regcomp' is a tool to register|revoke external UNO components +

'regcomp' is a tool to register|revoke external UNO components into|from a registry which is used in a UNO environment.

Usage:

@@ -830,61 +848,61 @@ types the specified types depend on.

- - - -
-register|revokeregister means that the components will be + register means that the components will be installed and revoke means that they will be removed.
-br<registryfile> the name of the registry used for bootstrapping - the program. If the bootstrap registry is specified and has the same + the program. If the bootstrap registry is specified and has the same name as the registration registry, '-r' is optional.
-r<registryfile>the name of the registry (will be created if + the name of the registry (will be created if it does not exist) where the component should be registered.
-c<locationUrls>the location of a component (DLL, Class name, - or an url of a jar file) or a list of urls separated by ';'s. Note - that, if a list of urls is specified, the components must all need + the location of a component (DLL, Class name, + or an url of a jar file) or a list of urls separated by ';'s. Note + that, if a list of urls is specified, the components must all need the same loader.
-l<componentLoaderName>the name of the needed loader, if no loader is - specified the 'com.sun.star.loader.SharedLibrary' is used. Supported - loaders: 'com.sun.star.loader.SharedLibrary' | + the name of the needed loader, if no loader is + specified the 'com.sun.star.loader.SharedLibrary' is used. Supported + loaders: 'com.sun.star.loader.SharedLibrary' | 'com.sun.star.loader.Java'.

- + - + - - -
regmerge
-

'regmerge' is a small tool to merge different registry files under a - specified key into another registry file. If a value already exists in - the target file the value is overwritten by the value of the source +

'regmerge' is a small tool to merge different registry files under a + specified key into another registry file. If a value already exists in + the target file the value is overwritten by the value of the source file.

Usage:

@@ -899,45 +917,45 @@ types the specified types depend on.

<mergefile>specifies the merged registry file. If this file + specifies the merged registry file. If this file doesn't exist, it is created.
<mergeKeyName>specifies the merge key, everything is merged + specifies the merge key, everything is merged under this key. If this key doesn't exist, it is created.
<regfile_1> ... <regfile_n>specifies one or more registry files that are + specifies one or more registry files that are merged.

- + - + - + - +
regview
-

'regview' is a tool to show the contents of a registry file. The tool - dumps the hierarchical structure and the values of the nodes in a human +

'regview' is a tool to show the contents of a registry file. The tool + dumps the hierarchical structure and the values of the nodes in a human readable manner to stdout.

Usage:

@@ -948,46 +966,46 @@ types the specified types depend on.

- -
-br<registryfile>the name of the registry whose contents should + the name of the registry whose contents should be viewed.
<keyName>the name of a registry key. The name must be - fully qualified; for example, '/' means the root key and - '/UCR/com/sun/star/uno/XInterface' shows the type specification of the - XInterface type. If no key is specified, the tool dumps the whole + the name of a registry key. The name must be + fully qualified; for example, '/' means the root key and + '/UCR/com/sun/star/uno/XInterface' shows the type specification of the + XInterface type. If no key is specified, the tool dumps the whole content of the registry file.

- + - + - + - +
autodoc
-

The 'autodoc' tool is used for creating javadoc-like documentation +

The 'autodoc' tool is used for creating javadoc-like documentation from C++ and UNOIDL source code.

-

There are some conventions to follow when documenting C++- or +

There are some conventions to follow when documenting C++- or UNOIDL-sourcecode. See also the UNOIDL Documentation Guidelines.
- If you are not familiar with these, but do know javadoc: For simple C++ + If you are not familiar with these, but do know javadoc: For simple C++ sourcecode documentation, using javadoc-style comments will work.

Usage:

@@ -999,16 +1017,16 @@ types the specified types depend on.

- - @@ -1020,20 +1038,20 @@ types the specified types depend on.

- - - -
-v <VerboseNr><VerboseNr> == 5 displays the parsed source + <VerboseNr> == 5 displays the parsed source code tokens, so you can locate which piece caused an parsing error.
- <VerboseNr> == 2 displays not only the parsed source code, + <VerboseNr> == 2 displays not only the parsed source code, but also the comments.

This option must be the first one, if it is used.
-name "<Title>"<Title> occurs as the title of the start - page of the HTML output. If this option is omitted, a default title is + <Title> occurs as the title of the start + page of the HTML output. If this option is omitted, a default title is created.
-lg <SourcecodeLanguage> Possible values are: c++ | idl.

- This also specifies which files will be parsed: "c++" parses - all files with the endings .hxx and .h, "idl" parses all + This also specifies which files will be parsed: "c++" parses + all files with the endings .hxx and .h, "idl" parses all files with the ending '.idl' .
To change this behaviour, see at option -f.
-p <ProjectName> <ProjectDirectory>this option can be used to divide large code + this option can be used to divide large code bases into different projects.
<ProjectName> gives a user-defined name for the project.
- <ProjectDirectory> is the root to which all paths, given with the - following options -t,-d and -f, are + <ProjectDirectory> is the root to which all paths, given with the + following options -t,-d and -f, are relative.
- This option can be omitted when there are no projects and all paths in + This option can be omitted when there are no projects and all paths in the following options are relative to the working directory.

The "{ ... }*" around the options -p,-t,-d,-f indicates, that this whole block of options can be repeated, each block @@ -1041,50 +1059,52 @@ types the specified types depend on.

-t <SourceTree>specifies that all files in the directory - <SourceTree> and it's subdirectories are parsed, where the file + specifies that all files in the directory + <SourceTree> and it's subdirectories are parsed, where the file ending matches the option -lg.
- There can be given multiple directories after one -t + There can be given multiple directories after one -t option.
- All relative paths  are relative to the project-rootdirectory, + All relative paths  are relative to the project-rootdirectory, given with the -p option.
-d <SourceDirectory>Specifies that all files in th directory - <SourceDirectory>, but NOT it's subdirectories, are parsed, where + Specifies that all files in th directory + <SourceDirectory>, but NOT it's subdirectories, are parsed, where the file ending matches the option -lg.
- There can be multiple directories given after one -d + There can be multiple directories given after one -d option.
- All relative paths  are relative to the project-rootdirectory, + All relative paths  are relative to the project-rootdirectory, given with the -p option.
-f <SourceFile>parses the given file. The ending does not have + parses the given file. The ending does not have to match the -lg option.
There can be multiple files given after one -f option.
- All relative paths  are relative to the project-rootdirectory, + All relative paths  are relative to the project-rootdirectory, given with the -p option.
-

Remark: The sequence of options matters! Use them in the order given +

Remark: The sequence of options matters! Use them in the order given in the "Usage"-paragraph.

-
+
- - - - + + + + + + diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile index a8dba1cfb91b..219d867fb268 100644 --- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile +++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile @@ -1,3 +1,20 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# # Builds the SpreadSheet examples of the Developers Guide. # This Makefile is supposed to be run by a GNU Make built for native diff --git a/odk/examples/CLI/VB.NET/WriterDemo/WriterDemo.vb b/odk/examples/CLI/VB.NET/WriterDemo/WriterDemo.vb index 48eea4e44ea5..4306bfd206d2 100644 --- a/odk/examples/CLI/VB.NET/WriterDemo/WriterDemo.vb +++ b/odk/examples/CLI/VB.NET/WriterDemo/WriterDemo.vb @@ -1,34 +1,25 @@ -'************************************************************************* ' -' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -' -' Copyright 2000, 2010 Oracle and/or its affiliates. +' This file is part of the LibreOffice project. ' -' OpenOffice.org - a multi-platform office productivity suite +' This Source Code Form is subject to the terms of the Mozilla Public +' License, v. 2.0. If a copy of the MPL was not distributed with this +' file, You can obtain one at http://mozilla.org/MPL/2.0/. ' -' This file is part of OpenOffice.org. +' This file incorporates work covered by the following license notice: ' -' 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. +' Licensed to the Apache Software Foundation (ASF) under one or more +' contributor license agreements. See the NOTICE file distributed +' with this work for additional information regarding copyright +' ownership. The ASF licenses this file to you under the Apache +' License, Version 2.0 (the "License"); you may not use this file +' except in compliance with the License. You may obtain a copy of +' the License at http://www.apache.org/licenses/LICENSE-2.0 . ' -' 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 -' -' for a copy of the LGPLv3 License. -' -'************************************************************************* Option Explicit On Option Strict On -imports System +imports System imports System.Collections imports Microsoft.VisualBasic imports unoidl.com.sun.star.lang @@ -42,8 +33,8 @@ Sub Main( ByVal args() As String) ' If args.Length <> 2 Then ' Console.WriteLine("WriterDemo takes two arguments. A file url to the office" & _ ' "program directory and a connection string.") -' End If -'Connect to a running office +' End If +'Connect to a running office '-------------------------------------------------- 'Create a service manager of the remote office @@ -52,20 +43,20 @@ Sub Main( ByVal args() As String) Dim xContext As XComponentContext 'xLocalContext = Bootstrap.defaultBootstrap_InitialComponentContext( _ ' args(0) & "/uno.ini", ht.GetEnumerator()) - + xContext = Bootstrap.bootstrap() -'Dim xURLResolver As XUnoUrlResolver +'Dim xURLResolver As XUnoUrlResolver 'xURLResolver = DirectCast(xLocalContext.getServiceManager(). _ ' createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", _ ' xLocalContext), XUnoUrlResolver) - -'Dim xRemoteContext As XComponentContext + +'Dim xRemoteContext As XComponentContext 'xRemoteContext = DirectCast(xURLResolver.resolve( _ ' "uno:socket,host=localhost,port=8100;urp;StarOffice.ComponentContext"), _ ' XComponentContext) -Dim xFactory As XMultiServiceFactory +Dim xFactory As XMultiServiceFactory xFactory = DirectCast(xContext.getServiceManager(), _ XMultiServiceFactory) @@ -97,7 +88,7 @@ Dim xCursor As unoidl.com.sun.star.text.XTextCursor xCursor = xSimpleText.createTextCursor() 'Inserting some Text -xText.insertString(xCursor, "The first line in the newly created text document." _ +xText.insertString(xCursor, "The first line in the newly created text document." _ & vbLf, false) 'Create instance of a text table with 4 columns and 4 rows @@ -138,12 +129,12 @@ xTextTable.getCellByName("A2").setValue(22.5) xTextTable.getCellByName("B2").setValue(5615.3) xTextTable.getCellByName("C2").setValue(-2315.7) xTextTable.getCellByName("D2").setFormula("sum ") - + xTextTable.getCellByName("A3").setValue(21.5) xTextTable.getCellByName("B3").setValue (615.3) xTextTable.getCellByName("C3").setValue( -315.7) xTextTable.getCellByName("D3").setFormula( "sum ") - + xTextTable.getCellByName("A4").setValue( 121.5) xTextTable.getCellByName("B4").setValue( -615.3) xTextTable.getCellByName("C4").setValue( 415.7) @@ -176,14 +167,14 @@ Dim xTextFrame As unoidl.com.sun.star.text.XTextFrame = _ DirectCast(objTextFrame, unoidl.com.sun.star.text.XTextFrame) 'Set the size of the frame -Dim aSize As unoidl.com.sun.star.awt.Size = _ +Dim aSize As unoidl.com.sun.star.awt.Size = _ New unoidl.com.sun.star.awt.Size(15000, 400) DirectCast(xTextFrame, unoidl.com.sun.star.drawing.XShape).setSize(aSize) 'Set anchortype Dim xPropertySetFrame As unoidl.com.sun.star.beans.XPropertySet xPropertySetFrame = DirectCast(xTextFrame, unoidl.com.sun.star.beans.XPropertySet) -xPropertySetFrame.setPropertyValue("AnchorType", New uno.Any( _ +xPropertySetFrame.setPropertyValue("AnchorType", New uno.Any( _ GetType(unoidl.com.sun.star.text.TextContentAnchorType), _ unoidl.com.sun.star.text.TextContentAnchorType.AS_CHARACTER)) @@ -223,7 +214,7 @@ End Sub Sub insertIntoCell(sCellName As String,sText As String, _ xTable As unoidl.com.sun.star.text.XTextTable) - Dim xCell As unoidl.com.sun.star.table.XCell + Dim xCell As unoidl.com.sun.star.table.XCell xCell = xTable.getCellByName(sCellName) Dim xSimpleTextCell As unoidl.com.sun.star.text.XSimpleText diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba index 67cd8252d1c7..60f6a491f66a 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba @@ -1,4 +1,21 @@ + REM ***** BASIC ***** diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialogDlg.xdl b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialogDlg.xdl index 06f1c4cd2219..ec99f7b48d7d 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialogDlg.xdl +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialogDlg.xdl @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba index 3a9571581983..8b3af516b549 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba @@ -1,4 +1,21 @@ + REM ***** BASIC ***** diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl index bc6360b3b33f..b98161c2c9df 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBar.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBar.xba index 648b4091b034..8b34f0cc31b2 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBar.xba +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBar.xba @@ -1,4 +1,21 @@ + REM ***** BASIC ***** diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBarDlg.xdl b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBarDlg.xdl index f39f5bfdf3b7..4a5803273942 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBarDlg.xdl +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBarDlg.xdl @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBar.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBar.xba index 6ea6bddb8b86..db2dd7cdd162 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBar.xba +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBar.xba @@ -1,4 +1,21 @@ + REM ***** BASIC ***** diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBarDlg.xdl b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBarDlg.xdl index 95957e370f06..ae36d000036d 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBarDlg.xdl +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBarDlg.xdl @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Addons.xcu b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Addons.xcu index d3d8d7411ed2..ed49d733cfca 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Addons.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Addons.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Jobs.xcu b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Jobs.xcu index f33c68e5a3da..ff1baf5e38ec 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Jobs.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Jobs.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu index 579bcd3eef58..a6a19855e7f9 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/ProtocolHandler.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/ProtocolHandler.xcu index c71e8c387306..eecd51fcfb10 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/ProtocolHandler.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/ProtocolHandler.xcu @@ -1,5 +1,21 @@ - + diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu index fb904e9ac452..5eefadb45fac 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandler.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandler.xcu index 27444dd1c5e0..7974c3e958c6 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandler.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandler.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/description.xml b/odk/examples/DevelopersGuide/Components/SimpleLicense/description.xml index aa465ab8d288..efc2dcb172c3 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/description.xml +++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/description.xml @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/thumbs.mk b/odk/examples/DevelopersGuide/Components/Thumbs/thumbs.mk index cec8a3f4c655..d5dbc181e83e 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/thumbs.mk +++ b/odk/examples/DevelopersGuide/Components/Thumbs/thumbs.mk @@ -1,3 +1,21 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + OUT_COMP_CLASS = $(OUT_CLASS)/ComponentThumbsExample OUT_COMP_GEN = $(OUT_MISC)/ComponentThumbsExample diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt b/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt index c2b54711aa57..99507d2023ca 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt @@ -1,10 +1,28 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + How to write my own sdbc driver Pre implementation steps - search all occurrences of skeleton and replace them to a name which you prefer -1. Implement a class called driver or modify the existing skeleton -> have a look at SDriver.?xx -2. Implement a class called connection -> have a look at SConnection.?xx +1. Implement a class called driver or modify the existing skeleton -> have a look at SDriver.?xx +2. Implement a class called connection -> have a look at SConnection.?xx 3. Have a look at the DatabaseMetaData -> see SDatabaseMetaData.cxx The methods which should be implemented at least are - getTableTypes diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu index 4d25fee331e8..89136e9dc09a 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu @@ -1,5 +1,21 @@ - - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Dialog1.xdl b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Dialog1.xdl index e9e84bf4e9c4..90fc473adbdf 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Dialog1.xdl +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Dialog1.xdl @@ -1,4 +1,21 @@ + @@ -7,4 +24,4 @@ - \ No newline at end of file + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Module1.xba b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Module1.xba index 9e7745e228aa..976a0e59f36b 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Module1.xba +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Module1.xba @@ -1,4 +1,21 @@ + REM ***** BASIC ***** diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml index 2334c0892b20..bdf10830810c 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/description.xml b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/description.xml index c2f2e3986706..f5540bb2b7cd 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/description.xml +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/description.xml @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp index 34909072f097..384b694b1059 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp index 7436b51b6ca2..a51661f364cf 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp index 50358d066245..5c0e24d5db40 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp index 4d4974206908..5cbaf7ccedc2 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp index 02bee1ce058e..66b3156defe9 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp index e2ccaa4e1ba9..30a31a720e45 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp @@ -1,4 +1,21 @@ - + + diff --git a/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml b/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml index 15184aba7e4d..0e2e55ce0525 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml +++ b/odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/Forms/URLHelper.java b/odk/examples/DevelopersGuide/Forms/URLHelper.java index 343453acf286..dd8e94075e7b 100644 --- a/odk/examples/DevelopersGuide/Forms/URLHelper.java +++ b/odk/examples/DevelopersGuide/Forms/URLHelper.java @@ -1,28 +1,19 @@ /* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * 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 - * - * for a copy of the LGPLv3 License. + * This file incorporates work covered by the following license notice: * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ import java.io.File; diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/TypeDetection.xcu b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/TypeDetection.xcu index a03358394d72..f63eda4a0123 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/TypeDetection.xcu +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/TypeDetection.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/FlatXmlTypeDetection.xcu b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/FlatXmlTypeDetection.xcu index 67f8006db558..2ac9a244089f 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/FlatXmlTypeDetection.xcu +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/FlatXmlTypeDetection.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.uno.xml b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.uno.xml index 9202844eef76..f437648ab05e 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.uno.xml +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.uno.xml @@ -1,4 +1,21 @@ + FlatXml diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.xcu b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.xcu index 8244bbd3a810..0090b1d62e33 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.xcu +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXmlFilter_java.xcu b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXmlFilter_java.xcu index 16a04144c5e7..50e30b0272d3 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXmlFilter_java.xcu +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXmlFilter_java.xcu @@ -1,4 +1,21 @@ + diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/SayHello/parcel-descriptor.xml b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/SayHello/parcel-descriptor.xml index 3f317a3495a2..f1c395a3fe1b 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/SayHello/parcel-descriptor.xml +++ b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/SayHello/parcel-descriptor.xml @@ -1,5 +1,21 @@ - +