basctl/source/basicide/linenumberwindow.cxx | 3 --
basctl/source/basicide/linenumberwindow.hxx | 3 --
include/shell/tde_defines.h | 31 ++++++++--------------------
include/shell/tde_headers.h | 31 ++++++++--------------------
scp2/source/tde/module_tde.scp | 31 ++++++++--------------------
scp2/source/tde/module_tde.ulf | 31 ++++++++--------------------
svl/CppunitTest_svl_lngmisc.mk | 2 -
svl/qa/unit/test_lngmisc.cxx | 3 --
vcl/Library_vclplug_tde.mk | 25 ++++------------------
9 files changed, 41 insertions(+), 119 deletions(-)
New commits:
commit 2b5d1c9bf623a5a4dc019989751197bc31dbf759
Author: Michael Meeks <michael.me...@suse.com>
Date: Thu May 16 12:42:36 2013 +0100
Move to MPLv2 license headers, with ESC decision and author's permission.
Change-Id: Ie154eadd9960b159f5a250cde93c4bd7a8a948cf
diff --git a/basctl/source/basicide/linenumberwindow.cxx
b/basctl/source/basicide/linenumberwindow.cxx
index dfede10..8baa2fe 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -6,9 +6,6 @@
* 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 <aug...@gmail.com>
- */
#include "baside2.hxx"
#include "linenumberwindow.hxx"
diff --git a/basctl/source/basicide/linenumberwindow.hxx
b/basctl/source/basicide/linenumberwindow.hxx
index b41530a..667ef0a 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -6,9 +6,6 @@
* 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 <aug...@gmail.com>
- */
#ifndef BASCTL_LINENUMBERWINDOW_HXX
#define BASCTL_LINENUMBERWINDOW_HXX
diff --git a/include/shell/tde_defines.h b/include/shell/tde_defines.h
index 0dc91e9..6030760 100644
--- a/include/shell/tde_defines.h
+++ b/include/shell/tde_defines.h
@@ -1,27 +1,14 @@
/* -*- 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. 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
- * Timothy Pearson <kb9...@pearsoncomputing.net> (C) 2012, 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.
- *
- ************************************************************************/
+ * 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) 2012, Timothy Pearson <kb9...@pearsoncomputing.net>
+ */
#ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H
#define INCLUDED_VCL_TDE_DEFINE_HEADERS_H
diff --git a/include/shell/tde_headers.h b/include/shell/tde_headers.h
index ed3739e..221f679 100644
--- a/include/shell/tde_headers.h
+++ b/include/shell/tde_headers.h
@@ -1,27 +1,14 @@
/* -*- 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. 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
- * Timothy Pearson <kb9...@pearsoncomputing.net> (C) 2012, 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.
- *
- ************************************************************************/
+ * 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) 2012, Timothy Pearson <kb9...@pearsoncomputing.net>
+ */
#ifndef INCLUDED_VCL_TDE_HEADERS_H
#define INCLUDED_VCL_TDE_HEADERS_H
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index d3ff16b..89f2462 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -1,26 +1,13 @@
-/*************************************************************************
- * 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. 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
- * Timothy Pearson <kb9...@pearsoncomputing.net> (C) 2012, 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.
- *
- ************************************************************************/
+ * 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) 2012, Timothy Pearson <kb9...@pearsoncomputing.net>
+ */
#include "macros.inc"
diff --git a/scp2/source/tde/module_tde.ulf b/scp2/source/tde/module_tde.ulf
index 65b03ba..ba230d2 100644
--- a/scp2/source/tde/module_tde.ulf
+++ b/scp2/source/tde/module_tde.ulf
@@ -1,26 +1,13 @@
-/*************************************************************************
- * 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. 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
- * Timothy Pearson <kb9...@pearsoncomputing.net> (C) 2012, 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.
- *
- ************************************************************************/
+ * 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) 2012, Timothy Pearson <kb9...@pearsoncomputing.net>
+ */
[STR_NAME_MODULE_OPTIONAL_TDE]
en-US = "TDE Integration"
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index ea4ae1a..d21e318 100644
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -6,8 +6,6 @@
# 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 <aug...@gmail.com>
-#
$(eval $(call gb_CppunitTest_CppunitTest,svl_lngmisc))
diff --git a/svl/qa/unit/test_lngmisc.cxx b/svl/qa/unit/test_lngmisc.cxx
index 0a69856..0033d03 100644
--- a/svl/qa/unit/test_lngmisc.cxx
+++ b/svl/qa/unit/test_lngmisc.cxx
@@ -6,9 +6,6 @@
* 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 <aug...@gmail.com>
- */
#include <sal/types.h>
#include "cppunit/TestAssert.h"
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 4b1954f..931cdd3 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -1,28 +1,13 @@
# -*- 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. 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.
+# Copyright (C) 2012, Timothy Pearson <kb9...@pearsoncomputing.net>
#
-# The Initial Developer of the Original Code is
-# Timothy Pearson <kb9...@pearsoncomputing.net> (C) 2012, 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,vclplug_tde))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
