[Libreoffice-commits] core.git: avmedia/AllLangResTarget_avmedia.mk avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediawin.mk avmedia/Module_avmedia.mk basctl/source basegfx/qa basegfx/source basic/qa bean/Jar_officebean.mk bean/JunitTest_bean_complex.mk bean/Library_officebean.mk bean/Module_bean.mk binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk binaryurp/Module_binaryurp.mk bin/doubleNewlines.pl bin/fuzzfiles bin/java-set-classpath.in bin/unpack-sources bluez_bluetooth/Module_bluez_bluetooth.mk bluez_bluetooth/Package_inc.mk codemaker/Executable_cppumaker.mk codemaker/Module_codemaker.mk codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk configmgr/Library_configmgr.mk connectivity/AllLangResTarget_cnr.mk connectivity/Jar_ConnectivityTools.mk connectivity/Jar_sdbc_hsqldb.mk connectivity/Library_ado.mk connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_dbpool2.mk connectivity/Library_dbtools.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_jdbc.mk connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk connectivity/Library_macab1.mk connectivity/Library_macabdrv1.mk connectivity/Library_mysql.mk connectivity/Library_odbcbase.mk connectivity/Library_odbc.mk connectivity/Library_sdbc2.mk connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk connectivity/Module_connectivity.mk connectivity/registry connectivity/source cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_qa_recursion.mk cppu/CppunitTest_cppu_qa_reference.mk cppu/CppunitTest_cppu_qa_unotype.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk cppuhelper/ CppunitTest_cppuhelper_qa_weak.mk cppuhelper/Library_cppuhelper.mk cppuhelper/Module_cppuhelper.mk cppuhelper/Package_unorc.mk cppu/Library_affine_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno.mk cppu/Module_cppu.mk cpputools/Executable_sp2bv.mk cpputools/Executable_uno.mk cpputools/Module_cpputools.mk cui/source desktop/unx drawinglayer/source editeng/qa embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embeddedobj/Module_embeddedobj.mk embedserv/Library_emser.mk embedserv/Library_inprocserv.mk embedserv/Module_embedserv.mk eventattacher/Library_evtatt.mk eventattacher/Module_eventattacher.mk extensions/AllLangResTarget_abp.mk extensions/AllLangResTarget_bib.mk extensions/AllLangResTarget_dbp.mk extensions/Configuration_updchk.mk extensions/CppunitTest_extensions_test_update.mk extensions/Executable_nsplugin.mk extensions/Executable_pluginapp.bin.mk extensions/Library_abp.mk extensions/Library_bib.mk e xtensions/Library_dbp.mk extensions/Library_ldapbe2.mk extensions/Library_log.mk extensions/Library_npsoplugin.mk extensions/Library_oleautobridge.mk extensions/Library_OOoSpotlightImporter.mk extensions/Library_pl.mk extensions/Library_res.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Library_updchk.mk extensions/Module_extensions.mk extensions/qa extensions/WinResTarget_activex.mk extensions/WinResTarget_npsoplugin.mk extensions/Zip_mdibundle.mk external/wine filter/Executable_svg2odf.mk filter/source fpicker/AllLangResTarget_fps_office.mk fpicker/Library_fpicker.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/Library_fps_office.mk fpicker/Module_fpicker.mk helpcompiler/Executable_helpindexer.mk helpcompiler/Executable_helplinker.mk helpcompiler/inc helpcompiler/Library_helplinker.mk helpcompiler/source i18nlangtag/Library_i18nlangtag.mk i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/CppunitTest_i18npool_tes t_characterclassification.mk i18npool/CustomTarget_breakiterator.mk i18npool/CustomTarget_collator.mk i18npool/CustomTarget_indexentry.mk i18npool/CustomTarget_localedata.mk i18npool/CustomTarget_textconversion.mk i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_saxparser.mk i18npool/Library_collator_data.mk i18npool/Library_dict_ja.mk i18npool/Library_dict_zh.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Library_index_data.mk i18npool/Library_localedata_en.mk i18npool/Library_localedata_es.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/Library_textconv_dict.mk i18npool/Module_i18npool.mk i18npool/source idlc/Executable_idlc.mk include/basegfx include/drawinglayer include/editeng include/filter include/oox include/sal include/sax include/sfx2 include/svtools include/svx include/test include/tubes inclu de/xmloff l10ntools/Executable_cfgex.mk l10ntools/Executable_helpex.mk l10ntools/Executable_localize.mk l10ntools/Executable_transex3.mk l10ntools/Executable_ulfex.mk l10ntools/Executable_xrmex.mk l10ntools/Module_l10ntools.mk l10ntools/source l10ntools/StaticLibrary_transex.mk Library_merged.mk lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk lingucomponent/Module_lingucomponent.mk lingucomponent/Package_config.mk lingucomponent/StaticLibrary_ulingu.mk lotuswordpro/source Makefile.in MathMLDTD/Module_MathMLDTD.mk MathMLDTD/Package_bin.mk Mesa/Module_Mesa.mk Mesa/Package_inc.mk nlpsolver/Extension_nlpsolver.mk nlpsolver/src np_sdk/Module_np_sdk.mk np_sdk/Package_inc.mk np_sdk/Package_npapi.mk np_sdk/StaticLibrary_nputils.mk odk/CppunitTest_checkapi.mk odk/CustomTarget_allheaders.mk odk/examples odk/pack offapi/com officecfg/CppunitTest_officecfg_cppheader_ test.mk officecfg/CustomTarget_registry.mk officecfg/Package_cppheader.mk officecfg/registry oovbaapi/ooo oox/source package/Library_package2.mk package/Library_xstor.mk package/Module_package.mk package/Package_dtd.mk postprocess/CustomTarget_images.mk postprocess/Package_images.mk python3/CustomTarget_PythonFramework.mk python3/Zip_PythonFramework.mk pyuno/CustomTarget_python_bin.mk pyuno/CustomTarget_python_shell.mk pyuno/CustomTarget_zipcore.mk pyuno/Executable_python_wrapper.mk pyuno/Library_pythonloader.mk pyuno/Library_pyuno.mk pyuno/Library_pyuno_wrapper.mk pyuno/Module_pyuno.mk pyuno/Package_python_bin.mk pyuno/Package_python_scripts.mk pyuno/Package_python_shell.mk pyuno/Package_pyunorc.mk pyuno/Package_zipcore.mk qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/Jar_OOoRunner.mk registry/Executable_regcompare.mk registry/Executable_regmerge.mk registry/Executable_regview.mk registry/Library_reg.mk registry/Module_registry.mk registry/StaticLibrary_registry_helper.mk rsc/Exe cutable_rsc.mk rsc/Module_rsc.mk sal/CppunitTest_Module_DLL.mk sal/CppunitTest_sal_bytesequence.mk sal/CppunitTest_sal_osl_condition.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk sal/CppunitTest_sal_osl_module.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitTest_sal_osl_process.mk sal/CppunitTest_sal_osl_security.mk sal/CppunitTest_sal_osl_thread.mk sal/CppunitTest_sal_rtl_alloc.mk sal/CppunitTest_sal_rtl_cipher.mk sal/CppunitTest_sal_rtl_crc32.mk sal/CppunitTest_sal_rtl_doublelock.mk sal/CppunitTest_sal_rtl_locale.mk sal/CppunitTest_sal_rtl_ostringbuffer.mk sal/CppunitTest_sal_rtl_oustringbuffer.mk sal/CppunitTest_sal_rtl_strings.mk sal/CppunitTest_sal_tcwf.mk sal/CppunitTest_sal_types.mk sal/Executable_cppunittester.mk sal/Executable_osl_process_child.mk salhelper/Library_salhelper.mk salhelper/Module_salhelper.mk sal/Library_lo-bootstrap.mk sal/Library_sal.mk sal/Library_sal_textenc.mk sal/Library_uwinapi.mk sal/osl sal/Stat icLibrary_salcpprt.mk sane/Module_sane.mk sane/Package_inc.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_outlineobj.mk sc/inc scp2/source sc/qa scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.mk scripting/Jar_ScriptProviderForBeanShell.mk scripting/Jar_ScriptProviderForJava.mk scripting/Jar_ScriptProviderForJavaScript.mk scripting/Library_basprov.mk scripting/Library_dlgprov.mk scripting/Library_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk scripting/Library_vbaevents.mk scripting/Module_scripting.mk scripting/Package_scriptbindinglib.mk scripting/Package_ScriptsBeanShell.mk scripting/Package_ScriptsJavaScript.mk scripting/Package_ScriptsPython.mk scripting/Pyuno_mailmerge.mk scripting/source scripting/Zip_ScriptsJava.mk sc/source sfx2/inc sfx2/source shell/source smoketest/CppunitTest_smoketest.mk smoketest/Jar_TestExtensi on.mk smoketest/Library_smoketest.mk smoketest/lodownloadtest.py smoketest/losmoketest smoketest/Module_smoketest.mk smoketest/Package_losmoketest.mk smoketest/Zip_smoketestdoc.mk solenv/gbuild solenv/gdb starmath/inc starmath/qa starmath/source store/Library_store.mk store/Module_store.mk svl/CppunitTest_svl_lngmisc.mk svl/CppunitTest_svl_urihelper.mk svl/qa svtools/source svx/source swext/Configuration_mediawiki.mk swext/Extension_wiki-publisher.mk swext/Jar_mediawiki.mk swext/Module_swext.mk sw/qa sw/source test/source testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_uno_test.mk testtools/InternalUnoApi_bridgetest.mk testtools/Jar_testComponent.mk testtools/Library_bridgetest.mk testtools/Library_constructors.mk testtools/Library_cppobj.mk testtools/Module_testtools.mk testtools/Rdb_uno_services.mk testtools/StaticLibrary_bridgetest.mk test/user-template tools/qa touch/ CustomTarget_touch_javamaker.mk touch/idl touch/InternalUnoApi_touch.mk touch/Library_libotouch.mk touch/Module_touch.mk touch/source tubes/Executable_liboapprover.mk tubes/source twain/Module_twain.mk twain/Package_inc.mk ucb/Library_cached1.mk ucb/Library_srtrs1.mk ucb/Library_ucb1.mk ucb/Library_ucpcmis1.mk ucb/Library_ucpdav1.mk ucb/Library_ucpexpand1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucpftp1.mk ucb/Library_ucpgio1.mk ucb/Library_ucpgvfs1.mk ucb/Library_ucphier1.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk ucb/source unixODBC/Module_unixODBC.mk unixODBC/Package_inc.mk unodevtools/Executable_skeletonmaker.mk unodevtools/Module_unodevtools.mk unodevtools/source unotest/Jar_test.mk unotest/Jar_test-tools.mk unotest/Library_unobootstrapprotector.mk unotest/Library_unoexceptionprotector.mk unotest/Library_unotest.mk unotest/Module_unotest.mk uui/AllLangResTarget_uui.mk uui/Library_uui.mk uui/Module_uui.mk vcl/Executable_kdefilepicker.mk vcl/Exe cutable_tdefilepicker.mk vcl/headless vcl/source vcl/StaticLibrary_headless.mk xmerge/Jar_XMergeBridge.mk xmerge/Jar_xmerge.mk xmerge/Module_xmerge.mk xmloff/source xmlsecurity/AllLangResTarget_xsec.mk xmlsecurity/CppunitTest_qa_certext.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/Module_xmlsecurity.mk

