[Libreoffice-commits] .: Branch 'libreoffice-3-3' - filter/source

Thorsten Behrens thorsten at kemper.freedesktop.org
Fri Nov 5 19:41:16 PDT 2010


 filter/source/svg/b2dellipse.cxx         |   30 +++++++++++++++++++----------
 filter/source/svg/b2dellipse.hxx         |   30 +++++++++++++++++++----------
 filter/source/svg/gentoken.pl            |   27 +++++++++++++++++++++++++-
 filter/source/svg/gfxtypes.hxx           |   30 +++++++++++++++++++----------
 filter/source/svg/parserfragments.cxx    |   30 +++++++++++++++++++----------
 filter/source/svg/parserfragments.hxx    |   30 +++++++++++++++++++----------
 filter/source/svg/spirit_supplements.hxx |   30 +++++++++++++++++++----------
 filter/source/svg/svgreader.cxx          |   31 +++++++++++++++++++-----------
 filter/source/svg/svgreader.hxx          |   30 +++++++++++++++++++----------
 filter/source/svg/test/parsertest.cxx    |   30 +++++++++++++++++++----------
 filter/source/svg/tokenmap.hxx           |   30 +++++++++++++++++++----------
 filter/source/svg/units.cxx              |   32 ++++++++++++++++++++-----------
 filter/source/svg/units.hxx              |   32 ++++++++++++++++++++-----------
 13 files changed, 268 insertions(+), 124 deletions(-)

New commits:
commit 015b1d82d9198a3947cba5dbb223c7f298f5d636
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Sat Nov 6 03:39:36 2010 +0100

    Relicense own-developed svg filter to ::std license
    (cherry picked from commit 5a2ac827b81c721e1d3ffb295896693f2986d992)

diff --git a/filter/source/svg/b2dellipse.cxx b/filter/source/svg/b2dellipse.cxx
index a20cb10..cb05168 100644
--- a/filter/source/svg/b2dellipse.cxx
+++ b/filter/source/svg/b2dellipse.cxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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.
+ */
 #include "b2dellipse.hxx"
 
 #include <osl/diagnose.h>
diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx
index a8e4e47..dda447d 100644
--- a/filter/source/svg/b2dellipse.hxx
+++ b/filter/source/svg/b2dellipse.hxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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 _BASEGFX_B2DELLIPSE_HXX
 #define _BASEGFX_B2DELLIPSE_HXX
 
diff --git a/filter/source/svg/gentoken.pl b/filter/source/svg/gentoken.pl
index 75bb1e2..9229fa7 100644
--- a/filter/source/svg/gentoken.pl
+++ b/filter/source/svg/gentoken.pl
@@ -1,4 +1,29 @@
-# from oox/source/token - should really put this into solenv
+#!/usr/bin/env perl
+#
+# 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/
+#
+# 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
+#       Thorsten Behrens <tbehrens at novell.com>
+# All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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.
+
 
 $ARGV0 = shift @ARGV;
 $ARGV1 = shift @ARGV;
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index 2b7187d..242888f 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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 INCLUDED_GFXTYPES_HXX
 #define INCLUDED_GFXTYPES_HXX
 
diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx
index 44e5fbb..a85de2f 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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_filter.hxx"
 
diff --git a/filter/source/svg/parserfragments.hxx b/filter/source/svg/parserfragments.hxx
index 8770d52..c32af71 100644
--- a/filter/source/svg/parserfragments.hxx
+++ b/filter/source/svg/parserfragments.hxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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 INCLUDED_PARSERFRAGMENTS_HXX
 #define INCLUDED_PARSERFRAGMENTS_HXX
 
diff --git a/filter/source/svg/spirit_supplements.hxx b/filter/source/svg/spirit_supplements.hxx
index afa97bf..968cdac 100644
--- a/filter/source/svg/spirit_supplements.hxx
+++ b/filter/source/svg/spirit_supplements.hxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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 INCLUDED_SPIRIT_SUPPLEMENTS_HXX
 #define INCLUDED_SPIRIT_SUPPLEMENTS_HXX
 
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index caa9cc0..60f7bf4 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1,20 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
- *      Parts copyright 2005 by Sun Microsystems, Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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_filter.hxx"
 
diff --git a/filter/source/svg/svgreader.hxx b/filter/source/svg/svgreader.hxx
index 232fc31..67318f3 100644
--- a/filter/source/svg/svgreader.hxx
+++ b/filter/source/svg/svgreader.hxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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 INCLUDED_SVGREADER_HXX
 #define INCLUDED_SVGREADER_HXX
 
diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx
index 024900c..89728fe 100644
--- a/filter/source/svg/test/parsertest.cxx
+++ b/filter/source/svg/test/parsertest.cxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 31.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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_filter.hxx"
 
diff --git a/filter/source/svg/tokenmap.hxx b/filter/source/svg/tokenmap.hxx
index 15a50ab..20a25d9 100644
--- a/filter/source/svg/tokenmap.hxx
+++ b/filter/source/svg/tokenmap.hxx
@@ -1,19 +1,29 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Fridrich Strba  <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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 INCLUDED_TOKENMAP_HXX
 #define INCLUDED_TOKENMAP_HXX
 
diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx
index af62a1c..96a810d 100644
--- a/filter/source/svg/units.cxx
+++ b/filter/source/svg/units.cxx
@@ -1,20 +1,30 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Jan Holesovsky   <kendy at suse.cz>
- *      Fridrich Strba   <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Jan Holesovsky   <kendy at suse.cz>
+ *       Fridrich Strba   <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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_filter.hxx"
 
diff --git a/filter/source/svg/units.hxx b/filter/source/svg/units.hxx
index d8c0364..9e6cd81 100644
--- a/filter/source/svg/units.hxx
+++ b/filter/source/svg/units.hxx
@@ -1,20 +1,30 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
  *
- *    OpenOffice.org - a multi-platform office productivity suite
+ * 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/
  *
- *    Author:
- *      Jan Holesovsky   <kendy at suse.cz>
- *      Fridrich Strba   <fridrich.strba at bluewin.ch>
- *      Thorsten Behrens <tbehrens at novell.com>
+ * 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) 2008, Novell Inc.
+ * The Initial Developer of the Original Code is
+ *       Jan Holesovsky   <kendy at suse.cz>
+ *       Fridrich Strba   <fridrich.strba at bluewin.ch>
+ *       Thorsten Behrens <tbehrens at novell.com>
  *
- *   The Contents of this file are made available subject to
- *   the terms of GNU Lesser General Public License Version 3.
+ * Contributor(s):
  *
- ************************************************************************/
-
+ * 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 INCLUDED_UNITS_HXX
 #define INCLUDED_UNITS_HXX
 


More information about the Libreoffice-commits mailing list