[Libreoffice-commits] core.git: animations/Library_animcore.mk animations/Module_animations.mk basctl/AllLangResTarget_basctl.mk basctl/Library_basctl.mk basctl/Module_basctl.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk canvas/Module_canvas.mk cli_ure/version comphelper/source configure.ac connectivity/registry connectivity/source dtrans/Library_dnd.mk dtrans/Library_dtrans.mk dtrans/Library_ftransl.mk dtrans/Library_mcnttype.mk dtrans/Library_sysdtrans.mk dtrans/Module_dtrans.mk dtrans/StaticLibrary_dtobj.mk extensions/source filter/source icon-themes/industrial idl/Executable_svidl.mk include/comphelper include/default.rc include/postwin.h include/premac.h include/prewin.h include/version.hrc include/wntgcci linguistic/JunitTest_linguistic_complex.mk linguistic/JunitTest_linguistic_unoapi.mk linguistic/Library_lng.m k mysqlc/source mythes/mythes-1.2.0-vanilla-th-gen-idx.patch nlpsolver/Jar_EvolutionarySolver.mk nlpsolver/Jar_nlpsolver.mk nlpsolver/Module_nlpsolver.mk o3tl/CppunitTest_o3tl_tests.mk o3tl/Module_o3tl.mk psprint_config/Module_psprint_config.mk psprint_config/Package_fontunxppds.mk psprint_config/Package_fontunxpsprint.mk reportdesign/AllLangResTarget_rptui.mk reportdesign/JunitTest_reportdesign_complex.mk RepositoryExternal.mk RepositoryFixes.mk Repository.mk rhino/OfficeScriptInfo.java scaddins/AllLangResTarget_analysis.mk scaddins/AllLangResTarget_date.mk scaddins/AllLangResTarget_pricing.mk scaddins/Library_analysis.mk scaddins/Library_date.mk scaddins/Library_pricing.mk scaddins/Module_scaddins.mk sccomp/AllLangResTarget_solver.mk sccomp/Library_solver.mk sccomp/Module_sccomp.mk scp2/inc scp2/macros scp2/source scripting/java scripting/workben slideshow/source solenv/bin solenv/doc solenv/gbuild solenv/inc sot/Library_sot.mk sot/Module_sot.mk stoc/test svl/Library_fssto rage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk testtools/com testtools/qa toolkit/JunitTest_toolkit_complex.mk toolkit/Library_tk.mk udkapi/Module_udkapi.mk udkapi/UnoApi_udkapi.mk vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vcl/Library_vcl.mk wizards/AllLangResTarget_dbw.mk wizards/AllLangResTarget_eur.mk wizards/AllLangResTarget_imp.mk wizards/AllLangResTarget_tpl.mk wizards/AllLangResTarget_wzi.mk wizards/Jar_commonwizards.mk wizards/Jar_form.mk wizards/Jar_query.mk wizards/Jar_reportbuilder.mk wizards/Jar_report.mk wizards/Jar_table.mk wizards/Jar_web.mk wizards/Module_wizards.mk wizards/Package_depot.mk wizards/Package_euro.mk wizards/Package_form.mk wizards/Package_gimmicks.mk wizards/Package_import.mk wizards/Package_share.mk wizards/Package_standard.mk wizards/Package_template.mk wizards/Package_tools.mk wizards/Package_tutorials.mk wizards/Package_usr.mk writerfilter/CppunitTest_writerfilter_doctok.mk xmlreader/Library_xmlreader.mk xmlre ader/Module_xmlreader.mk