Michael Meeks michael.meeks at suse.com
Tue Apr 30 05:33:30 PDT 2013


 Library_merged.mk                                                             |   21 ---
 Makefile.in                                                                   |    2 
 MathMLDTD/Module_MathMLDTD.mk                                                 |   27 ----
 MathMLDTD/Package_bin.mk                                                      |   27 ----
 Mesa/Module_Mesa.mk                                                           |   25 ---
 Mesa/Package_inc.mk                                                           |   28 ----
 avmedia/AllLangResTarget_avmedia.mk                                           |   27 ----
 avmedia/Library_avmedia.mk                                                    |   27 ----
 avmedia/Library_avmediaQuickTime.mk                                           |   27 ----
 avmedia/Library_avmediagst.mk                                                 |   27 ----
 avmedia/Library_avmediagst_0_10.mk                                            |   27 ----
 avmedia/Library_avmediawin.mk                                                 |   27 ----
 avmedia/Module_avmedia.mk                                                     |   27 ----
 basctl/source/basicide/linenumberwindow.cxx                                   |   30 +---
 basctl/source/basicide/linenumberwindow.hxx                                   |   31 +---
 basegfx/qa/mkpolygons.pl                                                      |    3 
 basegfx/source/tools/zoomtools.cxx                                            |   27 ----
 basic/qa/cppunit/basictest.hxx                                                |    2 
 basic/qa/cppunit/test_nested_struct.cxx                                       |    2 
 basic/qa/cppunit/test_vba.cxx                                                 |    2 
 bean/Jar_officebean.mk                                                        |   27 ----
 bean/JunitTest_bean_complex.mk                                                |   27 ----
 bean/Library_officebean.mk                                                    |   27 ----
 bean/Module_bean.mk                                                           |   27 ----
 bin/doubleNewlines.pl                                                         |   63 ----------
 bin/fuzzfiles                                                                 |   26 ----
 bin/java-set-classpath.in                                                     |   29 +---
 bin/unpack-sources                                                            |   29 ----
 binaryurp/CppunitTest_binaryurp_test-cache.mk                                 |   27 ----
 binaryurp/CppunitTest_binaryurp_test-unmarshal.mk                             |   27 ----
 binaryurp/Library_binaryurp.mk                                                |   27 ----
 binaryurp/Module_binaryurp.mk                                                 |   27 ----
 bluez_bluetooth/Module_bluez_bluetooth.mk                                     |   27 ----
 bluez_bluetooth/Package_inc.mk                                                |   32 -----
 codemaker/Executable_cppumaker.mk                                             |   25 ---
 codemaker/Module_codemaker.mk                                                 |   25 ---
 codemaker/StaticLibrary_codemaker.mk                                          |   25 ---
 codemaker/StaticLibrary_codemaker_cpp.mk                                      |   25 ---
 codemaker/StaticLibrary_codemaker_java.mk                                     |   25 ---
 configmgr/Library_configmgr.mk                                                |   34 +----
 connectivity/AllLangResTarget_cnr.mk                                          |   25 ---
 connectivity/Jar_ConnectivityTools.mk                                         |   25 ---
 connectivity/Jar_sdbc_hsqldb.mk                                               |   25 ---
 connectivity/Library_ado.mk                                                   |   25 ---
 connectivity/Library_calc.mk                                                  |   25 ---
 connectivity/Library_dbase.mk                                                 |   25 ---
 connectivity/Library_dbpool2.mk                                               |   25 ---
 connectivity/Library_dbtools.mk                                               |   25 ---
 connectivity/Library_evoab.mk                                                 |   25 ---
 connectivity/Library_file.mk                                                  |   25 ---
 connectivity/Library_flat.mk                                                  |   25 ---
 connectivity/Library_jdbc.mk                                                  |   25 ---
 connectivity/Library_kab1.mk                                                  |   25 ---
 connectivity/Library_kabdrv1.mk                                               |   25 ---
 connectivity/Library_macab1.mk                                                |   25 ---
 connectivity/Library_macabdrv1.mk                                             |   25 ---
 connectivity/Library_mysql.mk                                                 |   25 ---
 connectivity/Library_odbc.mk                                                  |   25 ---
 connectivity/Library_odbcbase.mk                                              |   25 ---
 connectivity/Library_sdbc2.mk                                                 |   25 ---
 connectivity/Library_tdeab1.mk                                                |   25 ---
 connectivity/Library_tdeabdrv1.mk                                             |   25 ---
 connectivity/Module_connectivity.mk                                           |   25 ---
 connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu |   27 ----
 connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component         |   27 ----
 connectivity/source/drivers/postgresql/postgresql-sdbc.component              |   27 ----
 connectivity/source/drivers/postgresql/pq_allocator.hxx                       |   27 ----
 connectivity/source/drivers/postgresql/pq_array.cxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_array.hxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_baseresultset.cxx                   |   27 ----
 connectivity/source/drivers/postgresql/pq_baseresultset.hxx                   |   27 ----
 connectivity/source/drivers/postgresql/pq_connection.cxx                      |   26 ----
 connectivity/source/drivers/postgresql/pq_connection.hxx                      |   26 ----
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx                |   26 ----
 connectivity/source/drivers/postgresql/pq_databasemetadata.hxx                |   26 ----
 connectivity/source/drivers/postgresql/pq_driver.cxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_driver.hxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx        |   27 ----
 connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx        |   27 ----
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx               |   27 ----
 connectivity/source/drivers/postgresql/pq_preparedstatement.hxx               |   27 ----
 connectivity/source/drivers/postgresql/pq_resultset.cxx                       |   27 ----
 connectivity/source/drivers/postgresql/pq_resultset.hxx                       |   27 ----
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx               |   27 ----
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx               |   27 ----
 connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx               |   27 ----
 connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx               |   27 ----
 connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx       |   27 ----
 connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx       |   27 ----
 connectivity/source/drivers/postgresql/pq_statement.cxx                       |   27 ----
 connectivity/source/drivers/postgresql/pq_statement.hxx                       |   27 ----
 connectivity/source/drivers/postgresql/pq_statics.cxx                         |   27 ----
 connectivity/source/drivers/postgresql/pq_statics.hxx                         |   27 ----
 connectivity/source/drivers/postgresql/pq_tools.cxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_tools.hxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_updateableresultset.cxx             |   27 ----
 connectivity/source/drivers/postgresql/pq_updateableresultset.hxx             |   27 ----
 connectivity/source/drivers/postgresql/pq_xbase.cxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xbase.hxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xcolumn.cxx                         |   27 ----
 connectivity/source/drivers/postgresql/pq_xcolumn.hxx                         |   27 ----
 connectivity/source/drivers/postgresql/pq_xcolumns.cxx                        |   27 ----
 connectivity/source/drivers/postgresql/pq_xcolumns.hxx                        |   27 ----
 connectivity/source/drivers/postgresql/pq_xcontainer.cxx                      |   27 ----
 connectivity/source/drivers/postgresql/pq_xcontainer.hxx                      |   27 ----
 connectivity/source/drivers/postgresql/pq_xindex.cxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_xindex.hxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx                    |   27 ----
 connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx                    |   27 ----
 connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx                   |   27 ----
 connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx                   |   27 ----
 connectivity/source/drivers/postgresql/pq_xindexes.cxx                        |   27 ----
 connectivity/source/drivers/postgresql/pq_xindexes.hxx                        |   27 ----
 connectivity/source/drivers/postgresql/pq_xkey.cxx                            |   27 ----
 connectivity/source/drivers/postgresql/pq_xkey.hxx                            |   27 ----
 connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx                      |   27 ----
 connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx                      |   27 ----
 connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx                     |   27 ----
 connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx                     |   27 ----
 connectivity/source/drivers/postgresql/pq_xkeys.cxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xkeys.hxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xtable.cxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_xtable.hxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_xtables.cxx                         |   27 ----
 connectivity/source/drivers/postgresql/pq_xtables.hxx                         |   27 ----
 connectivity/source/drivers/postgresql/pq_xuser.cxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xuser.hxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xusers.cxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_xusers.hxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_xview.cxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xview.hxx                           |   27 ----
 connectivity/source/drivers/postgresql/pq_xviews.cxx                          |   27 ----
 connectivity/source/drivers/postgresql/pq_xviews.hxx                          |   27 ----
 connectivity/source/inc/parse/sqlbison_exports.hxx                            |    2 
 cppu/CppunitTest_cppu_qa_any.mk                                               |   25 ---
 cppu/CppunitTest_cppu_qa_recursion.mk                                         |   25 ---
 cppu/CppunitTest_cppu_qa_reference.mk                                         |   25 ---
 cppu/CppunitTest_cppu_qa_unotype.mk                                           |   25 ---
 cppu/CppunitTest_cppu_test_cppumaker.mk                                       |   25 ---
 cppu/Library_affine_uno.mk                                                    |   25 ---
 cppu/Library_cppu.mk                                                          |   25 ---
 cppu/Library_log_uno.mk                                                       |   25 ---
 cppu/Library_purpenvhelper.mk                                                 |   25 ---
 cppu/Library_unsafe_uno.mk                                                    |   25 ---
 cppu/Module_cppu.mk                                                           |   25 ---
 cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk                         |   25 ---
 cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk                              |   25 ---
 cppuhelper/CppunitTest_cppuhelper_qa_weak.mk                                  |   25 ---
 cppuhelper/Library_cppuhelper.mk                                              |   25 ---
 cppuhelper/Module_cppuhelper.mk                                               |   25 ---
 cppuhelper/Package_unorc.mk                                                   |   25 ---
 cpputools/Executable_sp2bv.mk                                                 |   25 ---
 cpputools/Executable_uno.mk                                                   |   25 ---
 cpputools/Module_cpputools.mk                                                 |   25 ---
 cui/source/uno/services.cxx                                                   |   43 ++----
 desktop/unx/source/splashx.c                                                  |   27 ----
 desktop/unx/source/splashx.h                                                  |   27 ----
 desktop/unx/source/start.c                                                    |   27 ----
 desktop/unx/splash/unxsplash.hxx                                              |   27 ----
 drawinglayer/source/dumper/EnhancedShapeDumper.cxx                            |   27 ----
 drawinglayer/source/dumper/EnhancedShapeDumper.hxx                            |   27 ----
 drawinglayer/source/dumper/XShapeDumper.cxx                                   |   27 ----
 editeng/qa/items/borderline_test.cxx                                          |   28 ----
 embeddedobj/Library_embobj.mk                                                 |   25 ---
 embeddedobj/Library_emboleobj.mk                                              |   25 ---
 embeddedobj/Module_embeddedobj.mk                                             |   25 ---
 embedserv/Library_emser.mk                                                    |   25 ---
 embedserv/Library_inprocserv.mk                                               |   25 ---
 embedserv/Module_embedserv.mk                                                 |   25 ---
 eventattacher/Library_evtatt.mk                                               |   27 ----
 eventattacher/Module_eventattacher.mk                                         |   27 ----
 extensions/AllLangResTarget_abp.mk                                            |   27 ----
 extensions/AllLangResTarget_bib.mk                                            |   27 ----
 extensions/AllLangResTarget_dbp.mk                                            |   27 ----
 extensions/Configuration_updchk.mk                                            |   25 ---
 extensions/CppunitTest_extensions_test_update.mk                              |   25 ---
 extensions/Executable_nsplugin.mk                                             |   27 ----
 extensions/Executable_pluginapp.bin.mk                                        |   27 ----
 extensions/Library_OOoSpotlightImporter.mk                                    |   27 ----
 extensions/Library_abp.mk                                                     |   27 ----
 extensions/Library_bib.mk                                                     |   27 ----
 extensions/Library_dbp.mk                                                     |   27 ----
 extensions/Library_ldapbe2.mk                                                 |   27 ----
 extensions/Library_log.mk                                                     |   27 ----
 extensions/Library_npsoplugin.mk                                              |   27 ----
 extensions/Library_oleautobridge.mk                                           |   26 ----
 extensions/Library_pl.mk                                                      |   27 ----
 extensions/Library_res.mk                                                     |   27 ----
 extensions/Library_so_activex.mk                                              |   27 ----
 extensions/Library_so_activex_x64.mk                                          |   27 ----
 extensions/Library_updchk.mk                                                  |   26 ----
 extensions/Module_extensions.mk                                               |   26 ----
 extensions/WinResTarget_activex.mk                                            |   27 ----
 extensions/WinResTarget_npsoplugin.mk                                         |   27 ----
 extensions/Zip_mdibundle.mk                                                   |   27 ----
 extensions/qa/update/test_update.cxx                                          |   27 ----
 external/wine/makefile.mk                                                     |   28 +---
 filter/Executable_svg2odf.mk                                                  |   26 ----
 filter/source/msfilter/mstoolbar.cxx                                          |   30 ----
 filter/source/odfflatxml/OdfFlatXml.cxx                                       |   28 ----
 filter/source/odfflatxml/odfflatxml.component                                 |   29 ----
 filter/source/svg/test/odfserializer.cxx                                      |   27 ++--
 filter/source/svg/test/odfserializer.hxx                                      |   26 ++--
 filter/source/svg/test/svg2odf.cxx                                            |   27 ++--
 filter/source/xsltfilter/LibXSLTTransformer.cxx                               |   27 ----
 filter/source/xsltfilter/LibXSLTTransformer.hxx                               |   27 ----
 filter/source/xsltfilter/OleHandler.cxx                                       |   27 ----
 filter/source/xsltfilter/OleHandler.hxx                                       |   27 ----
 fpicker/AllLangResTarget_fps_office.mk                                        |   25 ---
 fpicker/Library_fpicker.mk                                                    |   25 ---
 fpicker/Library_fps.mk                                                        |   25 ---
 fpicker/Library_fps_aqua.mk                                                   |   25 ---
 fpicker/Library_fps_office.mk                                                 |   25 ---
 fpicker/Module_fpicker.mk                                                     |   25 ---
 helpcompiler/Executable_helpindexer.mk                                        |   25 ---
 helpcompiler/Executable_helplinker.mk                                         |   25 ---
 helpcompiler/Library_helplinker.mk                                            |   25 ---
 helpcompiler/inc/HelpIndexer.hxx                                              |   28 ----
 helpcompiler/inc/HelpSearch.hxx                                               |   28 ----
 helpcompiler/source/HelpIndexer.cxx                                           |   28 ----
 helpcompiler/source/HelpIndexer_main.cxx                                      |   28 ----
 helpcompiler/source/HelpSearch.cxx                                            |   28 ----
 helpcompiler/source/LuceneHelper.cxx                                          |   28 ----
 helpcompiler/source/LuceneHelper.hxx                                          |   28 ----
 i18nlangtag/Library_i18nlangtag.mk                                            |   27 ----
 i18npool/CppunitTest_i18npool_test_breakiterator.mk                           |   27 ----
 i18npool/CppunitTest_i18npool_test_characterclassification.mk                 |   27 ----
 i18npool/CustomTarget_breakiterator.mk                                        |   27 ----
 i18npool/CustomTarget_collator.mk                                             |   27 ----
 i18npool/CustomTarget_indexentry.mk                                           |   27 ----
 i18npool/CustomTarget_localedata.mk                                           |   27 ----
 i18npool/CustomTarget_textconversion.mk                                       |   27 ----
 i18npool/Executable_gencoll_rule.mk                                           |   27 ----
 i18npool/Executable_genconv_dict.mk                                           |   27 ----
 i18npool/Executable_gendict.mk                                                |   27 ----
 i18npool/Executable_genindex_data.mk                                          |   27 ----
 i18npool/Executable_saxparser.mk                                              |   27 ----
 i18npool/Library_collator_data.mk                                             |   27 ----
 i18npool/Library_dict_ja.mk                                                   |   27 ----
 i18npool/Library_dict_zh.mk                                                   |   27 ----
 i18npool/Library_i18npool.mk                                                  |   27 ----
 i18npool/Library_i18nsearch.mk                                                |   27 ----
 i18npool/Library_index_data.mk                                                |   27 ----
 i18npool/Library_localedata_en.mk                                             |   27 ----
 i18npool/Library_localedata_es.mk                                             |   27 ----
 i18npool/Library_localedata_euro.mk                                           |   27 ----
 i18npool/Library_localedata_others.mk                                         |   27 ----
 i18npool/Library_textconv_dict.mk                                             |   27 ----
 i18npool/Module_i18npool.mk                                                   |   27 ----
 i18npool/source/localedata/data/list-dateacceptancepattern.awk                |    2 
 idlc/Executable_idlc.mk                                                       |   25 ---
 include/basegfx/tools/zoomtools.hxx                                           |   27 ----
 include/drawinglayer/XShapeDumper.hxx                                         |   27 ----
 include/editeng/rsiditem.hxx                                                  |   17 --
 include/filter/msfilter/mstoolbar.hxx                                         |   30 ----
 include/oox/ole/axbinarywriter.hxx                                            |   28 ----
 include/sal/ByteBufferWrapper.hxx                                             |    2 
 include/sax/tools/documenthandleradapter.hxx                                  |   28 ----
 include/sfx2/templatecontaineritem.hxx                                        |    2 
 include/sfx2/templatelocalview.hxx                                            |    2 
 include/sfx2/templatelocnames.hrc                                             |   27 ----
 include/sfx2/templateproperties.hxx                                           |    2 
 include/sfx2/templateviewitem.hxx                                             |    2 
 include/sfx2/thumbnailview.hxx                                                |    2 
 include/svtools/PlaceEditDialog.hxx                                           |   28 ----
 include/svtools/filechangedchecker.hxx                                        |   24 ---
 include/svx/extedit.hxx                                                       |   24 ---
 include/test/sheet/xnamedrange.hxx                                            |   27 ----
 include/test/sheet/xnamedranges.hxx                                           |   27 ----
 include/test/sheet/xprintareas.hxx                                            |   27 ----
 include/test/sheet/xsheetannotation.hxx                                       |   27 ----
 include/test/sheet/xsheetannotations.hxx                                      |   27 ----
 include/test/sheet/xsheetoutline.hxx                                          |   27 ----
 include/test/sheet/xspreadsheets2.hxx                                         |   27 ----
 include/tubes/constants.h                                                     |   27 ----
 include/xmloff/odffields.hxx                                                  |    4 
 include/xmloff/settingsstore.hxx                                              |   27 ----
 l10ntools/Executable_cfgex.mk                                                 |   25 ---
 l10ntools/Executable_helpex.mk                                                |   25 ---
 l10ntools/Executable_localize.mk                                              |   25 ---
 l10ntools/Executable_transex3.mk                                              |   25 ---
 l10ntools/Executable_ulfex.mk                                                 |   25 ---
 l10ntools/Executable_xrmex.mk                                                 |   25 ---
 l10ntools/Module_l10ntools.mk                                                 |   25 ---
 l10ntools/StaticLibrary_transex.mk                                            |   25 ---
 l10ntools/source/idxdict/idxdict.cxx                                          |   28 ----
 lingucomponent/Library_MacOSXSpell.mk                                         |   25 ---
 lingucomponent/Library_guesslang.mk                                           |   25 ---
 lingucomponent/Library_hyphen.mk                                              |   25 ---
 lingucomponent/Library_lnth.mk                                                |   25 ---
 lingucomponent/Library_spell.mk                                               |   25 ---
 lingucomponent/Module_lingucomponent.mk                                       |   25 ---
 lingucomponent/Package_config.mk                                              |   25 ---
 lingucomponent/StaticLibrary_ulingu.mk                                        |   25 ---
 lotuswordpro/source/filter/LotusWordProImportFilter.cxx                       |   38 ++----
 lotuswordpro/source/filter/LotusWordProImportFilter.hxx                       |   38 ++----
 nlpsolver/Extension_nlpsolver.mk                                              |   27 ----
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Registration.java              |   28 ----
 np_sdk/Module_np_sdk.mk                                                       |   25 ---
 np_sdk/Package_inc.mk                                                         |   26 ----
 np_sdk/Package_npapi.mk                                                       |   25 ---
 np_sdk/StaticLibrary_nputils.mk                                               |   25 ---
 odk/CppunitTest_checkapi.mk                                                   |   26 ----
 odk/CustomTarget_allheaders.mk                                                |   26 ----
 odk/examples/python/toolpanel/CalcWindowState.xcu                             |   35 +----
 odk/examples/python/toolpanel/Factory.xcu                                     |   35 +----
 odk/examples/python/toolpanel/META-INF/manifest.xml                           |   35 +----
 odk/examples/python/toolpanel/Makefile                                        |   34 +----
 odk/examples/python/toolpanel/description.xml                                 |   35 +----
 odk/examples/python/toolpanel/toolpanel.component                             |   35 +----
 odk/examples/python/toolpanel/toolpanel.py                                    |   35 ++---
 odk/pack/gendocu/Doxyfile                                                     |   34 +----
 odk/pack/gendocu/main.dox                                                     |   28 ----
 offapi/com/sun/star/awt/XToolkitExperimental.idl                              |    2 
 offapi/com/sun/star/scanner/XScannerManager2.idl                              |   28 ----
 offapi/com/sun/star/sheet/ConditionOperator2.idl                              |   28 ----
 offapi/com/sun/star/sheet/XSheetCondition2.idl                                |   28 ----
 offapi/com/sun/star/sheet/XSpreadsheets2.idl                                  |   23 ---
 offapi/com/sun/star/table/XCell2.idl                                          |   28 ----
 officecfg/CppunitTest_officecfg_cppheader_test.mk                             |   38 +-----
 officecfg/CustomTarget_registry.mk                                            |   37 +----
 officecfg/Package_cppheader.mk                                                |   37 +----
 officecfg/registry/cppheader.xsl                                              |   27 ----
 oovbaapi/ooo/vba/excel/XMenu.idl                                              |   27 ----
 oovbaapi/ooo/vba/excel/XMenuBar.idl                                           |   27 ----
 oovbaapi/ooo/vba/excel/XMenuItem.idl                                          |   27 ----
 oox/source/ole/axbinarywriter.cxx                                             |   27 ----
 oox/source/ppt/extdrawingfragmenthandler.cxx                                  |   28 ----
 oox/source/ppt/extdrawingfragmenthandler.hxx                                  |   28 ----
 package/Library_package2.mk                                                   |   27 ----
 package/Library_xstor.mk                                                      |   27 ----
 package/Module_package.mk                                                     |   27 ----
 package/Package_dtd.mk                                                        |   27 ----
 postprocess/CustomTarget_images.mk                                            |   25 ---
 postprocess/Package_images.mk                                                 |   25 ---
 python3/CustomTarget_PythonFramework.mk                                       |   26 ----
 python3/Zip_PythonFramework.mk                                                |   26 ----
 pyuno/CustomTarget_python_bin.mk                                              |   25 ---
 pyuno/CustomTarget_python_shell.mk                                            |   25 ---
 pyuno/CustomTarget_zipcore.mk                                                 |   25 ---
 pyuno/Executable_python_wrapper.mk                                            |   25 ---
 pyuno/Library_pythonloader.mk                                                 |   25 ---
 pyuno/Library_pyuno.mk                                                        |   25 ---
 pyuno/Library_pyuno_wrapper.mk                                                |   25 ---
 pyuno/Module_pyuno.mk                                                         |   25 ---
 pyuno/Package_python_bin.mk                                                   |   25 ---
 pyuno/Package_python_scripts.mk                                               |   25 ---
 pyuno/Package_python_shell.mk                                                 |   25 ---
 pyuno/Package_pyunorc.mk                                                      |   25 ---
 pyuno/Package_zipcore.mk                                                      |   25 ---
 qadevOOo/Jar_OOoRunner.mk                                                     |   27 ----
 qadevOOo/Jar_OOoRunnerLight.mk                                                |   27 ----
 registry/Executable_regcompare.mk                                             |   25 ---
 registry/Executable_regmerge.mk                                               |   25 ---
 registry/Executable_regview.mk                                                |   25 ---
 registry/Library_reg.mk                                                       |   25 ---
 registry/Module_registry.mk                                                   |   25 ---
 registry/StaticLibrary_registry_helper.mk                                     |   25 ---
 rsc/Executable_rsc.mk                                                         |   27 ----
 rsc/Module_rsc.mk                                                             |   27 ----
 sal/CppunitTest_Module_DLL.mk                                                 |   25 ---
 sal/CppunitTest_sal_bytesequence.mk                                           |   25 ---
 sal/CppunitTest_sal_osl_condition.mk                                          |   25 ---
 sal/CppunitTest_sal_osl_file.mk                                               |   25 ---
 sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk                           |   25 ---
 sal/CppunitTest_sal_osl_module.mk                                             |   25 ---
 sal/CppunitTest_sal_osl_old_test_file.mk                                      |   25 ---
 sal/CppunitTest_sal_osl_process.mk                                            |   27 ----
 sal/CppunitTest_sal_osl_security.mk                                           |   25 ---
 sal/CppunitTest_sal_osl_thread.mk                                             |   25 ---
 sal/CppunitTest_sal_rtl_alloc.mk                                              |   25 ---
 sal/CppunitTest_sal_rtl_cipher.mk                                             |   25 ---
 sal/CppunitTest_sal_rtl_crc32.mk                                              |   25 ---
 sal/CppunitTest_sal_rtl_doublelock.mk                                         |   25 ---
 sal/CppunitTest_sal_rtl_locale.mk                                             |   25 ---
 sal/CppunitTest_sal_rtl_ostringbuffer.mk                                      |   25 ---
 sal/CppunitTest_sal_rtl_oustringbuffer.mk                                     |   27 ----
 sal/CppunitTest_sal_rtl_strings.mk                                            |   25 ---
 sal/CppunitTest_sal_tcwf.mk                                                   |   25 ---
 sal/CppunitTest_sal_types.mk                                                  |   25 ---
 sal/Executable_cppunittester.mk                                               |   25 ---
 sal/Executable_osl_process_child.mk                                           |   25 ---
 sal/Library_lo-bootstrap.mk                                                   |   25 ---
 sal/Library_sal.mk                                                            |   25 ---
 sal/Library_sal_textenc.mk                                                    |   25 ---
 sal/Library_uwinapi.mk                                                        |   25 ---
 sal/StaticLibrary_salcpprt.mk                                                 |   25 ---
 sal/osl/unx/readwrite_helper.c                                                |   29 ----
 sal/osl/unx/readwrite_helper.h                                                |   29 ----
 salhelper/Library_salhelper.mk                                                |   25 ---
 salhelper/Module_salhelper.mk                                                 |   25 ---
 sane/Module_sane.mk                                                           |   27 ----
 sane/Package_inc.mk                                                           |   32 +----
 sc/CppunitTest_sc_annotationobj.mk                                            |   27 ----
 sc/CppunitTest_sc_annotationsobj.mk                                           |   27 ----
 sc/CppunitTest_sc_outlineobj.mk                                               |   27 ----
 sc/inc/defaultsoptions.hxx                                                    |   27 ----
 sc/inc/formulaopt.hxx                                                         |   27 ----
 sc/inc/types.hxx                                                              |   27 ----
 sc/qa/extras/scannotationobj.cxx                                              |   27 ----
 sc/qa/extras/scannotationsobj.cxx                                             |   27 ----
 sc/qa/extras/scoutlineobj.cxx                                                 |   27 ----
 sc/source/core/tool/defaultsoptions.cxx                                       |   27 ----
 sc/source/core/tool/formulaopt.cxx                                            |   27 ----
 sc/source/core/tool/random.cxx                                                |    1 
 sc/source/filter/excel/xltoolbar.cxx                                          |   30 ----
 sc/source/filter/excel/xltoolbar.hxx                                          |   30 ----
 sc/source/filter/inc/formulabuffer.hxx                                        |    2 
 sc/source/filter/oox/formulabuffer.cxx                                        |    2 
 sc/source/ui/dbgui/sortkeydlg.cxx                                             |   27 ----
 sc/source/ui/inc/datafdlg.hxx                                                 |   27 ----
 sc/source/ui/inc/sortkeydlg.hxx                                               |   27 ----
 sc/source/ui/inc/tpdefaults.hxx                                               |   27 ----
 sc/source/ui/miscdlgs/datafdlg.cxx                                            |   28 ----
 sc/source/ui/optdlg/tpdefaults.cxx                                            |   27 ----
 sc/source/ui/vba/vbamenu.cxx                                                  |   27 ----
 sc/source/ui/vba/vbamenu.hxx                                                  |   27 ----
 sc/source/ui/vba/vbamenubar.cxx                                               |   27 ----
 sc/source/ui/vba/vbamenubar.hxx                                               |   27 ----
 sc/source/ui/vba/vbamenubars.cxx                                              |   27 ----
 sc/source/ui/vba/vbamenubars.hxx                                              |   27 ----
 sc/source/ui/vba/vbamenuitem.cxx                                              |   27 ----
 sc/source/ui/vba/vbamenuitem.hxx                                              |   27 ----
 sc/source/ui/vba/vbamenuitems.cxx                                             |   27 ----
 sc/source/ui/vba/vbamenuitems.hxx                                             |   27 ----
 sc/source/ui/vba/vbamenus.cxx                                                 |   27 ----
 sc/source/ui/vba/vbamenus.hxx                                                 |   27 ----
 scp2/source/accessories/file_font_accessories.scp                             |   28 ----
 scp2/source/accessories/file_gallery_accessories.scp                          |   28 ----
 scp2/source/accessories/file_samples_accessories.scp                          |   28 ----
 scp2/source/accessories/file_templates_accessories.scp                        |   28 ----
 scp2/source/accessories/module_accessories.scp                                |   28 ----
 scp2/source/accessories/module_accessories.ulf                                |   28 ----
 scp2/source/accessories/module_font_accessories.scp                           |   28 ----
 scp2/source/accessories/module_font_accessories.ulf                           |   28 ----
 scp2/source/accessories/module_gallery_accessories.scp                        |   28 ----
 scp2/source/accessories/module_gallery_accessories.ulf                        |   28 ----
 scp2/source/accessories/module_samples_accessories.scp                        |   28 ----
 scp2/source/accessories/module_samples_accessories.ulf                        |   28 ----
 scp2/source/accessories/module_templates_accessories.scp                      |   28 ----
 scp2/source/accessories/module_templates_accessories.ulf                      |   28 ----
 scp2/source/base/postgresqlsdbc.scp                                           |   28 ----
 scp2/source/canvas/mtfrenderer.scp                                            |   31 ----
 scp2/source/ooo/mingw_dlls.scp                                                |   27 ----
 scp2/source/smoketest/module_smoketest.scp                                    |   27 ----
 scp2/source/smoketest/module_smoketest.ulf                                    |   27 ----
 scp2/source/smoketest/smoketest.scp                                           |   27 ----
 scp2/source/stdlibs/file_stdlibs.scp                                          |   27 ----
 scp2/source/stdlibs/module_stdlibs.scp                                        |   27 ----
 scp2/source/stdlibs/module_stdlibs.ulf                                        |   27 ----
 scripting/Jar_HelloWorld.mk                                                   |   27 ----
 scripting/Jar_Highlight.mk                                                    |   27 ----
 scripting/Jar_MemoryUsage.mk                                                  |   27 ----
 scripting/Jar_ScriptFramework.mk                                              |   27 ----
 scripting/Jar_ScriptProviderForBeanShell.mk                                   |   27 ----
 scripting/Jar_ScriptProviderForJava.mk                                        |   27 ----
 scripting/Jar_ScriptProviderForJavaScript.mk                                  |   27 ----
 scripting/Library_basprov.mk                                                  |   27 ----
 scripting/Library_dlgprov.mk                                                  |   27 ----
 scripting/Library_protocolhandler.mk                                          |   27 ----
 scripting/Library_scriptframe.mk                                              |   27 ----
 scripting/Library_stringresource.mk                                           |   27 ----
 scripting/Library_vbaevents.mk                                                |   27 ----
 scripting/Module_scripting.mk                                                 |   27 ----
 scripting/Package_ScriptsBeanShell.mk                                         |   27 ----
 scripting/Package_ScriptsJavaScript.mk                                        |   27 ----
 scripting/Package_ScriptsPython.mk                                            |   27 ----
 scripting/Package_scriptbindinglib.mk                                         |   27 ----
 scripting/Pyuno_mailmerge.mk                                                  |   27 ----
 scripting/Zip_ScriptsJava.mk                                                  |   27 ----
 scripting/source/pyprov/msgbox.py                                             |   28 ----
 sfx2/inc/bluthsndapi.hxx                                                      |   28 ----
 sfx2/inc/templatedlg.hxx                                                      |    2 
 sfx2/source/control/templatecontaineritem.cxx                                 |    2 
 sfx2/source/control/templatelocalview.cxx                                     |    2 
 sfx2/source/control/templatesearchview.cxx                                    |    2 
 sfx2/source/control/templateview.hrc                                          |    2 
 sfx2/source/control/templateview.src                                          |    2 
 sfx2/source/control/templateviewitem.cxx                                      |    2 
 sfx2/source/control/thumbnailview.cxx                                         |    2 
 sfx2/source/dialog/bluthsnd.cxx                                               |   28 ----
 sfx2/source/dialog/inputdlg.cxx                                               |    2 
 sfx2/source/dialog/inputdlg.hrc                                               |    2 
 sfx2/source/dialog/inputdlg.src                                               |    2 
 sfx2/source/dialog/templateinfodlg.hrc                                        |    2 
 sfx2/source/dialog/templateinfodlg.src                                        |    2 
 sfx2/source/doc/templatedlg.cxx                                               |    2 
 sfx2/source/doc/templatedlg.hrc                                               |    2 
 sfx2/source/doc/templatedlg.src                                               |    2 
 sfx2/source/doc/templatelocnames.src                                          |   27 ----
 sfx2/source/inc/inputdlg.hxx                                                  |    2 
 sfx2/source/inc/templatesearchview.hxx                                        |    2 
 shell/source/win32/shlxthandler/res/shlxthdl.rc                               |    2 
 smoketest/CppunitTest_smoketest.mk                                            |   25 ---
 smoketest/Jar_TestExtension.mk                                                |   25 ---
 smoketest/Library_smoketest.mk                                                |   25 ---
 smoketest/Module_smoketest.mk                                                 |   25 ---
 smoketest/Package_losmoketest.mk                                              |   25 ---
 smoketest/Zip_smoketestdoc.mk                                                 |   25 ---
 smoketest/lodownloadtest.py                                                   |   29 ----
 smoketest/losmoketest                                                         |   28 ----
 solenv/gbuild/AutoInstallLibs.mk                                              |    1 
 solenv/gbuild/Extension.mk                                                    |   25 ---
 solenv/gbuild/ExtensionTarget.mk                                              |   25 ---
 solenv/gbuild/extensions/post_SpeedUpTargets.mk                               |   27 ----
 solenv/gbuild/extensions/pre_MergedLibsList.mk                                |   25 ---
 solenv/gbuild/platform/windows.mk                                             |   25 ---
 solenv/gdb/libreoffice/cppu.py                                                |   26 ----
 solenv/gdb/libreoffice/sal.py                                                 |   26 ----
 solenv/gdb/libreoffice/svl.py                                                 |   26 ----
 solenv/gdb/libreoffice/sw.py                                                  |   26 ----
 solenv/gdb/libreoffice/tl.py                                                  |   26 ----
 solenv/gdb/libreoffice/util/__init__.py                                       |   26 ----
 solenv/gdb/libreoffice/util/compatibility.py                                  |   26 ----
 solenv/gdb/libreoffice/util/printing.py                                       |   26 ----
 solenv/gdb/libreoffice/util/string.py                                         |   26 ----
 solenv/gdb/libreoffice/util/uno.py                                            |   26 ----
 starmath/inc/caret.hxx                                                        |   29 ----
 starmath/inc/cursor.hxx                                                       |   27 ----
 starmath/inc/visitors.hxx                                                     |   27 ----
 starmath/qa/cppunit/test_nodetotextvisitors.cxx                               |   27 ----
 starmath/source/caret.cxx                                                     |   27 ----
 starmath/source/cursor.cxx                                                    |   27 ----
 starmath/source/visitors.cxx                                                  |   27 ----
 store/Library_store.mk                                                        |   25 ---
 store/Module_store.mk                                                         |   25 ---
 svl/CppunitTest_svl_lngmisc.mk                                                |   27 ----
 svl/CppunitTest_svl_urihelper.mk                                              |   37 +----
 svl/qa/unit/svl.cxx                                                           |   27 ----
 svl/qa/unit/test_lngmisc.cxx                                                  |   30 +---
 svtools/source/dialogs/PlaceEditDialog.cxx                                    |   27 ----
 svtools/source/misc/filechangedchecker.cxx                                    |   23 ---
 svx/source/core/extedit.cxx                                                   |   23 ---
 svx/source/svdraw/svdconv.hxx                                                 |    2 
 sw/qa/extras/inc/bordertest.hxx                                               |   27 ----
 sw/source/core/inc/pagefrm.hrc                                                |   27 ----
 sw/source/filter/ww8/ww8toolbar.cxx                                           |   30 ----
 sw/source/filter/ww8/ww8toolbar.hxx                                           |   30 ----
 sw/source/ui/dialog/wordcountwrapper.cxx                                      |   25 ---
 sw/source/ui/inc/wordcountctrl.hxx                                            |    2 
 sw/source/ui/utlui/wordcountctrl.cxx                                          |    2 
 sw/source/ui/vba/vbalisthelper.hxx                                            |   27 ----
 swext/Configuration_mediawiki.mk                                              |   27 ----
 swext/Extension_wiki-publisher.mk                                             |   27 ----
 swext/Jar_mediawiki.mk                                                        |   27 ----
 swext/Module_swext.mk                                                         |   27 ----
 test/source/sheet/xnamedrange.cxx                                             |   27 ----
 test/source/sheet/xnamedranges.cxx                                            |   27 ----
 test/source/sheet/xprintareas.cxx                                             |   27 ----
 test/source/sheet/xsheetannotation.cxx                                        |   27 ----
 test/source/sheet/xsheetannotations.cxx                                       |   27 ----
 test/source/sheet/xsheetoutline.cxx                                           |   27 ----
 test/source/sheet/xspreadsheets2.cxx                                          |   27 ----
 test/user-template/registry/modifications.xcd                                 |   27 ----
 testtools/CustomTarget_bridgetest.mk                                          |   25 ---
 testtools/CustomTarget_bridgetest_climaker.mk                                 |   25 ---
 testtools/CustomTarget_bridgetest_javamaker.mk                                |   25 ---
 testtools/CustomTarget_uno_test.mk                                            |   25 ---
 testtools/InternalUnoApi_bridgetest.mk                                        |   25 ---
 testtools/Jar_testComponent.mk                                                |   25 ---
 testtools/Library_bridgetest.mk                                               |   25 ---
 testtools/Library_constructors.mk                                             |   25 ---
 testtools/Library_cppobj.mk                                                   |   25 ---
 testtools/Module_testtools.mk                                                 |   25 ---
 testtools/Rdb_uno_services.mk                                                 |   25 ---
 testtools/StaticLibrary_bridgetest.mk                                         |   25 ---
 tools/qa/cppunit/test_urlobj.cxx                                              |   27 ----
 touch/CustomTarget_touch_javamaker.mk                                         |    2 
 touch/InternalUnoApi_touch.mk                                                 |    2 
 touch/Library_libotouch.mk                                                    |    2 
 touch/Module_touch.mk                                                         |    2 
 touch/idl/org/libreoffice/touch/Document.idl                                  |    2 
 touch/idl/org/libreoffice/touch/XDocument.idl                                 |    2 
 touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl                   |    2 
 touch/source/android/android.cxx                                              |    2 
 touch/source/generic/libotouch.cxx                                            |    2 
 touch/source/ios/ios.cxx                                                      |    2 
 touch/source/uno/Document.cxx                                                 |    2 
 tubes/Executable_liboapprover.mk                                              |   25 ---
 tubes/source/approver.c                                                       |   27 ----
 twain/Module_twain.mk                                                         |   27 ----
 twain/Package_inc.mk                                                          |   32 +----
 ucb/Library_cached1.mk                                                        |   25 ---
 ucb/Library_srtrs1.mk                                                         |   25 ---
 ucb/Library_ucb1.mk                                                           |   25 ---
 ucb/Library_ucpcmis1.mk                                                       |   25 ---
 ucb/Library_ucpdav1.mk                                                        |   25 ---
 ucb/Library_ucpexpand1.mk                                                     |   25 ---
 ucb/Library_ucpext.mk                                                         |   25 ---
 ucb/Library_ucpfile1.mk                                                       |   25 ---
 ucb/Library_ucpftp1.mk                                                        |   25 ---
 ucb/Library_ucpgio1.mk                                                        |   25 ---
 ucb/Library_ucpgvfs1.mk                                                       |   25 ---
 ucb/Library_ucphier1.mk                                                       |   25 ---
 ucb/Library_ucppkg1.mk                                                        |   25 ---
 ucb/Library_ucptdoc1.mk                                                       |   25 ---
 ucb/source/ucp/cmis/cmis_datasupplier.cxx                                     |    2 
 ucb/source/ucp/cmis/cmis_datasupplier.hxx                                     |    2 
 ucb/source/ucp/cmis/cmis_resultset.cxx                                        |    2 
 ucb/source/ucp/cmis/cmis_resultset.hxx                                        |    2 
 unixODBC/Module_unixODBC.mk                                                   |   27 ----
 unixODBC/Package_inc.mk                                                       |   32 +----
 unodevtools/Executable_skeletonmaker.mk                                       |   25 ---
 unodevtools/Module_unodevtools.mk                                             |   25 ---
 unodevtools/source/skeletonmaker/skeletoncommon.cxx                           |    2 
 unotest/Jar_test-tools.mk                                                     |   25 ---
 unotest/Jar_test.mk                                                           |   25 ---
 unotest/Library_unobootstrapprotector.mk                                      |   25 ---
 unotest/Library_unoexceptionprotector.mk                                      |   25 ---
 unotest/Library_unotest.mk                                                    |   25 ---
 unotest/Module_unotest.mk                                                     |   25 ---
 uui/AllLangResTarget_uui.mk                                                   |   27 ----
 uui/Library_uui.mk                                                            |   27 ----
 uui/Module_uui.mk                                                             |   27 ----
 vcl/Executable_kdefilepicker.mk                                               |   25 ---
 vcl/Executable_tdefilepicker.mk                                               |   26 ----
 vcl/StaticLibrary_headless.mk                                                 |   34 +----
 vcl/headless/svpdata.cxx                                                      |   28 ----
 vcl/source/control/thumbpos.hxx                                               |    2 
 xmerge/Jar_XMergeBridge.mk                                                    |   27 ----
 xmerge/Jar_xmerge.mk                                                          |   27 ----
 xmerge/Module_xmerge.mk                                                       |   27 ----
 xmloff/source/core/SvXMLAttr.cxx                                              |   29 ----
 xmloff/source/core/SvXMLAttr.hxx                                              |   29 ----
 xmloff/source/core/SvXMLAttrCollection.cxx                                    |   29 ----
 xmloff/source/core/SvXMLAttrCollection.hxx                                    |   29 ----
 xmlsecurity/AllLangResTarget_xsec.mk                                          |   27 ----
 xmlsecurity/CppunitTest_qa_certext.mk                                         |   27 ----
 xmlsecurity/Library_xmlsecurity.mk                                            |   27 ----
 xmlsecurity/Library_xsec_fw.mk                                                |   27 ----
 xmlsecurity/Library_xsec_xmlsec.mk                                            |   27 ----
 xmlsecurity/Module_xmlsecurity.mk                                             |   27 ----
 632 files changed, 2444 insertions(+), 13054 deletions(-)

