diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2010-10-08 10:26:23 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2010-10-08 10:27:25 +0200 |
commit | 2cfd3b8d42ed403e1a307252eed0e5b62c719a06 (patch) | |
tree | b3d023d2fb8298f93bded4bb92fba950e2225d8e | |
parent | 5ba8a3f904a9d96107ad97b33d4764296bd18690 (diff) |
Update license text of new files
Using license as per
http://www.freedesktop.org/wiki/Software/LibreOffice/LicenseHeader
-rw-r--r-- | svtools/inc/svtools/langhelp.hxx | 38 | ||||
-rw-r--r-- | svtools/source/misc/langhelp.cxx | 38 |
2 files changed, 38 insertions, 38 deletions
diff --git a/svtools/inc/svtools/langhelp.hxx b/svtools/inc/svtools/langhelp.hxx index 038941828aa0..d91c03e4c395 100644 --- a/svtools/inc/svtools/langhelp.hxx +++ b/svtools/inc/svtools/langhelp.hxx @@ -1,27 +1,27 @@ -/************************************************************************* +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * - * Copyright 2010 Novell, Inc. + * 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/ * - * OpenOffice.org - a multi-platform office productivity suite + * 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 file is part of OpenOffice.org. + * The Initial Developer of the Original Code is + * Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * or later, as published by the Free Software Foundation. + * Contributor(s): Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org 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 Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * 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. + */ #ifndef _SVTOOLS_LANGHELP_HXX_ #define _SVTOOLS_LANGHELP_HXX_ diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index cbda7f861273..6de51e023a26 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -1,27 +1,27 @@ -/************************************************************************* +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * - * Copyright 2010 Novell, Inc. + * 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/ * - * OpenOffice.org - a multi-platform office productivity suite + * 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 file is part of OpenOffice.org. + * The Initial Developer of the Original Code is + * Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * or later, as published by the Free Software Foundation. + * Contributor(s): Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org 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 Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * 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. + */ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" |