Michael Meeks michael.meeks at suse.com
Mon Jun 3 03:43:39 PDT 2013


 Repository.mk                                                                                |   33 --
 RepositoryExternal.mk                                                                        |   33 --
 RepositoryFixes.mk                                                                           |   33 --
 animations/Library_animcore.mk                                                               |   33 --
 animations/Module_animations.mk                                                              |   33 --
 basctl/AllLangResTarget_basctl.mk                                                            |   33 --
 basctl/Library_basctl.mk                                                                     |   33 --
 basctl/Module_basctl.mk                                                                      |   33 --
 canvas/Library_cairocanvas.mk                                                                |   33 --
 canvas/Library_canvasfactory.mk                                                              |   33 --
 canvas/Library_canvastools.mk                                                                |   33 --
 canvas/Library_directx9canvas.mk                                                             |   33 --
 canvas/Library_gdipluscanvas.mk                                                              |   33 --
 canvas/Library_simplecanvas.mk                                                               |   33 --
 canvas/Library_vclcanvas.mk                                                                  |   33 --
 canvas/Module_canvas.mk                                                                      |   33 --
 cli_ure/version/incversions.txt                                                              |   35 --
 comphelper/source/misc/namedvaluecollection.cxx                                              |   37 --
 configure.ac                                                                                 |   61 ++-
 connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu                     |   43 +-
 connectivity/source/drivers/postgresql/pq_connection.hxx                                     |    2 
 dtrans/Library_dnd.mk                                                                        |   33 --
 dtrans/Library_dtrans.mk                                                                     |   33 --
 dtrans/Library_ftransl.mk                                                                    |   33 --
 dtrans/Library_mcnttype.mk                                                                   |   33 --
 dtrans/Library_sysdtrans.mk                                                                  |   33 --
 dtrans/Module_dtrans.mk                                                                      |   33 --
 dtrans/StaticLibrary_dtobj.mk                                                                |   33 --
 extensions/source/nsplugin/source/npshell.cxx                                                |    1 
 extensions/source/nsplugin/source/ns_debug.hxx                                               |    2 
 extensions/source/plugin/aqua/sysplug.mm                                                     |    3 
 extensions/source/plugin/base/context.cxx                                                    |    1 
 extensions/source/plugin/inc/plugin/impl.hxx                                                 |    2 
 filter/source/xslt/import/wordml/wordml2ooo_page.xsl                                         |   39 --
 icon-themes/industrial/README                                                                |   31 -
 idl/Executable_svidl.mk                                                                      |   33 --
 include/comphelper/namedvaluecollection.hxx                                                  |   37 --
 include/comphelper/oslfile2streamwrap.hxx                                                    |   37 --
 include/default.rc                                                                           |   37 --
 include/postwin.h                                                                            |   37 --
 include/premac.h                                                                             |   43 +-
 include/prewin.h                                                                             |   37 --
 include/version.hrc                                                                          |   43 +-
 include/wntgcci/jni_md.h                                                                     |   31 -
 linguistic/JunitTest_linguistic_complex.mk                                                   |   33 --
 linguistic/JunitTest_linguistic_unoapi.mk                                                    |   33 --
 linguistic/Library_lng.mk                                                                    |   33 --
 mysqlc/source/mysqlc_driver.hxx                                                              |    2 
 mysqlc/source/mysqlc_general.hxx                                                             |    2 
 mythes/mythes-1.2.0-vanilla-th-gen-idx.patch                                                 |   33 --
 nlpsolver/Jar_EvolutionarySolver.mk                                                          |   33 --
 nlpsolver/Jar_nlpsolver.mk                                                                   |   33 --
 nlpsolver/Module_nlpsolver.mk                                                                |   33 --
 o3tl/CppunitTest_o3tl_tests.mk                                                               |   33 --
 o3tl/Module_o3tl.mk                                                                          |   33 --
 psprint_config/Module_psprint_config.mk                                                      |   33 --
 psprint_config/Package_fontunxppds.mk                                                        |   33 --
 psprint_config/Package_fontunxpsprint.mk                                                     |   33 --
 reportdesign/AllLangResTarget_rptui.mk                                                       |   33 --
 reportdesign/JunitTest_reportdesign_complex.mk                                               |   33 --
 rhino/OfficeScriptInfo.java                                                                  |   38 --
 scaddins/AllLangResTarget_analysis.mk                                                        |   33 --
 scaddins/AllLangResTarget_date.mk                                                            |   33 --
 scaddins/AllLangResTarget_pricing.mk                                                         |   33 --
 scaddins/Library_analysis.mk                                                                 |   33 --
 scaddins/Library_date.mk                                                                     |   33 --
 scaddins/Library_pricing.mk                                                                  |   33 --
 scaddins/Module_scaddins.mk                                                                  |   33 --
 sccomp/AllLangResTarget_solver.mk                                                            |   33 --
 sccomp/Library_solver.mk                                                                     |   33 --
 sccomp/Module_sccomp.mk                                                                      |   33 --
 scp2/inc/macros.inc                                                                          |   23 +
 scp2/macros/macro.pl                                                                         |   33 --
 scp2/source/activex/file_activex.scp                                                         |   37 --
 scp2/source/base/file_base.scp                                                               |   37 --
 scp2/source/base/folderitem_base.scp                                                         |   37 --
 scp2/source/base/module_base.scp                                                             |   37 --
 scp2/source/base/registryitem_base.scp                                                       |   37 --
 scp2/source/calc/file_calc.scp                                                               |   51 +--
 scp2/source/calc/folderitem_calc.scp                                                         |   37 --
 scp2/source/calc/folderitem_calc.ulf                                                         |   37 --
 scp2/source/calc/module_calc.scp                                                             |   37 --
 scp2/source/calc/module_calc.ulf                                                             |   37 --
 scp2/source/calc/registryitem_calc.scp                                                       |   37 --
 scp2/source/canvas/cairocanvas.scp                                                           |   37 --
 scp2/source/canvas/canvascommons.scp                                                         |   37 --
 scp2/source/canvas/directxcanvas.scp                                                         |   37 --
 scp2/source/canvas/vclcanvas.scp                                                             |   37 --
 scp2/source/crashrep/file_crashrep.scp                                                       |   37 --
 scp2/source/draw/file_draw.scp                                                               |   37 --
 scp2/source/draw/folderitem_draw.scp                                                         |   37 --
 scp2/source/draw/module_draw.scp                                                             |   37 --
 scp2/source/draw/registryitem_draw.scp                                                       |   37 --
 scp2/source/extensions/directory_extensions.scp                                              |   39 --
 scp2/source/extensions/file_extensions.scp                                                   |   39 --
 scp2/source/extensions/module_extensions.scp                                                 |   39 --
 scp2/source/extensions/module_extensions.ulf                                                 |   39 --
 scp2/source/extensions/module_extensions_sun_templates.scp                                   |   45 +-
 scp2/source/extensions/module_extensions_sun_templates.ulf                                   |   46 +-
 scp2/source/gnome/file_gnome.scp                                                             |   37 --
 scp2/source/gnome/module_gnome.scp                                                           |   37 --
 scp2/source/graphicfilter/file_graphicfilter.scp                                             |   43 +-
 scp2/source/graphicfilter/module_graphicfilter.scp                                           |   43 +-
 scp2/source/impress/file_impress.scp                                                         |   37 --
 scp2/source/impress/folderitem_impress.scp                                                   |   37 --
 scp2/source/impress/module_impress.scp                                                       |   37 --
 scp2/source/impress/module_ogltrans.scp                                                      |   37 --
 scp2/source/impress/registryitem_impress.scp                                                 |   37 --
 scp2/source/kde/module_kde.scp                                                               |   37 --
 scp2/source/math/file_math.scp                                                               |   37 --
 scp2/source/math/folderitem_math.scp                                                         |   37 --
 scp2/source/math/module_math.scp                                                             |   37 --
 scp2/source/math/registryitem_math.scp                                                       |   37 --
 scp2/source/onlineupdate/file_onlineupdate.scp                                               |   37 --
 scp2/source/onlineupdate/module_onlineupdate.scp                                             |   37 --
 scp2/source/ooo/common_brand.scp                                                             |    6 
 scp2/source/ooo/common_brand_readme.scp                                                      |   37 --
 scp2/source/ooo/directory_ooo.scp                                                            |   37 --
 scp2/source/ooo/directory_ooo_macosx.scp                                                     |   37 --
 scp2/source/ooo/file_extra_ooo.scp                                                           |   37 --
 scp2/source/ooo/file_resource_ooo.scp                                                        |   37 --
 scp2/source/ooo/folder_ooo.scp                                                               |   37 --
 scp2/source/ooo/folderitem_ooo.scp                                                           |   37 --
 scp2/source/ooo/folderitem_ooo.ulf                                                           |   37 --
 scp2/source/ooo/installation_ooo.scp                                                         |   37 --
 scp2/source/ooo/module_help_template.scp                                                     |   37 --
 scp2/source/ooo/module_helppack.scp                                                          |   37 --
 scp2/source/ooo/module_helppack.ulf                                                          |   37 --
 scp2/source/ooo/module_hidden_ooo.scp                                                        |   37 --
 scp2/source/ooo/module_lang_template.scp                                                     |   37 --
 scp2/source/ooo/module_langpack.scp                                                          |   37 --
 scp2/source/ooo/module_langpack.ulf                                                          |   37 --
 scp2/source/ooo/module_ooo.scp                                                               |   37 --
 scp2/source/ooo/module_ooo.ulf                                                               |   37 --
 scp2/source/ooo/module_systemint.scp                                                         |   37 --
 scp2/source/ooo/ooo_brand.scp                                                                |   37 --
 scp2/source/ooo/profile_ooo.scp                                                              |   37 --
 scp2/source/ooo/profileitem_ooo.scp                                                          |   37 --
 scp2/source/ooo/registryitem_ooo.scp                                                         |   37 --
 scp2/source/ooo/registryitem_ooo.ulf                                                         |   37 --
 scp2/source/ooo/scpaction_ooo.scp                                                            |   37 --
 scp2/source/ooo/shortcut_ooo.scp                                                             |   37 --
 scp2/source/ooo/ure.scp                                                                      |   38 --
 scp2/source/ooo/ure_into_ooo.scp                                                             |   37 --
 scp2/source/ooo/vc_redist.scp                                                                |   37 --
 scp2/source/ooo/windowscustomaction_ooo.scp                                                  |   37 --
 scp2/source/python/file_python.scp                                                           |   37 --
 scp2/source/python/module_python.scp                                                         |   37 --
 scp2/source/python/profileitem_python.scp                                                    |   37 --
 scp2/source/quickstart/file_quickstart.scp                                                   |   37 --
 scp2/source/quickstart/module_quickstart.scp                                                 |   37 --
 scp2/source/quickstart/registryitem_quickstart.scp                                           |   37 --
 scp2/source/sdkoo/module_sdkoo.scp                                                           |   37 --
 scp2/source/sdkoo/sdkoo.scp                                                                  |   37 --
 scp2/source/supported_extensions.txt                                                         |   17 +
 scp2/source/templates/module_helppack.sct                                                    |   37 --
 scp2/source/templates/module_helppack_root.sct                                               |   37 --
 scp2/source/templates/module_langpack.sct                                                    |   37 --
 scp2/source/templates/module_langpack_accessories_samples.sct                                |   37 --
 scp2/source/templates/module_langpack_accessories_samples_root.sct                           |   37 --
 scp2/source/templates/module_langpack_accessories_templates.sct                              |   37 --
 scp2/source/templates/module_langpack_accessories_templates_root.sct                         |   37 --
 scp2/source/templates/module_langpack_base.sct                                               |   37 --
 scp2/source/templates/module_langpack_calc.sct                                               |   37 --
 scp2/source/templates/module_langpack_draw.sct                                               |   37 --
 scp2/source/templates/module_langpack_extensions_templates.sct                               |   45 +-
 scp2/source/templates/module_langpack_impress.sct                                            |   37 --
 scp2/source/templates/module_langpack_math.sct                                               |   37 --
 scp2/source/templates/module_langpack_root.sct                                               |   37 --
 scp2/source/templates/module_langpack_writer.sct                                             |   37 --
 scp2/source/winexplorerext/file_winexplorerext.scp                                           |   37 --
 scp2/source/winexplorerext/module_winexplorerext.scp                                         |   37 --
 scp2/source/winexplorerext/registryitem_winexplorerext.scp                                   |   37 --
 scp2/source/writer/file_writer.scp                                                           |   37 --
 scp2/source/writer/folderitem_writer.scp                                                     |   37 --
 scp2/source/writer/module_writer.scp                                                         |   37 --
 scp2/source/writer/registryitem_writer.scp                                                   |   37 --
 scp2/source/xsltfilter/file_xsltfilter.scp                                                   |   37 --
 scp2/source/xsltfilter/module_xsltfilter.scp                                                 |   37 --
 scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.html              |   17 +
 scripting/java/org/openoffice/netbeans/modules/office/resources/EmptyParcel.html             |   17 +
 scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.html |   17 +
 scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcel.html            |   17 +
 scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcelDescriptor.html  |   17 +
 scripting/workben/bindings/eventbindings.xml                                                 |   17 +
 scripting/workben/installer/ProtocolHandler.xcu                                              |   17 +
 slideshow/source/engine/shapes/shapeimporter.cxx                                             |   38 --
 solenv/bin/createcomponent.xslt                                                              |   43 +-
 solenv/bin/gen_userfeedback_VCL_names.pl                                                     |   33 --
 solenv/bin/getcompver.awk                                                                    |   33 --
 solenv/bin/getcsym.awk                                                                       |   35 --
 solenv/bin/macosx-change-install-names.pl                                                    |   33 --
 solenv/bin/make_installer.pl                                                                 |   33 --
 solenv/bin/mapgen.pl                                                                         |   33 --
 solenv/bin/modules/RepositoryHelper.pm                                                       |   33 --
 solenv/bin/modules/SourceConfig.pm                                                           |   39 +-
 solenv/bin/modules/SourceConfigHelper.pm                                                     |   33 --
 solenv/bin/modules/installer.pm                                                              |   39 +-
 solenv/bin/modules/installer/archivefiles.pm                                                 |   33 --
 solenv/bin/modules/installer/control.pm                                                      |   33 --
 solenv/bin/modules/installer/converter.pm                                                    |   33 --
 solenv/bin/modules/installer/copyproject.pm                                                  |   33 --
 solenv/bin/modules/installer/download.pm                                                     |   33 --
 solenv/bin/modules/installer/environment.pm                                                  |   33 --
 solenv/bin/modules/installer/exiter.pm                                                       |   33 --
 solenv/bin/modules/installer/files.pm                                                        |   33 --
 solenv/bin/modules/installer/globals.pm                                                      |   35 --
 solenv/bin/modules/installer/helppack.pm                                                     |   35 --
 solenv/bin/modules/installer/languagepack.pm                                                 |   35 --
 solenv/bin/modules/installer/languages.pm                                                    |   33 --
 solenv/bin/modules/installer/logger.pm                                                       |   33 --
 solenv/bin/modules/installer/packagelist.pm                                                  |   33 --
 solenv/bin/modules/installer/parameter.pm                                                    |   33 --
 solenv/bin/modules/installer/pathanalyzer.pm                                                 |   33 --
 solenv/bin/modules/installer/profiles.pm                                                     |   33 --
 solenv/bin/modules/installer/remover.pm                                                      |   33 --
 solenv/bin/modules/installer/scpzipfiles.pm                                                  |   33 --
 solenv/bin/modules/installer/scriptitems.pm                                                  |   37 --
 solenv/bin/modules/installer/setupscript.pm                                                  |   33 --
 solenv/bin/modules/installer/simplepackage.pm                                                |   33 --
 solenv/bin/modules/installer/strip.pm                                                        |   33 --
 solenv/bin/modules/installer/substfilenamefiles.pm                                           |   33 --
 solenv/bin/modules/installer/systemactions.pm                                                |   33 --
 solenv/bin/modules/installer/windows/admin.pm                                                |   33 --
 solenv/bin/modules/installer/windows/component.pm                                            |   33 --
 solenv/bin/modules/installer/windows/createfolder.pm                                         |   33 --
 solenv/bin/modules/installer/windows/directory.pm                                            |  161 +++++-----
 solenv/bin/modules/installer/windows/feature.pm                                              |   33 --
 solenv/bin/modules/installer/windows/featurecomponent.pm                                     |   33 --
 solenv/bin/modules/installer/windows/file.pm                                                 |   54 +--
 solenv/bin/modules/installer/windows/idtglobal.pm                                            |   34 --
 solenv/bin/modules/installer/windows/inifile.pm                                              |   33 --
 solenv/bin/modules/installer/windows/media.pm                                                |   33 --
 solenv/bin/modules/installer/windows/mergemodule.pm                                          |   33 --
 solenv/bin/modules/installer/windows/msiglobal.pm                                            |   51 +--
 solenv/bin/modules/installer/windows/msp.pm                                                  |   33 --
 solenv/bin/modules/installer/windows/property.pm                                             |   33 --
 solenv/bin/modules/installer/windows/registry.pm                                             |   50 +--
 solenv/bin/modules/installer/windows/removefile.pm                                           |   33 --
 solenv/bin/modules/installer/windows/shortcut.pm                                             |   33 --
 solenv/bin/modules/installer/windows/strip.pm                                                |   33 --
 solenv/bin/modules/installer/windows/update.pm                                               |   33 --
 solenv/bin/modules/installer/windows/upgrade.pm                                              |   33 --
 solenv/bin/modules/installer/worker.pm                                                       |   39 --
 solenv/bin/modules/installer/ziplist.pm                                                      |   33 --
 solenv/bin/modules/macosxotoolhelper.pm                                                      |   33 --
 solenv/bin/modules/packager/check.pm                                                         |   33 --
 solenv/bin/modules/packager/work.pm                                                          |   33 --
 solenv/bin/modules/par2script/check.pm                                                       |   33 --
 solenv/bin/modules/par2script/exiter.pm                                                      |   33 --
 solenv/bin/modules/par2script/work.pm                                                        |   33 --
 solenv/bin/modules/pre2par/language.pm                                                       |   33 --
 solenv/bin/modules/pre2par/work.pm                                                           |   33 --
 solenv/bin/packcomponents.xslt                                                               |   43 +-
 solenv/bin/par2script.pl                                                                     |   33 --
 solenv/doc/gbuild/solenv/gbuild/gbuild.mk                                                    |   17 +
 solenv/gbuild/AllLangResTarget.mk                                                            |   33 --
 solenv/gbuild/ComponentTarget.mk                                                             |   33 --
 solenv/gbuild/CppunitTest.mk                                                                 |   33 --
 solenv/gbuild/CustomTarget.mk                                                                |   33 --
 solenv/gbuild/Deliver.mk                                                                     |   33 --
 solenv/gbuild/Executable.mk                                                                  |   33 --
 solenv/gbuild/Helper.mk                                                                      |   33 --
 solenv/gbuild/Jar.mk                                                                         |   33 --
 solenv/gbuild/JavaClassSet.mk                                                                |   33 --
 solenv/gbuild/JunitTest.mk                                                                   |   33 --
 solenv/gbuild/Library.mk                                                                     |   33 --
 solenv/gbuild/LinkTarget.mk                                                                  |   33 --
 solenv/gbuild/Module.mk                                                                      |   33 --
 solenv/gbuild/Output.mk                                                                      |   33 --
 solenv/gbuild/Package.mk                                                                     |   33 --
 solenv/gbuild/PrecompiledHeaders.mk                                                          |   33 --
 solenv/gbuild/SdiTarget.mk                                                                   |   33 --
 solenv/gbuild/StaticLibrary.mk                                                               |   33 --
 solenv/gbuild/TargetLocations.mk                                                             |   33 --
 solenv/gbuild/Tempfile.mk                                                                    |   17 +
 solenv/gbuild/UnoApiTarget.mk                                                                |   33 --
 solenv/gbuild/WinResTarget.mk                                                                |   17 +
 solenv/gbuild/Zip.mk                                                                         |   33 --
 solenv/gbuild/gbuild.mk                                                                      |   34 --
 solenv/gbuild/partial_build.mk                                                               |   21 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk                                                        |   33 --
 solenv/gbuild/platform/WNT_INTEL_GCC.mk                                                      |   33 --
 solenv/gbuild/platform/WNT_INTEL_MSC.mk                                                      |   33 --
 solenv/gbuild/platform/WNT_X86_64_MSC.mk                                                     |   33 --
 solenv/gbuild/platform/com_MSC_class.mk                                                      |   33 --
 solenv/gbuild/platform/com_MSC_defs.mk                                                       |   33 --
 solenv/gbuild/platform/macosx.mk                                                             |   33 --
 solenv/gbuild/platform/solaris.mk                                                            |   33 --
 solenv/gbuild/platform/unxgcc.mk                                                             |   33 --
 solenv/gbuild/templates/Executable.mk                                                        |   33 --
 solenv/gbuild/templates/Library.mk                                                           |   33 --
 solenv/inc/langlist.mk                                                                       |   33 --
 sot/Library_sot.mk                                                                           |   33 --
 sot/Module_sot.mk                                                                            |   33 --
 stoc/test/uriproc/makefile.mk                                                                |   84 -----
 svl/Library_fsstorage.mk                                                                     |   33 --
 svl/Library_passwordcontainer.mk                                                             |   33 --
 svl/Library_svl.mk                                                                           |   33 --
 testtools/com/sun/star/comp/bridge/makefile.mk                                               |   33 --
 testtools/qa/cliversioning/makefile.mk                                                       |   33 --
 toolkit/JunitTest_toolkit_complex.mk                                                         |   33 --
 toolkit/Library_tk.mk                                                                        |   33 --
 udkapi/Module_udkapi.mk                                                                      |   33 --
 udkapi/UnoApi_udkapi.mk                                                                      |   33 --
 vbahelper/Library_msforms.mk                                                                 |   33 --
 vbahelper/Library_vbahelper.mk                                                               |   33 --
 vcl/Library_vcl.mk                                                                           |   33 --
 wizards/AllLangResTarget_dbw.mk                                                              |   33 --
 wizards/AllLangResTarget_eur.mk                                                              |   33 --
 wizards/AllLangResTarget_imp.mk                                                              |   33 --
 wizards/AllLangResTarget_tpl.mk                                                              |   33 --
 wizards/AllLangResTarget_wzi.mk                                                              |   33 --
 wizards/Jar_commonwizards.mk                                                                 |   33 --
 wizards/Jar_form.mk                                                                          |   33 --
 wizards/Jar_query.mk                                                                         |   33 --
 wizards/Jar_report.mk                                                                        |   33 --
 wizards/Jar_reportbuilder.mk                                                                 |   33 --
 wizards/Jar_table.mk                                                                         |   33 --
 wizards/Jar_web.mk                                                                           |  103 ------
 wizards/Module_wizards.mk                                                                    |   33 --
 wizards/Package_depot.mk                                                                     |   33 --
 wizards/Package_euro.mk                                                                      |   33 --
 wizards/Package_form.mk                                                                      |   33 --
 wizards/Package_gimmicks.mk                                                                  |   33 --
 wizards/Package_import.mk                                                                    |   33 --
 wizards/Package_share.mk                                                                     |   33 --
 wizards/Package_standard.mk                                                                  |   33 --
 wizards/Package_template.mk                                                                  |   33 --
 wizards/Package_tools.mk                                                                     |   33 --
 wizards/Package_tutorials.mk                                                                 |   33 --
 wizards/Package_usr.mk                                                                       |   33 --
 writerfilter/CppunitTest_writerfilter_doctok.mk                                              |   35 --
 xmlreader/Library_xmlreader.mk                                                               |   33 --
 xmlreader/Module_xmlreader.mk                                                                |   33 --
 335 files changed, 4408 insertions(+), 7104 deletions(-)