New commits:
commit 72e5d0c8fbedb509fccec7aa8bd03f89cda9ef6d
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Apr 24 17:14:03 2013 +0100

    Move to MPLv2 license headers, with ESC decision and author's permission.

diff --git a/Library_merged.mk b/Library_merged.mk
index 2d5ef60..959db0e 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -1,25 +1,12 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (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.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-# Matúš Kukan <matus.kukan at gmail.com> (C) 2011, All Rights Reserved.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,merged))
 
diff --git a/Makefile.in b/Makefile.in
index f427136..892a369 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Copyright 2012 LibreOffice contributors.
+# 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
diff --git a/MathMLDTD/Module_MathMLDTD.mk b/MathMLDTD/Module_MathMLDTD.mk
index f60b555..584a59f 100644
--- a/MathMLDTD/Module_MathMLDTD.mk
+++ b/MathMLDTD/Module_MathMLDTD.mk
@@ -1,30 +1,11 @@
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 #
 
 $(eval $(call gb_Module_Module,MathMLDTD))
diff --git a/MathMLDTD/Package_bin.mk b/MathMLDTD/Package_bin.mk
index a1730cd..677997a 100644
--- a/MathMLDTD/Package_bin.mk
+++ b/MathMLDTD/Package_bin.mk
@@ -1,30 +1,11 @@
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 #
 
 $(eval $(call gb_Package_Package,MathMLDTD_bin,$(SRCDIR)/MathMLDTD))
diff --git a/Mesa/Module_Mesa.mk b/Mesa/Module_Mesa.mk
index fc70e59..61cf885 100644
--- a/Mesa/Module_Mesa.mk
+++ b/Mesa/Module_Mesa.mk
@@ -1,28 +1,11 @@
 #
-#  Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License or as specified alternatively below. You may obtain a copy of
-#  the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
+# 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/.
 #
-#  Major Contributor(s):
-#  Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-#  All Rights Reserved.
-#
-#  For minor contributions see the git repository.
-#
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-#  the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-#  in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-#  instead of those above.
 
 $(eval $(call gb_Module_Module,Mesa))
 
diff --git a/Mesa/Package_inc.mk b/Mesa/Package_inc.mk
index 73fe960..b5cca09 100644
--- a/Mesa/Package_inc.mk
+++ b/Mesa/Package_inc.mk
@@ -1,28 +1,11 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+# This file is part of the LibreOffice project.
 #
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License or as specified alternatively below. You may obtain a copy of
-#  the License at http://www.mozilla.org/MPL/
+# 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/.
 #
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-#
-#  Major Contributor(s):
-#  Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-#  All Rights Reserved.
-#
-#  For minor contributions see the git repository.
-#
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-#  the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-#  in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-#  instead of those above.
 
 $(eval $(call gb_Package_Package,Mesa_inc,$(SRCDIR)/Mesa/inc))
 
@@ -37,5 +20,4 @@ $(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/glx_mangle.h,glx_mangle.h))
 $(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/vms_x_fix.h,vms_x_fix.h))
 $(eval $(call gb_Package_add_file,Mesa_inc,inc/GL/wglext.h,wglext.h))
 
