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

4 files changed, 33 insertions, 106 deletions

diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk
index 8ee29d0feb43..d1cdf92e9270 100644
--- a/officecfg/CppunitTest_officecfg_cppheader_test.mk
+++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk
@@ -1,31 +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/
-##
-## 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@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.
-##
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
 
 $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test))
 
@@ -43,4 +23,4 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \
 
 $(eval $(call gb_CppunitTest_use_package,officecfg_cppheader_test,officecfg_cppheader))
 
-## vim: set noet sw=4 ts=4:
+# vim: set noet sw=4 ts=4:
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk
index 42cd9ff4d136..aaf6f16089b2 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.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/
-##
-## 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@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.
-##
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
 
 $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
 
@@ -53,3 +34,5 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/%.hxx: \
 	mkdir -p $(dir $@) && \
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet $(call officecfg_xsltparams,$(subst /, ,$*)) \
 	    -o $@ $(SRCDIR)/officecfg/registry/cppheader.xsl $<)
+
+# vim: set noet sw=4 ts=4:
diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk
index 0f14f8132e30..9542b790dc16 100644
--- a/officecfg/Package_cppheader.mk
+++ b/officecfg/Package_cppheader.mk
@@ -1,32 +1,15 @@
-##
-## 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@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.
-##
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
 
 $(eval $(call gb_Package_Package,officecfg_cppheader,$(WORKDIR)/CustomTarget/officecfg/registry))
 
 $(eval $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),$(call \
     gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index 9bdce8e29cc4..a09043f4f8f8 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * 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 Red Hat, Inc., Stephan Bergmann <sbergman@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.
 -->
 
 <!-- Generate a .hxx file with type-safe C++ abstractions (based on