New commits:
commit 1e4422a4b4c443c286c90853f50b739a67ce5d1f
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu May 16 21:56:04 2013 +0100

    re-base on ALv2 code. Includes:
    
            Patches contributed by Mathias Bauer
            gnumake4 work variously
            http://svn.apache.org/viewvc?view=revision&revision=1394707
            http://svn.apache.org/viewvc?view=revision&revision=1394326
            http://svn.apache.org/viewvc?view=revision&revision=1397337
            http://svn.apache.org/viewvc?view=revision&revision=1397315
            http://svn.apache.org/viewvc?view=revision&revision=1396797
    
    	Patches contributed by Andre Fischer
    	Fixed getcsym.awk to handle #-comments that contain special regexp chars.
            http://svn.apache.org/viewvc?view=revision&revision=1230971
    	118778: Added ADDITIONAL_REPOSITORIES environment variable and its
    	automatic setup in configure.
            http://svn.apache.org/viewvc?view=revision&revision=1232004
    	118160: Added external CoinMP library.
            http://svn.apache.org/viewvc?view=revision&revision=1233909
    
    	Patches contributed by Herbert Duerr
    	#i119168# use generic LICENSE file for langpacks and sdks
            http://svn.apache.org/viewvc?view=revision&revision=1310178
    	macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars
            http://svn.apache.org/viewvc?view=revision&revision=1183367
    	allow gbuild with empty sysroot on linux
            http://svn.apache.org/viewvc?view=revision&revision=1179186
    
    	Patches contributed by Ingo Schmidt
    	native373: #164472# improvements for msi database
            http://svn.apache.org/viewvc?view=revision&revision=1167540
            http://svn.apache.org/viewvc?view=revision&revision=1167539
    
    	Patches contributed by Jurgen Schmidt
    	adapt setup package scripts to handle special DS_Store file for
    	developer snapshot builds
            http://svn.apache.org/viewvc?view=revision&revision=1232430
    	imported patch extensions_i117681.patch
    	http://svn.apache.org/viewvc?view=revision&revision=1172102
    
    	Patches contributed by Michael Stahl
    	gbuild: RepositoryFixes.mk should be optional
            http://svn.apache.org/viewvc?view=revision&revision=1166123
    	xslt filter: remove the FLA horror
    	wordml import filter: replace FLA usage with plain XSLT
    	http://svn.apache.org/viewvc?view=revision&revision=1363727
    
    	Patch contributed by Oliver-Rainer Wittmann
    	i#88652: applied patch, remove unicows deps
    	http://svn.apache.org/viewvc?view=revision&revision=1177585
    
        Remove lots of OS2 conditionals, re-extract Rhino Java, unwind
        cppunit pieces, cleanup Mac image bits, remove coin-mp and
        re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand
        MPLv2 subset checking.
    
    Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564