-
 # vim: set noet sw=4:
diff --git a/avmedia/AllLangResTarget_avmedia.mk b/avmedia/AllLangResTarget_avmedia.mk
index 76b8935..25bb9cf 100644
--- a/avmedia/AllLangResTarget_avmedia.mk
+++ b/avmedia/AllLangResTarget_avmedia.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,avmedia))
 
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 04c8c83..eb87e6c 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,avmedia))
 
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index 0e72034..4f02f0e 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,avmediaQuickTime))
 
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 3ea54e8..1308e5f 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,avmediagst))
 
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index c12d6e1..e7fab92 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,avmediagst_0_10))
 
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 62b071f..1725aa0 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,avmediawin))
 
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 4888d4a..3579081 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Module_Module,avmedia))
 
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 56d01cf..dfede10 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -1,29 +1,13 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * This file is part of the LibreOffice project.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2011 August Sodora <augsod at gmail.com> (initial developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
+ * 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 (C) 2011 August Sodora <augsod at gmail.com>
  */
 
 #include "baside2.hxx"
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index 053c361..b41530a 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -1,30 +1,15 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * This file is part of the LibreOffice project.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2011 August Sodora <augsod at gmail.com> (initial developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
+ * 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 (C) 2011 August Sodora <augsod at gmail.com>
  */
+
 #ifndef BASCTL_LINENUMBERWINDOW_HXX
 #define BASCTL_LINENUMBERWINDOW_HXX
 
diff --git a/basegfx/qa/mkpolygons.pl b/basegfx/qa/mkpolygons.pl
index 3b35ce7..2c8f1ff 100644
--- a/basegfx/qa/mkpolygons.pl
+++ b/basegfx/qa/mkpolygons.pl
@@ -18,9 +18,6 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-#
-# 2009 Copyright Novell, Inc. & Sun Microsystems, Inc.
-#
 
 use IO::File;
 use Cwd;
diff --git a/basegfx/source/tools/zoomtools.cxx b/basegfx/source/tools/zoomtools.cxx
index 34b0b8c..57d88de 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -1,29 +1,10 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * This file is part of the LibreOffice project.
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Tim Hardeck <thardeck at suse.com>
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
+ * 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/.
  */
 
 #include <basegfx/tools/zoomtools.hxx>
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 25ed568..5dbd691 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Copyright 2012 LibreOffice contributors.
+ * 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
diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx
index 47bd726..31b2b76 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Copyright 2012 LibreOffice contributors.
+ * 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
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 7ce4a4a..cf04790 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * Copyright 2012 LibreOffice contributors.
+ * 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
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index 7e7391a..85278831 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -1,30 +1,11 @@
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 #
 
 $(eval $(call gb_Jar_Jar,officebean))
diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk
index 8c2e549..1d22dcd 100644
--- a/bean/JunitTest_bean_complex.mk
+++ b/bean/JunitTest_bean_complex.mk
@@ -1,30 +1,11 @@
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 #
 
 $(eval $(call gb_JunitTest_JunitTest,bean_complex))
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 47a314e..0ad1d7d 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -1,31 +1,12 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 #
 
 $(eval $(call gb_Library_Library,officebean))
diff --git a/bean/Module_bean.mk b/bean/Module_bean.mk
index ee6d62c..3b0debc 100644
--- a/bean/Module_bean.mk
+++ b/bean/Module_bean.mk
@@ -1,30 +1,11 @@
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 #
 
 $(eval $(call gb_Module_Module,bean))
diff --git a/bin/doubleNewlines.pl b/bin/doubleNewlines.pl
deleted file mode 100755
index c1f66e5..0000000
--- a/bin/doubleNewlines.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/perl
-################################################################################
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Michael Koch <miko at gmx.ch>
-#
-# Major Contributor(s):
-#       <name>
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-################################################################################
-# Usage: "Usage: doubleNewlines.pl <directory>"
-#        It is possible to enter more than one directory separated by spaces.
-#        Instead of a directory you can also use one or more files as arguments.
-################################################################################
-
-use strict;
-use warnings;
-
-use File::Find;
-use Cwd 'abs_path';
-
-my $total = 0;
-
-die "Usage: doubleNewlines.pl <directory>\n" unless (@ARGV);
-
-# if path is relative, make it absolute
-foreach (@ARGV){
-    $_ = abs_path($_);
-}
-
-print "Following code files (.hxx and .cxx) are suspicious:\n";
-find(\&processFile, @ARGV);     # processes all files in dir and subdirs
-print "Found $total suspicious files.\n";
-
-sub processFile {
-    my $file = $File::Find::name;
-    return unless $file =~ /(.cxx$)|(.hxx$)/;
-    open FILE, $file or die "Can't open '$file': $!";
-    my $lines = join '', <FILE>;
-    if ($lines =~ /(\n{2,}.+){10}/) {    # ten consecutive occurrences of [empty line(s) - code line)]
-        my $relPath = substr($file, index($file, "clone")+6);   # relative path beginning with repo name
-        print "$relPath\n";
-        $total++;
-    }
-}
diff --git a/bin/fuzzfiles b/bin/fuzzfiles
index c6e509e..99b503e 100755
--- a/bin/fuzzfiles
+++ b/bin/fuzzfiles
@@ -1,29 +1,11 @@
 #! /bin/bash
-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s): 
-# Copyright (C) 2011 Tata Consultancy Services, Ltd. Marc-Andre Laverdiere <marc-andre at atc.tcs.com> (initial developer) 
 #
-# All Rights Reserved.
+# This file is part of the LibreOffice project.
 #
-# For minor contributions see the git repository.
+# 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/.
 #
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 #check that zzuf is installed
 hash zzuf &> /dev/null
diff --git a/bin/java-set-classpath.in b/bin/java-set-classpath.in
index 6128918..507264a 100644
--- a/bin/java-set-classpath.in
+++ b/bin/java-set-classpath.in
@@ -1,32 +1,21 @@
 #!/bin/sh
-
-#*****************************************************************************
-#
-#  java-set-classpath - Utility to update the default CLASSPATH for OpenOffice.org
-#
-#  Initial version by: Petr Mladek <pmladek at suse.cz>
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2, as
-#  published by the Free Software Foundation.
+# This file is part of the LibreOffice project.
 #
-#  This program 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 General Public License for more details.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#*****************************************************************************
+
+#  java-set-classpath - Utility to update the default
+#                       CLASSPATH for LibreOffice
 
 if test "z$1" = "z" ; then
-    echo "Update the default CLASSPATH for OpenOffice.org"
+    echo "Update the default CLASSPATH for LibreOffice"
     echo ""
     echo "Usage: $0 [dir|jar]..."
     echo ""
-    echo "The utility updates the OpenOffice.org system setting. It adds or removes"
+    echo "The utility updates the LibreOffice system setting. It adds or removes"
     echo "the given directories and jar-files to or from the default CLASSPATH"
     echo "depending on if they are available on the system or not."
     echo ""
diff --git a/bin/unpack-sources b/bin/unpack-sources
old mode 100755
new mode 100644
index 0fe4499..4b0f9be
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -1,33 +1,12 @@
 #!/usr/bin/env bash
 
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Petr Mladek <pmladek at suse.cz>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-# Ted <ted at bear.com>
-# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 usage()
 {
diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
index c2a7ffb..5dfe086 100644
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
 
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
index 6eefea7..cbd6201 100644
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal))
 
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index f6c8bab..b03e4d3 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,binaryurp))
 
