8 files changed, 101 insertions, 98 deletions
diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index 225c44bd428a..80e193078da0 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -1,30 +1,29 @@
-##
-## 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 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-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/
+#
+# 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.
 
 $(eval $(call gb_JunitTest_JunitTest,sc_complex,SRCDIR))
 
@@ -58,3 +57,5 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sc_complex, \
 $(eval $(call gb_JunitTest_set_defs,sc_complex, \
     $$(DEFS) \
 ))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/JunitTest_sc_unoapi.mk b/sc/JunitTest_sc_unoapi.mk
index 7b31eca1d78d..fb2efdd08e8e 100644
--- a/sc/JunitTest_sc_unoapi.mk
+++ b/sc/JunitTest_sc_unoapi.mk
@@ -1,30 +1,29 @@
-##
-## 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 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-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/
+#
+# 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.
 
 $(eval $(call gb_JunitTest_JunitTest,sc_unoapi,SRCDIR))
 
@@ -46,3 +45,5 @@ $(eval $(call gb_JunitTest_set_defs,sc_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
     -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
 ))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 969978a9d6ee..5e908d9bf17c 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -4,22 +4,22 @@
  *
  * 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/
+ * 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
- *       Caolán McNamara <caolanm@redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ *  (initial developer)
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard@googlemail.com>
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm@redhat.com>
- *   Markus Mohrhard <markus.mohrhard@googlemail.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
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 626b038a67e2..2326c7345c44 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -4,21 +4,22 @@
  *
  * 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/
+ * 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
- *       Caolán McNamara <caolanm@redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ *  (initial developer)
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard@googlemail.com>
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm@redhat.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
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 4a6748619030..99165849009e 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -4,21 +4,21 @@
  *
  * 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/
+ * 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
- *       Caolán McNamara <caolanm@redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ *  (initial developer)
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm@redhat.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
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index c8e7d07be78e..0af2275e19f4 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -4,21 +4,21 @@
  *
  * 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/
+ * 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
- *       Caolán McNamara <caolanm@redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ *  (initial developer)
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm@redhat.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
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index bac6ac947599..b0f66b91409e 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -4,22 +4,22 @@
  *
  * 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/
+ * 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
- *       Caolán McNamara <caolanm@redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ *  (initial developer)
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard@googlemail.com>
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm@redhat.com>
- *   Markus Mohrhard <markus.mohrhard@googlemail.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
diff --git a/test/user-template/registry/modifications.xcd b/test/user-template/registry/modifications.xcd
index 80ab50ac9c6f..d32364542196 100644
--- a/test/user-template/registry/modifications.xcd
+++ b/test/user-template/registry/modifications.xcd
@@ -13,8 +13,8 @@
  * License.
  *
  * Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann <sbergman@redhat.com> (initial
- *   developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ *  (initial developer)
  *
  * All Rights Reserved.
  *