diff --git a/Repository.mk b/Repository.mk
index 2b4a3de..083ebac 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2009 by Sun Microsystems, Inc.
+# 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Helper_register_executables,NONE, \
     HelpIndexer \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 03b1fa6..5786836 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2009 by Sun Microsystems, Inc.
+# 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.
-#
-#*************************************************************************
 
 # this file describes all the external libraries
 # depending on the configure options these may be taken from the system,
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 78ed710..4a0f99c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 # fixes for all the libraries that are named with too much creativity and do
 # not follow any of the established nameschemes
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index d0eb763..4cfca54 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,animcore))
 
diff --git a/animations/Module_animations.mk b/animations/Module_animations.mk
index 34680af..73b262c 100644
--- a/animations/Module_animations.mk
+++ b/animations/Module_animations.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Module_Module,animations))
 
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index 7e31c94..ba1a4e1 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,basctl))
 
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index c008ad6..cff14f7 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,basctl))
 
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index d87463e..0a205b3 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Module_Module,basctl))
 
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index dcabb51..45c4824 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,cairocanvas))
 
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index e10fa92..dec3175 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,canvasfactory))
 
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 7dccf3a..4437e3b 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,canvastools))
 
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index f3cea09..b6ee702 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,directx9canvas))
 
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 857bfa1..3855061 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,gdipluscanvas))
 
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 223a215..9de4688 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,simplecanvas))
 
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index e7e4b36..7789b758 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,vclcanvas))
 
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 59acf96..0bc364e 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Module_Module,canvas))
 
