[Libreoffice-commits] .: 4 commits - desktop/inc desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Makefile desktop/prj desktop/qa desktop/scripts desktop/source desktop/test desktop/unx desktop/util desktop/win32 officecfg/Makefile officecfg/registry officecfg/util svtools/AllLangResTarget_svt.mk svtools/bmpmaker svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/inc svtools/JunitTest_svtools_unoapi.mk svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svtools/Module_svtools.mk svtools/Package_inc.mk svtools/prj svtools/qa svtools/source svtools/util
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 19 09:45:00 PST 2012
desktop/Library_deployment.mk | 6
desktop/Library_deploymentmisc.mk | 12
desktop/Library_migrationoo2.mk | 4
desktop/Makefile | 7
desktop/inc/app.hxx | 40
desktop/inc/deployment.hrc | 37
desktop/inc/migration.hxx | 43
desktop/prj/build.lst | 2
desktop/qa/deployment_misc/makefile.mk | 51
desktop/qa/deployment_misc/test_dp_version.cxx | 37
desktop/scripts/mozwrapper.sh | 17
desktop/scripts/soffice.sh | 33
desktop/scripts/unoinfo.sh | 33
desktop/scripts/unopkg.sh | 33
desktop/source/app/app.cxx | 72 -
desktop/source/app/appfirststart.cxx | 37
desktop/source/app/appinit.cxx | 37
desktop/source/app/check_ext_deps.cxx | 37
desktop/source/app/cmdlineargs.cxx | 37
desktop/source/app/cmdlineargs.hxx | 37
desktop/source/app/cmdlinehelp.cxx | 37
desktop/source/app/cmdlinehelp.hxx | 18
desktop/source/app/configinit.cxx | 37
desktop/source/app/configinit.hxx | 18
desktop/source/app/desktop.src | 37
desktop/source/app/desktopcontext.cxx | 43
desktop/source/app/dispatchwatcher.cxx | 37
desktop/source/app/dispatchwatcher.hxx | 37
desktop/source/app/langselect.cxx | 37
desktop/source/app/langselect.hxx | 37
desktop/source/app/lockfile2.cxx | 43
desktop/source/app/officeipcthread.cxx | 37
desktop/source/app/officeipcthread.hxx | 37
desktop/source/app/sofficemain.cxx | 37
desktop/source/app/sofficemain.h | 43
desktop/source/app/userinstall.cxx | 37
desktop/source/app/userinstall.hxx | 43
desktop/source/app/version.map | 34
desktop/source/deployment/deployment.component | 43
desktop/source/deployment/dp_log.cxx | 37
desktop/source/deployment/dp_persmap.cxx | 546 ++++++----
desktop/source/deployment/dp_services.cxx | 37
desktop/source/deployment/dp_xml.cxx | 43
desktop/source/deployment/gui/deploymentgui.component | 43
desktop/source/deployment/gui/dp_gui_backend.src | 37
desktop/source/deployment/gui/dp_gui_dialog.src | 37
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 69 -
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 37
desktop/source/deployment/gui/dp_gui_dialog2.src | 37
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 37
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 110 +-
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 45
desktop/source/deployment/gui/dp_gui_service.cxx | 37
desktop/source/deployment/gui/dp_gui_shared.hxx | 43
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 37
desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 37
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 39
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 37
desktop/source/deployment/gui/dp_gui_updatedialog.src | 37
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 37
desktop/source/deployment/gui/dp_gui_updateinstalldialog.src | 37
desktop/source/deployment/gui/dp_gui_versionboxes.src | 37
desktop/source/deployment/gui/license_dialog.cxx | 37
desktop/source/deployment/inc/db.hxx | 141 --
desktop/source/deployment/inc/dp_dependencies.hxx | 37
desktop/source/deployment/inc/dp_misc.h | 37
desktop/source/deployment/inc/dp_misc.mk | 40
desktop/source/deployment/inc/dp_persmap.h | 65 -
desktop/source/deployment/inc/dp_resource.h | 43
desktop/source/deployment/inc/dp_ucb.h | 37
desktop/source/deployment/inc/lockfile.hxx | 40
desktop/source/deployment/manager/dp_activepackages.cxx | 43
desktop/source/deployment/manager/dp_activepackages.hxx | 39
desktop/source/deployment/manager/dp_commandenvironments.cxx | 37
desktop/source/deployment/manager/dp_commandenvironments.hxx | 37
desktop/source/deployment/manager/dp_extensionmanager.cxx | 68 -
desktop/source/deployment/manager/dp_extensionmanager.hxx | 38
desktop/source/deployment/manager/dp_informationprovider.cxx | 37
desktop/source/deployment/manager/dp_manager.cxx | 67 -
desktop/source/deployment/manager/dp_managerfac.cxx | 45
desktop/source/deployment/manager/dp_properties.cxx | 37
desktop/source/deployment/misc/db.cxx | 320 -----
desktop/source/deployment/misc/dp_dependencies.cxx | 37
desktop/source/deployment/misc/dp_misc.cxx | 37
desktop/source/deployment/misc/dp_misc.src | 47
desktop/source/deployment/misc/dp_platform.cxx | 37
desktop/source/deployment/misc/dp_resource.cxx | 37
desktop/source/deployment/misc/dp_ucb.cxx | 37
desktop/source/deployment/misc/dp_update.cxx | 37
desktop/source/deployment/misc/dp_version.cxx | 37
desktop/source/deployment/misc/lockfile.cxx | 46
desktop/source/deployment/registry/component/dp_compbackenddb.cxx | 37
desktop/source/deployment/registry/component/dp_component.cxx | 37
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 41
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx | 37
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 37
desktop/source/deployment/registry/dp_backend.cxx | 46
desktop/source/deployment/registry/dp_backenddb.cxx | 37
desktop/source/deployment/registry/dp_registry.cxx | 37
desktop/source/deployment/registry/dp_registry.src | 43
desktop/source/deployment/registry/executable/dp_executable.cxx | 37
desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx | 37
desktop/source/deployment/registry/help/dp_help.cxx | 37
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx | 37
desktop/source/deployment/registry/inc/dp_backend.h | 37
desktop/source/deployment/registry/package/dp_extbackenddb.cxx | 37
desktop/source/deployment/registry/package/dp_package.cxx | 37
desktop/source/deployment/registry/script/dp_lib_container.cxx | 37
desktop/source/deployment/registry/script/dp_lib_container.h | 43
desktop/source/deployment/registry/script/dp_script.cxx | 37
desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx | 37
desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx | 37
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 37
desktop/source/deployment/unopkg/unopkg.src | 37
desktop/source/migration/migration.cxx | 37
desktop/source/migration/migration_impl.hxx | 37
desktop/source/migration/services/basicmigration.cxx | 37
desktop/source/migration/services/cexports.cxx | 43
desktop/source/migration/services/cexportsoo3.cxx | 43
desktop/source/migration/services/jvmfwk.cxx | 37
desktop/source/migration/services/migrationoo2.component | 43
desktop/source/migration/services/migrationoo2.xml | 19
desktop/source/migration/services/migrationoo3.component | 43
desktop/source/migration/services/oo3extensionmigration.cxx | 37
desktop/source/migration/services/oo3extensionmigration.hxx | 37
desktop/source/migration/services/wordbookmigration.cxx | 37
desktop/source/offacc/acceptor.cxx | 38
desktop/source/offacc/offacc.component | 43
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 37
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 37
desktop/source/pkgchk/unopkg/unopkg_main.h | 43
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 37
desktop/source/pkgchk/unopkg/unopkg_shared.h | 37
desktop/source/pkgchk/unopkg/version.map | 34
desktop/source/splash/services_spl.cxx | 43
desktop/source/splash/spl.component | 43
desktop/source/splash/splash.cxx | 43
desktop/source/splash/splash.hxx | 43
desktop/test/deployment/active/Addons.xcu | 43
desktop/test/deployment/active/ProtocolHandler.xcu | 43
desktop/test/deployment/active/active_native.cxx | 43
desktop/test/deployment/active/description.xml | 43
desktop/test/deployment/active/makefile.mk | 33
desktop/test/deployment/active/manifest.xml | 43
desktop/test/deployment/dependencies/readme.txt | 33
desktop/test/deployment/executable_content/build/hello.c | 43
desktop/test/deployment/identifier/readme.txt | 33
desktop/test/deployment/locationtest/description.xml | 17
desktop/test/deployment/locationtest/makefile.mk | 33
desktop/test/deployment/passive/Addons.xcu | 43
desktop/test/deployment/passive/ProtocolHandler.xcu | 43
desktop/test/deployment/passive/description.xml | 43
desktop/test/deployment/passive/makefile.mk | 33
desktop/test/deployment/passive/manifest.xml | 43
desktop/test/deployment/passive/passive_java.component | 43
desktop/test/deployment/passive/passive_native.component | 43
desktop/test/deployment/passive/passive_native.cxx | 43
desktop/test/deployment/passive/passive_python.component | 43
desktop/test/deployment/update/changing_display_name/update1/change1.update.xml | 17
desktop/test/deployment/update/changing_display_name/update2/change1.update.xml | 17
desktop/test/deployment/update/default_url/update/default1.update.xml | 17
desktop/test/deployment/update/default_url/update/default2.update.xml | 17
desktop/test/deployment/update/default_url/update/feed1.xml | 17
desktop/test/deployment/update/defect/update/fail1.update.xml | 17
desktop/test/deployment/update/defect/update/fail2.update.xml | 17
desktop/test/deployment/update/defect/update/fail3.update.xml | 17
desktop/test/deployment/update/defect/update/fail4.update.xml | 17
desktop/test/deployment/update/defect/update/info3.update.xml | 17
desktop/test/deployment/update/dependencies/readme.txt | 33
desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml | 43
desktop/test/deployment/update/license/update/lic1.update.xml | 17
desktop/test/deployment/update/license/update/lic2.update.xml | 17
desktop/test/deployment/update/license/update/lic3.update.xml | 17
desktop/test/deployment/update/publisher/update/pub1.update.xml | 17
desktop/test/deployment/update/publisher/update/pub2.update.xml | 17
desktop/test/deployment/update/publisher/update/pub3.update.xml | 17
desktop/test/deployment/update/publisher/update/pub4.update.xml | 17
desktop/test/deployment/update/publisher/update/pub5.update.xml | 17
desktop/test/deployment/update/publisher/update/pub6.update.xml | 17
desktop/test/deployment/update/publisher/update/pub7.update.xml | 17
desktop/test/deployment/update/readme.txt | 68 -
desktop/test/deployment/update/simple/update/plain1.update.xml | 17
desktop/test/deployment/update/simple/update/plain2.update.xml | 17
desktop/test/deployment/update/simple/update/plain3.update.xml | 17
desktop/test/deployment/update/updatefeed/update/feed1.update.xml | 17
desktop/test/deployment/update/updatefeed/update/feed1.xml | 17
desktop/test/deployment/update/updatefeed/update/feed2.update.xml | 17
desktop/test/deployment/update/updateinfocreation/build/description.xml | 17
desktop/test/deployment/update/updateinfocreation/build/makefile.mk | 33
desktop/test/deployment/update/website_update/update/web1.update.xml | 17
desktop/test/deployment/update/website_update/update/web2.update.xml | 17
desktop/test/deployment/update/website_update/update/web3.update.xml | 17
desktop/test/deployment/update/website_update/update/web4.update.xml | 17
desktop/test/deployment/update/website_update/update/web5.update.xml | 17
desktop/test/deployment/update/website_update/update/web6/description.xml | 17
desktop/test/deployment/update/website_update/update/web7/description.xml | 17
desktop/test/deployment/update/wrong_url/update/url1.update.xml | 17
desktop/test/deployment/update/wrong_url/update/url2.update.xml | 17
desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml | 17
desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml | 17
desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml | 17
desktop/test/deployment/version/readme.txt | 43
desktop/test/no_localization | 2
desktop/unx/source/file_image.h | 37
desktop/unx/source/file_image_unx.c | 37
desktop/unx/source/officeloader/officeloader.cxx | 37
desktop/unx/source/pagein.c | 37
desktop/unx/splash/exports.map | 8
desktop/unx/splash/splash.component | 8
desktop/unx/splash/unxsplash.cxx | 43
desktop/util/officeloader.rc | 37
desktop/win32/source/QuickStart/QuickStart.cxx | 18
desktop/win32/source/applauncher/launcher.cxx | 37
desktop/win32/source/applauncher/launcher.hxx | 18
desktop/win32/source/applauncher/launcher.rc | 37
desktop/win32/source/applauncher/sbase.cxx | 43
desktop/win32/source/applauncher/scalc.cxx | 43
desktop/win32/source/applauncher/sdraw.cxx | 43
desktop/win32/source/applauncher/simpress.cxx | 43
desktop/win32/source/applauncher/smath.cxx | 43
desktop/win32/source/applauncher/sweb.cxx | 43
desktop/win32/source/applauncher/swriter.cxx | 43
desktop/win32/source/extendloaderenvironment.cxx | 37
desktop/win32/source/guistdio/guistdio.inc | 37
desktop/win32/source/main.h | 18
desktop/win32/source/officeloader/officeloader.cxx | 37
desktop/win32/source/sowrapper.cxx | 43
desktop/win32/source/unoinfo.cxx | 37
officecfg/Makefile | 7
officecfg/registry/component-schema.dtd | 43
officecfg/registry/component-update.dtd | 43
officecfg/registry/data.dtd | 43
officecfg/registry/data/org/openoffice/FirstStartWizard.xcu | 43
officecfg/registry/data/org/openoffice/Inet.xcu | 37
officecfg/registry/data/org/openoffice/Interaction.xcu | 43
officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl | 37
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 37
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 37
officecfg/registry/data/org/openoffice/Office/Canvas.xcu | 28
officecfg/registry/data/org/openoffice/Office/Common.xcu | 50
officecfg/registry/data/org/openoffice/Office/Compatibility.xcu | 43
officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 37
officecfg/registry/data/org/openoffice/Office/Embedding.xcu | 37
officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu | 43
officecfg/registry/data/org/openoffice/Office/FormWizard.xcu | 37
officecfg/registry/data/org/openoffice/Office/Histories.xcu | 43
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 37
officecfg/registry/data/org/openoffice/Office/Jobs.xcu | 48
officecfg/registry/data/org/openoffice/Office/Labels.xcu | 37
officecfg/registry/data/org/openoffice/Office/Linguistic.xcu | 43
officecfg/registry/data/org/openoffice/Office/Logging.xcu | 43
officecfg/registry/data/org/openoffice/Office/Math.xcu | 37
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 37
officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu | 43
officecfg/registry/data/org/openoffice/Office/Recovery.xcu | 43
officecfg/registry/data/org/openoffice/Office/SFX.xcu | 43
officecfg/registry/data/org/openoffice/Office/Scripting.xcu | 43
officecfg/registry/data/org/openoffice/Office/Security.xcu | 37
officecfg/registry/data/org/openoffice/Office/TableWizard.xcu | 37
officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu | 43
officecfg/registry/data/org/openoffice/Office/UI.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu | 43
officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu | 37
officecfg/registry/data/org/openoffice/Office/Views.xcu | 43
officecfg/registry/data/org/openoffice/Office/WebWizard.xcu | 37
officecfg/registry/data/org/openoffice/Office/Writer.xcu | 37
officecfg/registry/data/org/openoffice/Setup.xcu | 37
officecfg/registry/data/org/openoffice/System.xcu | 43
officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu | 43
officecfg/registry/data/org/openoffice/UserProfile.xcu | 43
officecfg/registry/data/org/openoffice/VCL.xcu | 57 -
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 37
officecfg/registry/files.mk | 8
officecfg/registry/schema/oo-ad-ldap.xcd.sample | 43
officecfg/registry/schema/oo-common-ad.ldf | 17
officecfg/registry/schema/oo-ldap-attr-map.properties | 24
officecfg/registry/schema/oo-ldap.xcd.sample | 43
officecfg/registry/schema/oo-org-map.properties | 18
officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs | 37
officecfg/registry/schema/org/openoffice/Inet.xcs | 37
officecfg/registry/schema/org/openoffice/Interaction.xcs | 37
officecfg/registry/schema/org/openoffice/LDAP.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Addons.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 37
officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Canvas.xcs | 17
officecfg/registry/schema/org/openoffice/Office/Chart.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Commands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 103 -
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs | 37
officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs | 37
officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Embedding.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Events.xcs | 37
officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs | 37
officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs | 37
officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Histories.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Java.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Jobs.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Labels.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Logging.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Math.xcs | 37
officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs | 17
officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Paths.xcs | 37
officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Recovery.xcs | 37
officecfg/registry/schema/org/openoffice/Office/SFX.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Scripting.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Security.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Substitution.xcs | 37
officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs | 37
officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs | 37
officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Views.xcs | 37
officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs | 37
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 37
officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 37
officecfg/registry/schema/org/openoffice/Setup.xcs | 37
officecfg/registry/schema/org/openoffice/System.xcs | 37
officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs | 37
officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs | 37
officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs | 37
officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs | 37
officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs | 37
officecfg/registry/schema/org/openoffice/UserProfile.xcs | 37
officecfg/registry/schema/org/openoffice/VCL.xcs | 37
officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs | 37
officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs | 37
officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs | 37
officecfg/registry/schema/org/openoffice/ucb/Store.xcs | 37
officecfg/util/alllang.xsl | 41
officecfg/util/component-conf.gen | 47
officecfg/util/component-ldif.gen | 45
officecfg/util/component-map.gen | 48
officecfg/util/data_val.xsl | 41
officecfg/util/resource.xsl | 41
officecfg/util/sanity.xsl | 22
officecfg/util/schema_trim.xsl | 41
officecfg/util/schema_val.xsl | 41
officecfg/util/template.gen | 17
svtools/AllLangResTarget_svt.mk | 33
svtools/Executable_bmp.mk | 33
svtools/Executable_bmpsum.mk | 33
svtools/Executable_g2g.mk | 33
svtools/JunitTest_svtools_unoapi.mk | 33
svtools/Library_hatchwindowfactory.mk | 33
svtools/Library_svt.mk | 33
svtools/Module_svtools.mk | 35
svtools/Package_inc.mk | 33
svtools/bmpmaker/bmp.cxx | 37
svtools/bmpmaker/bmpcore.cxx | 37
svtools/bmpmaker/bmpsum.cxx | 37
svtools/bmpmaker/g2g.cxx | 37
svtools/inc/svtools/DocumentInfoPreview.hxx | 37
svtools/inc/svtools/FilterConfigItem.hxx | 37
svtools/inc/svtools/QueryFolderName.hxx | 43
svtools/inc/svtools/acceleratorexecute.hxx | 37
svtools/inc/svtools/accessibilityoptions.hxx | 37
svtools/inc/svtools/accessiblefactory.hxx | 37
svtools/inc/svtools/accessibletable.hxx | 37
svtools/inc/svtools/accessibletableprovider.hxx | 37
svtools/inc/svtools/addresstemplate.hxx | 37
svtools/inc/svtools/apearcfg.hxx | 37
svtools/inc/svtools/asynclink.hxx | 37
svtools/inc/svtools/bindablecontrolhelper.hxx | 43
svtools/inc/svtools/borderhelper.hxx | 43
svtools/inc/svtools/brwbox.hxx | 37
svtools/inc/svtools/calendar.hxx | 37
svtools/inc/svtools/collatorres.hxx | 17
svtools/inc/svtools/colorcfg.hxx | 37
svtools/inc/svtools/colrdlg.hxx | 43
svtools/inc/svtools/contextmenuhelper.hxx | 37
svtools/inc/svtools/ctrlbox.hxx | 37
svtools/inc/svtools/ctrltool.hxx | 37
svtools/inc/svtools/dialogclosedlistener.hxx | 37
svtools/inc/svtools/dialogcontrolling.hxx | 37
svtools/inc/svtools/editbrowsebox.hxx | 37
svtools/inc/svtools/editsyntaxhighlighter.hxx | 43
svtools/inc/svtools/embedhlp.hxx | 37
svtools/inc/svtools/extcolorcfg.hxx | 37
svtools/inc/svtools/filectrl.hxx | 37
svtools/inc/svtools/filedlg.hxx | 43
svtools/inc/svtools/fileurlbox.hxx | 37
svtools/inc/svtools/fileview.hxx | 37
svtools/inc/svtools/filter.hxx | 37
svtools/inc/svtools/fmtfield.hxx | 37
svtools/inc/svtools/framestatuslistener.hxx | 37
svtools/inc/svtools/headbar.hxx | 37
svtools/inc/svtools/helpopt.hxx | 37
svtools/inc/svtools/htmlcfg.hxx | 37
svtools/inc/svtools/htmlout.hxx | 37
svtools/inc/svtools/htmltokn.h | 37
svtools/inc/svtools/hyperlabel.hxx | 37
svtools/inc/svtools/imagemgr.hxx | 37
svtools/inc/svtools/imap.hxx | 37
svtools/inc/svtools/imapcirc.hxx | 37
svtools/inc/svtools/imapobj.hxx | 37
svtools/inc/svtools/indexentryres.hxx | 17
svtools/inc/svtools/inettbc.hxx | 37
svtools/inc/svtools/insdlg.hxx | 37
svtools/inc/svtools/itemdel.hxx | 43
svtools/inc/svtools/ivctrl.hxx | 37
svtools/inc/svtools/javacontext.hxx | 37
svtools/inc/svtools/javainteractionhandler.hxx | 37
svtools/inc/svtools/langtab.hxx | 43
svtools/inc/svtools/menuoptions.hxx | 37
svtools/inc/svtools/miscopt.hxx | 37
svtools/inc/svtools/optionsdrawinglayer.hxx | 37
svtools/inc/svtools/parhtml.hxx | 37
svtools/inc/svtools/popupmenucontrollerbase.hxx | 37
svtools/inc/svtools/prnsetup.hxx | 37
svtools/inc/svtools/roadmap.hxx | 37
svtools/inc/svtools/roadmapwizard.hxx | 37
svtools/inc/svtools/rtfout.hxx | 43
svtools/inc/svtools/rtftoken.h | 37
svtools/inc/svtools/ruler.hxx | 37
svtools/inc/svtools/scriptedtext.hxx | 37
svtools/inc/svtools/scrwin.hxx | 37
svtools/inc/svtools/statusbarcontroller.hxx | 37
svtools/inc/svtools/stdctrl.hxx | 43
svtools/inc/svtools/stdmenu.hxx | 37
svtools/inc/svtools/svlbitm.hxx | 37
svtools/inc/svtools/svmedit.hxx | 43
svtools/inc/svtools/svparser.hxx | 37
svtools/inc/svtools/svtabbx.hxx | 37
svtools/inc/svtools/svtools.hrc | 37
svtools/inc/svtools/svtresid.hxx | 43
svtools/inc/svtools/svxbox.hxx | 37
svtools/inc/svtools/syntaxhighlight.hxx | 37
svtools/inc/svtools/tabbar.hxx | 37
svtools/inc/svtools/table/gridtablerenderer.hxx | 36
svtools/inc/svtools/table/tablecontrol.hxx | 36
svtools/inc/svtools/table/tablecontrolinterface.hxx | 36
svtools/inc/svtools/table/tablemodel.hxx | 36
svtools/inc/svtools/table/tablerenderer.hxx | 36
svtools/inc/svtools/table/tablesort.hxx | 36
svtools/inc/svtools/templdlg.hxx | 37
svtools/inc/svtools/toolbarmenu.hxx | 37
svtools/inc/svtools/toolboxcontroller.hxx | 37
svtools/inc/svtools/toolpanel/tablayouter.hxx | 36
svtools/inc/svtools/toolpanel/toolpaneldeck.hxx | 36
svtools/inc/svtools/transfer.hxx | 37
svtools/inc/svtools/treelist.hxx | 37
svtools/inc/svtools/treelistbox.hxx | 37
svtools/inc/svtools/treelistentry.hxx | 37
svtools/inc/svtools/unitconv.hxx | 43
svtools/inc/svtools/unoevent.hxx | 37
svtools/inc/svtools/urlcontrol.hxx | 43
svtools/inc/svtools/valueset.hxx | 37
svtools/inc/svtools/wallitem.hxx | 43
svtools/inc/svtools/wizardmachine.hxx | 37
svtools/inc/svtools/wizdlg.hxx | 37
svtools/inc/svtools/wmf.hxx | 37
svtools/inc/svtools/xwindowitem.hxx | 43
svtools/prj/svtools.xml | 17
svtools/qa/unoapi/knownissues.xcl | 18
svtools/source/brwbox/brwbox1.cxx | 37
svtools/source/brwbox/brwbox2.cxx | 37
svtools/source/brwbox/brwbox3.cxx | 37
svtools/source/brwbox/brwhead.cxx | 37
svtools/source/brwbox/brwimpl.hxx | 37
svtools/source/brwbox/datwin.cxx | 37
svtools/source/brwbox/datwin.hxx | 37
svtools/source/brwbox/ebbcontrols.cxx | 37
svtools/source/brwbox/editbrowsebox.cxx | 37
svtools/source/brwbox/editbrowsebox.src | 43
svtools/source/brwbox/editbrowsebox2.cxx | 37
svtools/source/brwbox/editbrowseboximpl.hxx | 43
svtools/source/config/accessibilityoptions.cxx | 37
svtools/source/config/apearcfg.cxx | 37
svtools/source/config/colorcfg.cxx | 37
svtools/source/config/extcolorcfg.cxx | 37
svtools/source/config/fontsubstconfig.cxx | 37
svtools/source/config/helpopt.cxx | 37
svtools/source/config/htmlcfg.cxx | 37
svtools/source/config/itemholder2.cxx | 37
svtools/source/config/itemholder2.hxx | 37
svtools/source/config/menuoptions.cxx | 37
svtools/source/config/miscopt.cxx | 37
svtools/source/config/optionsdrawinglayer.cxx | 37
svtools/source/config/printoptions.cxx | 37
svtools/source/config/test/test.cxx | 37
svtools/source/contnr/DocumentInfoPreview.cxx | 37
svtools/source/contnr/contentenumeration.cxx | 37
svtools/source/contnr/contentenumeration.hxx | 37
svtools/source/contnr/fileview.cxx | 37
svtools/source/contnr/fileview.hxx | 43
svtools/source/contnr/fileview.src | 37
svtools/source/contnr/imivctl.hxx | 37
svtools/source/contnr/imivctl1.cxx | 37
svtools/source/contnr/imivctl2.cxx | 37
svtools/source/contnr/ivctrl.cxx | 37
svtools/source/contnr/svcontnr.src | 43
svtools/source/contnr/svimpbox.cxx | 37
svtools/source/contnr/svlbitm.cxx | 37
svtools/source/contnr/svtabbx.cxx | 37
svtools/source/contnr/templwin.cxx | 37
svtools/source/contnr/templwin.hxx | 37
svtools/source/contnr/templwin.src | 37
svtools/source/contnr/treelist.cxx | 229 ----
svtools/source/contnr/treelistbox.cxx | 38
svtools/source/contnr/treelistentry.cxx | 37
svtools/source/control/asynclink.cxx | 37
svtools/source/control/calendar.cxx | 37
svtools/source/control/collatorres.cxx | 37
svtools/source/control/ctrlbox.cxx | 37
svtools/source/control/ctrlbox.src | 37
svtools/source/control/ctrltool.cxx | 37
svtools/source/control/ctrltool.src | 37
svtools/source/control/filectrl.cxx | 37
svtools/source/control/filectrl2.cxx | 37
svtools/source/control/fileurlbox.cxx | 37
svtools/source/control/fmtfield.cxx | 37
svtools/source/control/headbar.cxx | 37
svtools/source/control/hyperlabel.cxx | 37
svtools/source/control/indexentryres.cxx | 37
svtools/source/control/inettbc.cxx | 37
svtools/source/control/roadmap.cxx | 37
svtools/source/control/ruler.cxx | 37
svtools/source/control/scriptedtext.cxx | 37
svtools/source/control/scrwin.cxx | 37
svtools/source/control/stdctrl.cxx | 37
svtools/source/control/stdmenu.cxx | 37
svtools/source/control/tabbar.cxx | 37
svtools/source/control/toolbarmenu.cxx | 37
svtools/source/control/toolbarmenuacc.cxx | 37
svtools/source/control/toolbarmenuimp.hxx | 37
svtools/source/control/urlcontrol.cxx | 37
svtools/source/control/valueacc.cxx | 37
svtools/source/control/valueimp.hxx | 37
svtools/source/control/valueset.cxx | 37
svtools/source/dialogs/addresstemplate.cxx | 37
svtools/source/dialogs/addresstemplate.src | 37
svtools/source/dialogs/colrdlg.cxx | 37
svtools/source/dialogs/filedlg.cxx | 43
svtools/source/dialogs/filedlg2.cxx | 37
svtools/source/dialogs/filedlg2.hxx | 37
svtools/source/dialogs/formats.src | 37
svtools/source/dialogs/insdlg.cxx | 47
svtools/source/dialogs/mcvmath.cxx | 37
svtools/source/dialogs/mcvmath.hxx | 37
svtools/source/dialogs/prnsetup.cxx | 37
svtools/source/dialogs/roadmapwizard.cxx | 37
svtools/source/dialogs/so3res.src | 37
svtools/source/dialogs/wizardmachine.cxx | 37
svtools/source/dialogs/wizdlg.cxx | 37
svtools/source/edit/editsyntaxhighlighter.cxx | 37
svtools/source/edit/svmedit.cxx | 43
svtools/source/edit/syntaxhighlight.cxx | 37
svtools/source/filter/FilterConfigCache.cxx | 37
svtools/source/filter/FilterConfigCache.hxx | 37
svtools/source/filter/FilterConfigItem.cxx | 37
svtools/source/filter/SvFilterOptionsDialog.cxx | 37
svtools/source/filter/exportdialog.cxx | 37
svtools/source/filter/filter2.cxx | 37
svtools/source/filter/igif/gifread.cxx | 37
svtools/source/filter/ixbm/xbmread.cxx | 37
svtools/source/filter/jpeg/jpeg.cxx | 44
svtools/source/filter/sgfbram.cxx | 99 -
svtools/source/filter/sgvmain.cxx | 37
svtools/source/filter/sgvspln.cxx | 37
svtools/source/filter/sgvtext.cxx | 37
svtools/source/filter/wmf/emfwr.hxx | 37
svtools/source/filter/wmf/enhwmf.cxx | 37
svtools/source/filter/wmf/winmtf.cxx | 37
svtools/source/filter/wmf/winmtf.hxx | 37
svtools/source/filter/wmf/winwmf.cxx | 37
svtools/source/filter/wmf/wmf.cxx | 37
svtools/source/filter/wmf/wmfwr.hxx | 37
svtools/source/graphic/descriptor.hxx | 37
svtools/source/graphic/graphicunofactory.cxx | 37
svtools/source/graphic/grfattr.cxx | 37
svtools/source/graphic/grfcache.hxx | 37
svtools/source/graphic/renderer.cxx | 37
svtools/source/hatchwindow/hatchwindow.cxx | 37
svtools/source/hatchwindow/hatchwindowfactory.component | 43
svtools/source/hatchwindow/hatchwindowfactory.cxx | 37
svtools/source/hatchwindow/ipwin.cxx | 37
svtools/source/inc/sgvmain.hxx | 37
svtools/source/inc/sgvspln.hxx | 43
svtools/source/inc/svimpbox.hxx | 37
svtools/source/inc/unoiface.hxx | 37
svtools/source/inc/xbmread.hxx | 37
svtools/source/java/javacontext.cxx | 37
svtools/source/java/javaerror.src | 37
svtools/source/java/javainteractionhandler.cxx | 37
svtools/source/misc/acceleratorexecute.cxx | 37
svtools/source/misc/bindablecontrolhelper.cxx | 37
svtools/source/misc/dialogclosedlistener.cxx | 43
svtools/source/misc/dialogcontrolling.cxx | 37
svtools/source/misc/ehdl.cxx | 37
svtools/source/misc/embedhlp.cxx | 37
svtools/source/misc/embedtransfer.cxx | 37
svtools/source/misc/helpagent.src | 43
svtools/source/misc/imagemgr.cxx | 37
svtools/source/misc/imagemgr.src | 37
svtools/source/misc/imageresourceaccess.cxx | 38
svtools/source/misc/imap.cxx | 37
svtools/source/misc/imap2.cxx | 37
svtools/source/misc/itemdel.cxx | 37
svtools/source/misc/langtab.cxx | 37
svtools/source/misc/langtab.src | 37
svtools/source/misc/svtaccessiblefactory.cxx | 37
svtools/source/misc/svtresid.cxx | 43
svtools/source/misc/templatefoldercache.cxx | 37
svtools/source/misc/transfer.cxx | 39
svtools/source/misc/transfer2.cxx | 37
svtools/source/misc/unitconv.cxx | 37
svtools/source/misc/wallitem.cxx | 43
svtools/source/misc/xwindowitem.cxx | 37
svtools/source/svhtml/htmlkywd.cxx | 37
svtools/source/svhtml/htmlout.cxx | 37
svtools/source/svhtml/htmlsupp.cxx | 37
svtools/source/svhtml/parhtml.cxx | 38
svtools/source/svrtf/parrtf.cxx | 37
svtools/source/svrtf/rtfkeywd.cxx | 37
svtools/source/svrtf/rtfout.cxx | 37
svtools/source/svrtf/svparser.cxx | 37
svtools/source/table/cellvalueconversion.cxx | 36
svtools/source/table/cellvalueconversion.hxx | 36
svtools/source/table/gridtablerenderer.cxx | 36
svtools/source/table/mousefunction.cxx | 36
svtools/source/table/tablecontrol.cxx | 37
svtools/source/table/tablecontrol_impl.cxx | 36
svtools/source/table/tablecontrol_impl.hxx | 36
svtools/source/table/tabledatawindow.cxx | 36
svtools/source/table/tabledatawindow.hxx | 36
svtools/source/toolpanel/drawerlayouter.cxx | 36
svtools/source/toolpanel/paneltabbar.cxx | 36
svtools/source/toolpanel/tablayouter.cxx | 36
svtools/source/toolpanel/toolpanel.src | 36
svtools/source/toolpanel/toolpanelcollection.hxx | 36
svtools/source/toolpanel/toolpaneldeck.cxx | 36
svtools/source/toolpanel/toolpaneldrawer.cxx | 36
svtools/source/uno/addrtempuno.cxx | 37
svtools/source/uno/contextmenuhelper.cxx | 37
svtools/source/uno/framestatuslistener.cxx | 37
svtools/source/uno/generictoolboxcontroller.cxx | 37
svtools/source/uno/genericunodialog.cxx | 37
svtools/source/uno/miscservices.cxx | 37
svtools/source/uno/popupmenucontrollerbase.cxx | 37
svtools/source/uno/popupwindowcontroller.cxx | 43
svtools/source/uno/statusbarcontroller.cxx | 37
svtools/source/uno/svtxgridcontrol.cxx | 37
svtools/source/uno/svtxgridcontrol.hxx | 37
svtools/source/uno/toolboxcontroller.cxx | 37
svtools/source/uno/treecontrolpeer.cxx | 37
svtools/source/uno/treecontrolpeer.hxx | 37
svtools/source/uno/unocontroltablemodel.cxx | 37
svtools/source/uno/unocontroltablemodel.hxx | 37
svtools/source/uno/unoevent.cxx | 37
svtools/source/uno/unogridcolumnfacade.cxx | 37
svtools/source/uno/unoiface.cxx | 37
svtools/source/uno/unoimap.cxx | 37
svtools/source/uno/wizard/unowizard.cxx | 36
svtools/source/uno/wizard/wizardpagecontroller.hxx | 36
svtools/source/uno/wizard/wizardshell.cxx | 36
svtools/source/urlobj/inetimg.cxx | 37
svtools/util/hidother.src | 37
svtools/util/svt.component | 43
723 files changed, 11006 insertions(+), 16453 deletions(-)
New commits:
commit daeed90f4586eb9533041fb89bee163a5193596c
Author: Michael Meeks <michael.meeks at suse.com>
Date: Thu Nov 15 17:28:16 2012 +0000
re-base on ALv2 code. Includes:
Patch contributed by: Jurgen Schmidt
remove onlineregistration with dependencies
http://svn.apache.org/viewvc?view=revision&revision=1240245
imported patch package_eventlistener.patch
http://svn.apache.org/viewvc?view=revision&revision=1172103
Patch contributed by Pedro Giffuni
Accept Google Chrome OS fonts as equivalent to MS fonts.
http://svn.apache.org/viewvc?view=revision&revision=1233155
http://svn.apache.org/viewvc?view=revision&revision=1233408
Patch contributed by Andre Fischer
Do not add targets for junit tests when junit is disabled.
http://svn.apache.org/viewvc?view=revision&revision=1241508
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
cws mba34issues01: #i114600#: remove forbidden characters
from list of unencoded characters
http://svn.apache.org/viewvc?view=revision&revision=1172370
Patches contributed by Oliver Rainer-Wittman
some clean up in JPEGReader due to memory constraints
http://svn.apache.org/viewvc?view=revision&revision=1299729
119114 - method <UpdateDialog::addSpecificError(..)> - create
entry with correct type
http://svn.apache.org/viewvc?view=revision&revision=1305265
Patches contributed by Ariel Constenla-Haile
i118707 - make toolbar control's popup window grab focus
http://svn.apache.org/viewvc?view=revision&revision=1225846
Patches contributed by Herbert Duerr
#i118662# remove usage of BerkeleyDB in desktop module
http://svn.apache.org/viewvc?view=revision&revision=1213171
minor cleanups in dp_persmap.*
http://svn.apache.org/viewvc?view=revision&revision=1215064
flush early to prevent problem with extension manager not
cleaning up its objects
http://svn.apache.org/viewvc?view=revision&revision=1228147
i118726 do not flush *pmap file while reading it
http://svn.apache.org/viewvc?view=revision&revision=1230614
#i119048# migrate BDB extension entries using a simple heuristic
http://svn.apache.org/viewvc?view=revision&revision=1300972
#i119048# handle edge cases when importing BDB hash files
http://svn.apache.org/viewvc?view=revision&revision=1301428
#i119113# fix of-by-one when importing BDB files
http://svn.apache.org/viewvc?view=revision&revision=1305420
restore our encryption settings, icon themes, and dictionaries.
removed wrapper hacks, kill obsolete bundled extension blob /
pre-registration handling, remove duplicated quickstart code.
remove OS/2 conditionals.
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 8298eb9..b5f2abd 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -50,12 +50,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\
$(gb_UWINAPI) \
))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_externals,deployment,\
- berkeleydb \
-))
-endif
-
$(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment))
$(eval $(call gb_Library_add_exception_objects,deployment,\
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 2124ea5..4779ff3 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -51,18 +51,6 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
$(gb_UWINAPI) \
))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_externals,deploymentmisc,\
- berkeleydb \
-))
-endif
-
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
- desktop/source/deployment/misc/db \
-))
-endif
-
$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
desktop/source/deployment/misc/dp_dependencies \
desktop/source/deployment/misc/dp_descriptioninfoset \
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 36f430d..1698be9 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -44,10 +44,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_use_externals,migrationoo2,\
- berkeleydb \
-))
-
$(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2))
$(eval $(call gb_Library_add_exception_objects,migrationoo2,\
diff --git a/desktop/Makefile b/desktop/Makefile
index ccb1c85..0997e62 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,4 +1,11 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index edbcde8..0a4c071 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.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
- * <http://www.openoffice.org/license.html>
- * 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 _DESKTOP_APP_HXX_
#define _DESKTOP_APP_HXX_
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index 787c705..c501cdf 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * 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
- * <http://www.openoffice.org/license.html>
- * 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_DEPLOYMENT_HRC
#define INCLUDED_DEPLOYMENT_HRC
diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx
index 3319d8d..6f382b8 100644
--- a/desktop/inc/migration.hxx
+++ b/desktop/inc/migration.hxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * 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 .
+ */
#ifndef _DESKTOP_MIGRATION_HXX_
#define _DESKTOP_MIGRATION_HXX_
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index c9644a0..70558b7 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,3 +1,3 @@
-dt desktop : TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt DESKTOP:helpcompiler NULL
+dt desktop : TRANSLATIONS:translations sfx2 stoc BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt DESKTOP:helpcompiler NULL
dt desktop usr1 - all dt_mkout NULL
dt desktop\prj nmake - all dt_prj NULL
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
deleted file mode 100644
index bd2f191..0000000
--- a/desktop/qa/deployment_misc/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := desktop
-TARGET := qa_deployment_misc
-
-ENABLE_EXCEPTIONS := TRUE
-VISIBILITY_HIDDEN := TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_dp_version.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
-SHL1USE_EXPORTS = name
-SHL1RPATH = NONE
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-.INCLUDE : _cppunit.mk
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 6a284e2..8816d06 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 <cstddef>
#include <sal/types.h>
diff --git a/desktop/scripts/mozwrapper.sh b/desktop/scripts/mozwrapper.sh
index 89b6415..d8f880b 100755
--- a/desktop/scripts/mozwrapper.sh
+++ b/desktop/scripts/mozwrapper.sh
@@ -1,4 +1,21 @@
#!/bin/sh
+#
+# 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 .
+#
# if mozilla is not found, specify full path here
MOZILLA=mozilla
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 9afcfdf..d34f1c3 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -1,30 +1,21 @@
#!/bin/sh
-#*************************************************************************
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# 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/.
#
-# OpenOffice.org - a multi-platform office productivity suite
+# This file incorporates work covered by the following license notice:
#
-# This file is part of OpenOffice.org.
+# 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 free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
#
# STAR_PROFILE_LOCKING_DISABLED=1
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
old mode 100755
new mode 100644
index 97ee445..74a3333
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -1,30 +1,21 @@
#!/bin/sh
-#*************************************************************************
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# 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/.
#
-# OpenOffice.org - a multi-platform office productivity suite
+# This file incorporates work covered by the following license notice:
#
-# This file is part of OpenOffice.org.
+# 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 free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
set -e
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
old mode 100755
new mode 100644
index 4bb36bb..d0bb430
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -1,30 +1,21 @@
#!/bin/sh
-#*************************************************************************
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# 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/.
#
-# OpenOffice.org - a multi-platform office productivity suite
+# This file incorporates work covered by the following license notice:
#
-# This file is part of OpenOffice.org.
+# 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 free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
# enable file locking
SAL_ENABLE_FILE_LOCKING=1
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5440514..35ff47a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
*
- * 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).
+ * 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/.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * 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 .
+ */
#include "sal/config.h"
@@ -104,6 +95,12 @@
#include "langselect.hxx"
+#include "com/sun/star/deployment/ExtensionManager.hpp"
+#include "com/sun/star/deployment/XExtensionManager.hpp"
+#include "com/sun/star/task/XInteractionApprove.hpp"
+#include "cppuhelper/compbase3.hxx"
+#include <hash_set>
+
#ifdef ENABLE_TELEPATHY
#include <tubes/manager.hxx>
#endif
@@ -124,10 +121,6 @@
#endif
#endif //WNT
-
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
@@ -142,7 +135,7 @@ using namespace ::com::sun::star::container;
namespace css = ::com::sun::star;
-ResMgr* desktop::Desktop::pResMgr = 0;
+ResMgr* desktop::Desktop::pResMgr = 0;
namespace desktop
{
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 458f721..1af0ac9 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 <osl/file.hxx>
#include <rtl/bootstrap.hxx>
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 157621a..06b6578 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 <algorithm>
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index fcb2573..d26f4de 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 "osl/file.hxx"
#include "osl/mutex.hxx"
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 01e1f30..8d1089a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 <cmdlineargs.hxx>
#include <vcl/svapp.hxx>
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index c857643..a9c2c48 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.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
- * <http://www.openoffice.org/license.html>
- * 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 _DESKTOP_COMMANDLINEARGS_HXX_
#define _DESKTOP_COMMANDLINEARGS_HXX_
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index e645803..8ed32f7 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 <stdlib.h>
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx
index 86c3c71..f7c7dcd 100644
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
@@ -1,4 +1,22 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index 9394a9b..8c46728 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 "configinit.hxx"
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx
index 2b5bf67..250e3ae 100644
--- a/desktop/source/app/configinit.hxx
+++ b/desktop/source/app/configinit.hxx
@@ -1,4 +1,22 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
#ifndef _DESKTOP_CONFIGINIT_HXX_
#define _DESKTOP_CONFIGINIT_HXX_
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 4e4270f..7519e80 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * 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
- * <http://www.openoffice.org/license.html>
- * 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 "desktop.hrc"
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 0627da3..0320786 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * 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 .
+ */
#include "desktopcontext.hxx"
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 261fa64..e832377 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 <sfx2/docfile.hxx>
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 7146a29..ac7a9c0 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
*
- * 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).
+ * 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/.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * 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 .
+ */
#ifndef _DESKTOP_DISPATCHWATCHER_HXX
#define _DESKTOP_DISPATCHWATCHER_HXX
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 2b17083..db8d0df 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 "app.hxx"
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 93b6bc4..7fc0827 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.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
- * <http://www.openoffice.org/license.html>
- * 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 <list>
#include <sal/types.h>
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index 1eebcca..9d74709 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * 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 .
+ */
#include "vcl/msgbox.hxx"
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 743f79e..7047d69 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 "app.hxx"
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 5dc03bc..734119d 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.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
- * <http://www.openoffice.org/license.html>
- * 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 _DESKTOP_OFFICEIPCTHREAD_HXX_
#define _DESKTOP_OFFICEIPCTHREAD_HXX_
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 45342d7..21317cd 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 "sal/config.h"
diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h
index bbe86d5..d0a9988 100644
--- a/desktop/source/app/sofficemain.h
+++ b/desktop/source/app/sofficemain.h
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * 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 .
+ */
#ifndef INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H
#define INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 6af7786..115be47 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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 "sal/config.h"
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index 5fa1a2d..e7a56ba 100644
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/*
+ * 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 .
+ */
#include <sal/types.h>
diff --git a/desktop/source/app/version.map b/desktop/source/app/version.map
deleted file mode 100644
index 0ffffcd..0000000
--- a/desktop/source/app/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
- global:
- soffice_main;
-
- local:
- *;
-};
diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component
index 2a24467..4e279b0 100644
--- a/desktop/source/deployment/deployment.component
+++ b/desktop/source/deployment/deployment.component
@@ -1,30 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
+<!--
+ * 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 .
+ -->
<component loader="com.sun.star.loader.SharedLibrary" prefix="deployment"
xmlns="http://openoffice.org/2010/uno-components">
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 6b74a49..c9c070b 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -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
- * <http://www.openoffice.org/license.html>
- * 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_misc.h"
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 047ad53..d1d8592 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -1,250 +1,422 @@
/* -*- 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
- * <http://www.openoffice.org/license.html>
- * 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_misc.h"
-#include "dp_ucb.h"
#include "dp_persmap.h"
#include "rtl/strbuf.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "osl/file.hxx"
-#include "osl/thread.h"
+#ifndef DISABLE_BDB2PMAP
+# include <vector>
+#endif
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
using namespace ::rtl;
-using ::osl::File;
+
+// the persistent map is used to manage a handful of key-value string pairs
+// this implementation replaces a rather heavy-weight berkeleydb integration
+
+// the file backing up a persistent map consists of line pairs with
+// - a key string (encoded with chars 0x00..0x0F being escaped)
+// - a value string (encoded with chars 0x00..0x0F being escaped)
namespace dp_misc
{
-//______________________________________________________________________________
-void PersistentMap::throw_rtexc( int err, char const * pmsg ) const
+static const char PmapMagic[4] = {'P','m','p','1'};
+
+PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
+: m_MapFile( expandUnoRcUrl(url_) )
+, m_bReadOnly( readOnly )
+, m_bIsOpen( false )
+, m_bToBeCreated( !readOnly )
+, m_bIsDirty( false )
{
- OUStringBuffer buf;
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[") );
- buf.append( m_sysPath );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] Berkeley Db error (") );
- buf.append( static_cast<sal_Int32>(err) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("): ") );
- if (pmsg == 0)
- pmsg = DbEnv::strerror(err);
- const OString msg(pmsg);
- buf.append( OUString( msg.getStr(), msg.getLength(),
- osl_getThreadTextEncoding() ) );
- const OUString msg_(buf.makeStringAndClear());
- OSL_FAIL( rtl::OUStringToOString(
- msg_, RTL_TEXTENCODING_UTF8 ).getStr() );
- throw RuntimeException( msg_, uno::Reference<XInterface>() );
+#ifndef DISABLE_BDB2PMAP
+ m_MapFileName = expandUnoRcUrl( url_ );
+#endif
+ open();
}
-//______________________________________________________________________________
+PersistentMap::PersistentMap()
+: m_MapFile( OUString() )
+, m_bReadOnly( false )
+, m_bIsOpen( false )
+, m_bToBeCreated( false )
+, m_bIsDirty( false )
+{}
+
PersistentMap::~PersistentMap()
{
- try {
- m_db.close(0);
- }
- catch (DbException & exc) {
- (void) exc; // avoid warnings
- OSL_FAIL( DbEnv::strerror( exc.get_errno() ) );
- }
+ if( m_bIsDirty )
+ flush();
+ if( m_bIsOpen )
+ m_MapFile.close();
}
-//______________________________________________________________________________
-PersistentMap::PersistentMap( OUString const & url )
- : m_db( 0 )
+
+// replace 0x00..0x0F with "%0".."%F"
+// replace "%" with "%%"
+static OString encodeString( const OString& rStr)
{
- try
+ const sal_Char* pChar = rStr.getStr();
+ const sal_Int32 nLen = rStr.getLength();
+ sal_Int32 i = nLen;
+ // short circuit for the simple non-encoded case
+ while( --i >= 0)
{
- rtl::OUString fileURL = expandUnoRcUrl(url);
- if ( File::getSystemPathFromFileURL( fileURL, m_sysPath ) != File::E_None )
- OSL_ASSERT( false );
-
- OString cstr_sysPath(
- OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) );
- int err = m_db.open(
- // xxx todo: DB_THREAD, DB_DBT_MALLOC currently not used
- 0, cstr_sysPath.getStr(), 0, DB_HASH,
- DB_CREATE/* | DB_THREAD*/, 0664 /* fs mode */ );
- if (err != 0)
- throw_rtexc(err);
+ const sal_Char c = *(pChar++);
+ if( (0x00 <= c) && (c <= 0x0F))
+ break;
+ if( c == '%')
+ break;
}
- catch (const DbException & exc)
+ if( i < 0)
+ return rStr;
+
+ // escape chars 0x00..0x0F with "%0".."%F"
+ OStringBuffer aEncStr( nLen + 32);
+ aEncStr.append( pChar - (nLen-i), nLen - i);
+ while( --i >= 0)
{
- throw_rtexc( exc.get_errno(), exc.what() );
+ sal_Char c = *(pChar++);
+ if( (0x00 <= c) && (c <= 0x0F))
+ {
+ aEncStr.append( '%');
+ c += (c <= 0x09) ? '0' : 'A'-10;
+ } else if( c == '%')
+ aEncStr.append( '%');
+ aEncStr.append( c);
}
+
+ return aEncStr.makeStringAndClear();
}
-//______________________________________________________________________________
-PersistentMap::PersistentMap()
- : m_db( 0 )
+// replace "%0".."%F" with 0x00..0x0F
+// replace "%%" with "%"
+static OString decodeString( const sal_Char* pEncChars, int nLen)
{
- try {
- // xxx todo: DB_THREAD, DB_DBT_MALLOC currently not used
- int err = m_db.open( 0, 0, 0, DB_HASH, DB_CREATE/* | DB_THREAD*/, 0 );
- if (err != 0)
- throw_rtexc(err);
- }
- catch (DbException & exc) {
- throw_rtexc( exc.get_errno(), exc.what() );
+ const char* pChar = pEncChars;
+ sal_Int32 i = nLen;
+ // short circuit for the simple non-encoded case
+ while( --i >= 0)
+ if( *(pChar++) == '%')
+ break;
+ if( i < 0)
+ return OString( pEncChars, nLen);
+
+ // replace escaped chars with their decoded counterparts
+ OStringBuffer aDecStr( nLen);
+ pChar = pEncChars;
+ for( i = nLen; --i >= 0;)
+ {
+ sal_Char c = *(pChar++);
+ // handle escaped character
+ if( c == '%')
+ {
+ --i;
+ OSL_ASSERT( i >= 0);
+ c = *(pChar++);
+ if( ('0' <= c) && (c <= '9'))
+ c -= '0';
+ else
+ {
+ OSL_ASSERT( ('A' <= c) && (c <= 'F'));
+ c -= ('A'-10);
+ }
+ }
+ aDecStr.append( c);
}
+
+ return aDecStr.makeStringAndClear();
}
-//______________________________________________________________________________
-bool PersistentMap::has( OString const & key ) const
+bool PersistentMap::open()
{
- return get( 0, key );
-}
+ // open the existing file
+ sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read;
+ if( !m_bReadOnly)
+ nOpenFlags |= osl_File_OpenFlag_Write;
-// for 3 functions here MSVC gives C4702 "unreachable code" if optimization
-// is enabled and return is there and C4715 "not all control paths return
-// a value" if optimization disabled and no return...
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable: 4702 )
+ const osl::File::RC rcOpen = m_MapFile.open( nOpenFlags);
+ m_bIsOpen = (rcOpen == osl::File::E_None);
+
+ // or create later if needed
+ m_bToBeCreated &= (rcOpen == osl::File::E_NOENT) && !m_bIsOpen;
+
+#ifndef DISABLE_BDB2PMAP
+ if( m_bToBeCreated )
+ importFromBDB();
#endif
+ if( !m_bIsOpen)
+ return m_bToBeCreated;
+
+ return readAll();
+}
+
//______________________________________________________________________________
-bool PersistentMap::get( OString * value, OString const & key ) const
+bool PersistentMap::readAll()
{
- try {
- Dbt dbKey( const_cast< sal_Char * >(key.getStr()), key.getLength() );
- Dbt dbData;
- int err = m_db.get( 0, &dbKey, &dbData, 0 );
- if (err == DB_NOTFOUND)
+ // prepare for re-reading the map-file
+ const osl::FileBase::RC nRes = m_MapFile.setPos( osl_Pos_Absolut, 0);
+ (void)nRes;
+ m_entries.clear();
+
+ // read header and check magic
+ char aHeaderBytes[ sizeof(PmapMagic)];
+ sal_uInt64 nBytesRead = 0;
+ m_MapFile.read( aHeaderBytes, sizeof(aHeaderBytes), nBytesRead);
+ OSL_ASSERT( nBytesRead == sizeof(aHeaderBytes));
+ if( nBytesRead != sizeof(aHeaderBytes))
+ return false;
+ // check header magic
+ for( int i = 0; i < (int)sizeof(PmapMagic); ++i)
+ if( aHeaderBytes[i] != PmapMagic[i])
return false;
- if (err == 0) {
- if (value != 0) {
- *value = OString(
- static_cast< sal_Char const * >(dbData.get_data()),
- dbData.get_size() );
- }
- return true;
- }
- throw_rtexc(err);
- }
- catch (DbException & exc) {
- throw_rtexc( exc.get_errno(), exc.what() );
+
+ // read key value pairs and add them to the map
+ ByteSequence aKeyLine;
+ ByteSequence aValLine;
+ for(;;)
+ {
+ // read key-value line pair
+ // an empty key name indicates the end of the line pairs
+ if( m_MapFile.readLine( aKeyLine) != osl::File::E_None)
+ return false;
+ if( !aKeyLine.getLength())
+ break;
+ if( m_MapFile.readLine( aValLine) != osl::File::E_None)
+ return false;
+ // decode key and value strings
+ const OString aKeyName = decodeString( (sal_Char*)aKeyLine.getConstArray(), aKeyLine.getLength());
+ const OString aValName = decodeString( (sal_Char*)aValLine.getConstArray(), aValLine.getLength());
+ // insert key-value pair into map
+ add( aKeyName, aValName );
+ // check end-of-file status
+ sal_Bool bIsEOF = true;
+ if( m_MapFile.isEndOfFile( &bIsEOF) != osl::File::E_None )
+ return false;
+ if( bIsEOF )
+ break;
}
- return false; // avoiding warning
+
+ m_bIsDirty = false;
+ return true;
}
-//______________________________________________________________________________
-void PersistentMap::put( OString const & key, OString const & value )
+void PersistentMap::flush()
{
- try {
- Dbt dbKey( const_cast< sal_Char * >(key.getStr()), key.getLength() );
- Dbt dbData( const_cast< sal_Char * >(
- value.getStr()), value.getLength() );
- int err = m_db.put( 0, &dbKey, &dbData, 0 );
- if (err == 0) {
-#if OSL_DEBUG_LEVEL > 0
- OString v;
- OSL_ASSERT( get( &v, key ) );
- OSL_ASSERT( v.equals( value ) );
-#endif
- err = m_db.sync(0);
- }
- if (err != 0)
- throw_rtexc(err);
+ if( !m_bIsDirty)
+ return;
+ OSL_ASSERT( !m_bReadOnly);
+ if( m_bToBeCreated && !m_entries.empty())
+ {
+ const sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create;
+ const osl::File::RC rcOpen = m_MapFile.open( nOpenFlags);
+ m_bIsOpen = (rcOpen == osl::File::E_None);
+ m_bToBeCreated = !m_bIsOpen;
}
- catch (DbException & exc) {
- throw_rtexc( exc.get_errno(), exc.what() );
+ if( !m_bIsOpen)
+ return;
+
+ // write header magic
+ const osl::FileBase::RC nRes = m_MapFile.setPos( osl_Pos_Absolut, 0);
+ (void)nRes;
+ sal_uInt64 nBytesWritten = 0;
+ m_MapFile.write( PmapMagic, sizeof(PmapMagic), nBytesWritten);
+
+ // write key value pairs
+ t_string2string_map::const_iterator it = m_entries.begin();
+ for(; it != m_entries.end(); ++it) {
+ // write line for key
+ const OString aKeyString = encodeString( (*it).first);
+ const sal_Int32 nKeyLen = aKeyString.getLength();
+ m_MapFile.write( aKeyString.getStr(), nKeyLen, nBytesWritten);
+ OSL_ASSERT( nKeyLen == (sal_Int32)nBytesWritten);
+ m_MapFile.write( "\n", 1, nBytesWritten);
+ // write line for value
+ const OString& rValString = encodeString( (*it).second);
+ const sal_Int32 nValLen = rValString.getLength();
+ m_MapFile.write( rValString.getStr(), nValLen, nBytesWritten);
+ OSL_ASSERT( nValLen == (sal_Int32)nBytesWritten);
+ m_MapFile.write( "\n", 1, nBytesWritten);
}
+
+ // write a file delimiter (an empty key-string)
+ m_MapFile.write( "\n", 1, nBytesWritten);
+ // truncate file here
+ sal_uInt64 nNewFileSize;
+ if( m_MapFile.getPos( nNewFileSize) == osl::File::E_None)
+ m_MapFile.setSize( nNewFileSize);
+ // flush to disk
+ m_MapFile.sync();
+ // the in-memory map now matches to the file on disk
+ m_bIsDirty = false;
+}
+
+bool PersistentMap::has( OString const & key ) const
+{
+ return get( NULL, key );
+}
+
+bool PersistentMap::get( OString * value, OString const & key ) const
+{
+ t_string2string_map::const_iterator it = m_entries.find( key);
+ if( it == m_entries.end())
+ return false;
+ if( value)
+ *value = it->second;
+ return true;
+}
+
+void PersistentMap::add( OString const & key, OString const & value )
+{
+ if( m_bReadOnly)
+ return;
+ typedef std::pair<t_string2string_map::iterator,bool> InsertRC;
+ InsertRC r = m_entries.insert( t_string2string_map::value_type(key,value));
+ m_bIsDirty = r.second;
}
//______________________________________________________________________________
+void PersistentMap::put( OString const & key, OString const & value )
+{
+ add( key, value);
+ // HACK: flush now as the extension manager does not seem
+ // to properly destruct this object in some situations
+ if(m_bIsDirty)
+ flush();
+}
+
bool PersistentMap::erase( OString const & key, bool flush_immediately )
{
- try {
- Dbt dbKey( const_cast< sal_Char * >(key.getStr()), key.getLength() );
- int err = m_db.del( &dbKey, 0 );
- if (err == 0) {
- if (flush_immediately) {
- err = m_db.sync(0);
- if (err != 0)
- throw_rtexc(err);
- }
- return true;
- }
- if (err == DB_NOTFOUND)
- return false;
- throw_rtexc(err);
- }
- catch (DbException & exc) {
- throw_rtexc( exc.get_errno(), exc.what() );
- }
- return false; // avoiding warning
+ if( m_bReadOnly)
+ return false;
+ size_t nCount = m_entries.erase( key);
+ if( !nCount)
+ return false;
+ m_bIsDirty = true;
+ if( flush_immediately)
+ flush();
+ return true;
}
-//______________________________________________________________________________
t_string2string_map PersistentMap::getEntries() const
{
- try {
- Dbc * pcurs = 0;
- int err = m_db.cursor( 0, &pcurs, 0 );
- if (err != 0)
- throw_rtexc(err);
-
- t_string2string_map ret;
- for (;;) {
- Dbt dbKey, dbData;
- err = pcurs->get( &dbKey, &dbData, DB_NEXT );
- if (err == DB_NOTFOUND)
+ // TODO: return by const reference instead?
+ return m_entries;
+}
+
+#ifndef DISABLE_BDB2PMAP
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list