From c8ef924060b1f5d5e26b62645d9c0f24f7ce662b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 6 Dec 2011 21:15:10 +0000 Subject: normalize Red Hat, Inc. spellings, and bump to latest template --- sw/CppunitTest_sw_filters_test.mk | 9 ++++----- sw/CppunitTest_sw_macros_test.mk | 9 ++++----- sw/CppunitTest_sw_swdoc_test.mk | 9 ++++----- sw/source/ui/app/swdllimpl.hxx | 16 +++++++++------- sw/source/ui/inc/titlepage.hxx | 16 +++++++++------- sw/source/ui/misc/titlepage.cxx | 15 ++++++++------- sw/source/ui/misc/titlepage.hrc | 17 ++++++++++------- sw/source/ui/misc/titlepage.src | 16 +++++++++------- 8 files changed, 57 insertions(+), 50 deletions(-) (limited to 'sw') diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index ccf62124984d..3b31eb9bd813 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -12,12 +12,11 @@ # for the specific language governing rights and limitations under the # License. # -# The Initial Developer of the Original Code is -# Caolán McNamara, Red Hat, Inc. -# 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., Stephan Bergmann +# (initial developer) +# +# All Rights Reserved. # # For minor contributions see the git repository. # diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 25b835792bd3..9c2c11f04cfa 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -12,12 +12,11 @@ # for the specific language governing rights and limitations under the # License. # -# The Initial Developer of the Original Code is -# Caolán McNamara, Red Hat, Inc. -# 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 +# (initial developer) +# +# All Rights Reserved. # # For minor contributions see the git repository. # diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index fc06cacea799..e18b0c8d52c8 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -12,12 +12,11 @@ # for the specific language governing rights and limitations under the # License. # -# The Initial Developer of the Original Code is -# Caolán McNamara, Red Hat, Inc. -# 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 +# (initial developer) +# +# All Rights Reserved. # # For minor contributions see the git repository. # diff --git a/sw/source/ui/app/swdllimpl.hxx b/sw/source/ui/app/swdllimpl.hxx index 1f7c17eeaff7..cce2b2920f0d 100644 --- a/sw/source/ui/app/swdllimpl.hxx +++ b/sw/source/ui/app/swdllimpl.hxx @@ -4,20 +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 (Red Hat, Inc.) - * 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 + * (initial developer) * - * Contributor(s): Caolán McNamara + * 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 @@ -25,6 +26,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ + #ifndef SWDLL_IMPL_INCLUDE #define SWDLL_IMPL_INCLUDE diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/ui/inc/titlepage.hxx index 5f102e008201..fbbe6742fb2b 100644 --- a/sw/source/ui/inc/titlepage.hxx +++ b/sw/source/ui/inc/titlepage.hxx @@ -4,20 +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 (Red Hat, Inc.) - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. + * Major Contributor(s): + * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara + * (initial developer) * - * Contributor(s): Caolán McNamara + * 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 @@ -25,6 +26,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ + #ifndef _SWTITLEPAGE_HXX #define _SWTITLEPAGE_HXX diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 0cc2ea446110..759242e43fcd 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -4,20 +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 (Red Hat, Inc.) - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. + * Major Contributor(s): + * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara + * (initial developer) * - * Contributor(s): Caolán McNamara + * 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/source/ui/misc/titlepage.hrc b/sw/source/ui/misc/titlepage.hrc index 63678427cfca..191581bec21f 100644 --- a/sw/source/ui/misc/titlepage.hrc +++ b/sw/source/ui/misc/titlepage.hrc @@ -1,22 +1,24 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * 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/ + * 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 (Red Hat, Inc.) - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. + * Major Contributor(s): + * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara + * (initial developer) * - * Contributor(s): Caolán McNamara + * 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 @@ -24,6 +26,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ + #define FL_MAKEINSERT 1 #define RB_USE_EXISTING_PAGES 2 #define RB_INSERT_NEW_PAGES 3 diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src index f23dfcfff2ee..aff142e496b8 100644 --- a/sw/source/ui/misc/titlepage.src +++ b/sw/source/ui/misc/titlepage.src @@ -1,22 +1,24 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * 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/ + * 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 (Red Hat, Inc.) - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. + * Major Contributor(s): + * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara + * (initial developer) * - * Contributor(s): Caolán McNamara + * 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 -- cgit