diff --git a/cli_ure/version/incversions.txt b/cli_ure/version/incversions.txt
index 6d7e18e..bfd3c81 100644
--- a/cli_ure/version/incversions.txt
+++ b/cli_ure/version/incversions.txt
@@ -1,36 +1,27 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 CLI_URETYPES_NEW_VERSION
 CLI_URETYPES_OLD_VERSION
 CLI_URETYPES_POLICY_VERSION
 
 CLI_URE_NEW_VERSION
-CLI_URE_OLD_VERSION    
+CLI_URE_OLD_VERSION
 CLI_URE_POLICY_VERSION
 
 CLI_CPPUHELPER_NEW_VERSION
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index c0d3d03..bf47f9a 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.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 <comphelper/namedvaluecollection.hxx>
 
diff --git a/configure.ac b/configure.ac
index 6bf8c1f..b55b68b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6925,28 +6925,6 @@ if test "$enable_lotuswordpro" = "yes"; then
 fi
 AC_SUBST(ENABLE_LWP)
 
-AC_MSG_CHECKING([MPL subset])
-MPL_SUBSET=
-
-if test "$enable_mpl_subset" = "yes"; then
-   if test "x$enable_postgresql_sdbc" != "xno"; then
-        AC_MSG_ERROR([need to --disable-postgresql-sdbc - the postgress database backend.])
-   fi
-   if test "$enable_lotuswordpro" = "yes"; then
-        AC_MSG_ERROR([need to --disable-lotuswordpro - a Lotus Word Pro file format import filter.])
-   fi
-   if test "$enable_neon" != "no"; then
-        AC_MSG_ERROR([need to --disable-neon - webdav support.])
-   fi
-
-   MPL_SUBSET="TRUE"
-   AC_DEFINE(MPL_HAVE_SUBSET)
-   AC_MSG_RESULT([only])
-else
-   AC_MSG_RESULT([no restrictions])
-fi
-AC_SUBST(MPL_SUBSET)
-
 dnl ===================================================================
 dnl Check for gperf
 dnl ===================================================================