diff --git a/binaryurp/Module_binaryurp.mk b/binaryurp/Module_binaryurp.mk
index ac7474e..4f00dfe 100644
--- a/binaryurp/Module_binaryurp.mk
+++ b/binaryurp/Module_binaryurp.mk
@@ -1,30 +1,11 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Module_Module,binaryurp))
 
diff --git a/bluez_bluetooth/Module_bluez_bluetooth.mk b/bluez_bluetooth/Module_bluez_bluetooth.mk
index 6955280..afca1a0 100644
--- a/bluez_bluetooth/Module_bluez_bluetooth.mk
+++ b/bluez_bluetooth/Module_bluez_bluetooth.mk
@@ -1,30 +1,11 @@
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# The Initial Developer of the Original Code is
-#       Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 #
 
 $(eval $(call gb_Module_Module,bluez_bluetooth))
diff --git a/bluez_bluetooth/Package_inc.mk b/bluez_bluetooth/Package_inc.mk
index 1d19533..29ee255 100644
--- a/bluez_bluetooth/Package_inc.mk
+++ b/bluez_bluetooth/Package_inc.mk
@@ -1,30 +1,10 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+# This file is part of the LibreOffice project.
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
+# 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/.
 #
 
 $(eval $(call gb_Package_Package,bluez_bluetooth_inc,$(SRCDIR)/bluez_bluetooth/inc))