@@ -8403,7 +8381,7 @@ dnl ===================================================================
 dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents
 dnl ===================================================================
 AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
-# Obviously no such thing on iOS or Android. Also not possible when building 
+# Obviously no such thing on iOS or Android. Also not possible when building
 # 64-bit OS X code as the plugin code uses QuickTime and Carbon.
 if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o "$BITNESS_OVERRIDE" = "" \) -a \
         "$enable_headless" != yes
@@ -11713,6 +11691,43 @@ fi
 AC_SUBST(ICECREAM_RUN)
 
 dnl ===================================================================
+
+AC_MSG_CHECKING([MPL subset])
+MPL_SUBSET=
+
+if test "$enable_mpl_subset" = "yes"; then
+   if test "x$enable_postgresql_sdbc" != "xno"; then
+        AC_MSG_ERROR([need to --disable-postgresql-sdbc - the postgress database backend.])
+   fi
+   if test "$enable_lotuswordpro" = "yes"; then
+        AC_MSG_ERROR([need to --disable-lotuswordpro - a Lotus Word Pro file format import filter.])
+   fi
+   if test "$enable_neon" != "no"; then
+        AC_MSG_ERROR([need to --disable-neon - webdav support.])
+   fi
+   if test "x$enable_ext_mariadb_connector" = "xyes"; then
+        AC_MSG_ERROR([need to --disable-ext-mariadb-connector - mariadb/mysql support.])
+   fi
+   if test "x$ENABLE_PDFIMPORT" != "xFALSE"; then
+        if test "x$SYSTEM_POPPLER" != "xNO"; then
+                AC_MSG_ERROR([need to disable PDF import via xpdf/poplar or use system library])
+        fi
+   fi
+   # cf. m4/libo_check_extension.m4
+   if test "x$WITH_EXTRA_EXTENSIONS" != "x"; then
+        AC_MSG_ERROR([need to disable extra extensions '$WITH_EXTRA_EXTENSIONS'])
+   fi
+
+   MPL_SUBSET="TRUE"
+   AC_DEFINE(MPL_HAVE_SUBSET)
+   AC_MSG_RESULT([only])
+else
+   AC_MSG_RESULT([no restrictions])
+fi
+AC_SUBST(MPL_SUBSET)
+
+
+dnl ===================================================================
 dnl Setting up the environment.
 dnl ===================================================================
 echo "setting up the build environment variables..."
diff --git a/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
index 6e7907a..8ef6943 100644
--- a/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -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 .
+-->
 <oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <node oor:name="Installed" install:module="tdeab">
     <node oor:name="sdbc:address:tdeab" oor:op="replace">
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 588cfcb..b6de797 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -36,6 +36,8 @@
 
 #ifndef _PQ_CONNECTION_HXX_
 #define _PQ_CONNECTION_HXX_
+
+#include <config_lgpl.h>
 #include <boost/unordered_map.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 05ed37e..01fd32c 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,dnd))
 
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index 43b2d3c..03620e5 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,dtrans))
 
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index 8e062bf..b7b735d 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,ftransl))
 
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index efb5011..8ed23c3 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,mcnttype))
 
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 8d456ae..5ba93cc 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Library_Library,sysdtrans))
 
diff --git a/dtrans/Module_dtrans.mk b/dtrans/Module_dtrans.mk
index c9524da..2ddc6f4 100644
--- a/dtrans/Module_dtrans.mk
+++ b/dtrans/Module_dtrans.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_Module_Module,dtrans))
 
diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
index 0200799..3553ae8 100644
--- a/dtrans/StaticLibrary_dtobj.mk
+++ b/dtrans/StaticLibrary_dtobj.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj))
 
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index f6ed3b5..f9d39f6 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-
 #ifdef UNIX
 
 #define XP_UNIX 1