@@ -36,4 +16,4 @@ $(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/l2cap.h,blue
 $(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/rfcomm.h,bluetooth/rfcomm.h))
 $(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/sco.h,bluetooth/sco.h))
 
-# vim: set noet sw=4 ts=4:
\ No newline at end of file
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index e77afba..26347a0 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -1,28 +1,11 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Executable_Executable,cppumaker))
 
diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index 6ad8091..93a43bb 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -1,28 +1,11 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Module_Module,codemaker))
 
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index a20d4cc..9061d95 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
 
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index ea4387d..bbe91b9 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
 
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 31fda9e..b4a594f 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
 
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 2e96372..791782d 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -1,30 +1,10 @@
-##
-## Version: MPL 1.1 / GPLv3+ / LGPLv3+
-##
-## The contents of this file are subject to the Mozilla Public License Version
-## 1.1 (the "License"); you may not use this file except in compliance with
-## the License or as specified alternatively below. You may obtain a copy of
-## the License at http://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS" basis,
-## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-## for the specific language governing rights and limitations under the
-## License.
-##
-## Major Contributor(s):
-## Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman at redhat.com>
-## (initial developer)
-##
-## All Rights Reserved.
-##
-## For minor contributions see the git repository.
-##
-## Alternatively, the contents of this file may be used under the terms of
-## either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-## the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-## in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-## instead of those above.
-##
+#
+# 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/.
+#
 
 $(eval $(call gb_Library_Library,configmgr))
 