diff --git a/extensions/source/nsplugin/source/ns_debug.hxx b/extensions/source/nsplugin/source/ns_debug.hxx
index 83dc5a6..38c9a2a 100644
--- a/extensions/source/nsplugin/source/ns_debug.hxx
+++ b/extensions/source/nsplugin/source/ns_debug.hxx
@@ -37,6 +37,8 @@
 
 #define debug_fprintf  NSP_WriteLog
 
+#include <config_lgpl.h>
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm
index 4b3363e..371ad7d 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -25,6 +25,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
+#include <config_lgpl.h>
+
 #include <cstdarg>
 
 #include <sys/types.h>
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 2dbc83b..eae1956 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-
 #ifdef AIX
 #define _LINUX_SOURCE_COMPAT
 #include <sys/timer.h>
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index 54c414c..df48176 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -28,6 +28,8 @@
 #ifndef PLUGIN_SOURCE_MGR_IMPL_HXX
 #define PLUGIN_SOURCE_MGR_IMPL_HXX
 
+#include <config_lgpl.h>
+
 #ifdef SOLARIS
 #include <limits>
 #endif
diff --git a/filter/source/xslt/import/wordml/wordml2ooo_page.xsl b/filter/source/xslt/import/wordml/wordml2ooo_page.xsl
index 5350b61..eb7f1ca 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_page.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_page.xsl
@@ -1,29 +1,20 @@
 <?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 .
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:dat
 astyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" exclude-result-prefixes="w wx aml o dt  v">
     <xsl:template match="w:footnotePr" mode="config">
diff --git a/icon-themes/industrial/README b/icon-themes/industrial/README
index de09754..8201d56 100644
--- a/icon-themes/industrial/README
+++ b/icon-themes/industrial/README
@@ -1,33 +1,12 @@
 This is the Industrial Icon set
 	Copyright 2002-2004 Novell, Inc.
-	Copyright 2004, Sun Microsystems, Inc. [ JCA ]
 
 It was drawn by the heroic effort of:
 	Jakub Steiner    <jimmac at novell.com>
 	Tuomas Kuosmanen <tigert at novell.com>
 
-  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 artwork is available under the terms of the LGPL, 
-and is covered by Novell's JCA.
+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/.
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 5c69651..b2b3ecd 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_Executable_Executable,svidl))
 
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index 26b2760..855e9e6 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.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 COMPHELPER_NAMEDVALUECOLLECTION_HXX
 #define COMPHELPER_NAMEDVALUECOLLECTION_HXX
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index f43297b..cdee288 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.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 _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
 #define _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
 
diff --git a/include/default.rc b/include/default.rc
index 2176bbf..9ad89a4 100644
--- a/include/default.rc
+++ b/include/default.rc
@@ -1,29 +1,20 @@
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * 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.
- *
- * 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 <windows.h>
 #include "version.hrc"
diff --git a/include/postwin.h b/include/postwin.h
index 1ec0943..71b85ea 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -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 .
+ */
 
 /* nicht geschuetz, muss als gegenstueck zu prewin.h includet werden */
 
diff --git a/include/premac.h b/include/premac.h
index f6e3747..3f3f9b2 100644
--- a/include/premac.h
+++ b/include/premac.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 .
+ */
 
 #define Button MacOSButton
 #define Byte MacOSByte
diff --git a/include/prewin.h b/include/prewin.h
index 837dfa0..e98b901 100644
--- a/include/prewin.h
+++ b/include/prewin.h
@@ -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 .
+ */
 
 /* nicht geschuetzt, darf nur einmal includet werden */
 
diff --git a/include/version.hrc b/include/version.hrc
index 305dc47..787e7ca 100644
--- a/include/version.hrc
+++ b/include/version.hrc
@@ -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 <config_version.h>
 
diff --git a/include/wntgcci/jni_md.h b/include/wntgcci/jni_md.h
index b7aab25..e77438d 100644
--- a/include/wntgcci/jni_md.h
+++ b/include/wntgcci/jni_md.h
@@ -1,27 +1,20 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * 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.
- *
- * 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 .
  */
 
 /* Fake jni_md.h for use when cross-compiling to Windows */
diff --git a/linguistic/JunitTest_linguistic_complex.mk b/linguistic/JunitTest_linguistic_complex.mk
index 0e15522..26c425c 100644
--- a/linguistic/JunitTest_linguistic_complex.mk
+++ b/linguistic/JunitTest_linguistic_complex.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_JunitTest_JunitTest,linguistic_complex))
 
diff --git a/linguistic/JunitTest_linguistic_unoapi.mk b/linguistic/JunitTest_linguistic_unoapi.mk
index 2d89af1..6047d75 100644
--- a/linguistic/JunitTest_linguistic_unoapi.mk
+++ b/linguistic/JunitTest_linguistic_unoapi.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 $(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi))
 
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 537d1c8..e3cba90 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -1,30 +1,21 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# This file is part of the LibreOffice project.
 #
-# Copyright 2000, 2011 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

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list