diff --git a/connectivity/AllLangResTarget_cnr.mk b/connectivity/AllLangResTarget_cnr.mk
index 3a6327a..df94ae2 100644
--- a/connectivity/AllLangResTarget_cnr.mk
+++ b/connectivity/AllLangResTarget_cnr.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr))
 
diff --git a/connectivity/Jar_ConnectivityTools.mk b/connectivity/Jar_ConnectivityTools.mk
index 0f89c96..ccc6c16 100644
--- a/connectivity/Jar_ConnectivityTools.mk
+++ b/connectivity/Jar_ConnectivityTools.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Jar_Jar,ConnectivityTools))
 
diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index 711bceb..7519bf1 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Jar_Jar,sdbc_hsqldb))
 
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 08a95f5..e496711 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,ado))
 
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 3f5ce09..6056e26 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,calc))
 
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 35c7f79..62c5632 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,dbase))
 
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index fbccc3a..5aa8b8c 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,dbpool2))
 
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 7a5df86..62c5ead 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,dbtools))
 
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index fe6ee47..3add37a 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,evoab))
 
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index 6ced91c..ffdf141 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,file))
 
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 153db8f..ecea162 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,flat))
 
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index dd1472f..6af6826 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,jdbc))
 
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index e51ab45..fae9ff3 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,kab1))
 
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index 022eaee..1710876 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,kabdrv1))
 
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index 7126f3b..178edd1 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,macab1))
 
diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk
index 428daa1..4629572 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,macabdrv1))
 
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index e5f9fd11..1d9d6b8 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,mysql))
 
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 3f7ccbf..82d447c 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,odbc))
 
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index fc8f11b..9819cfa 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,odbcbase))
 
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index c79c2ad..e8da462 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,sdbc2))
 
diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 59f2f80..298ed4c 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# 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/.
 #
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
 
 $(eval $(call gb_Library_Library,tdeab1))
 
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index b8786fd..bdfe273 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -1,29 +1,12 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
 #
-# Software distributed under the License is distributed on an "AS IS" basis,

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list