[Libreoffice-commits] .: 7 commits -
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Nov 12 06:53:31 PST 2010
0 files changed
New commits:
commit 3172c5029f025b9b2a4f36a21840805c06da33fe
Merge: c1687e4... 76431a0...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Nov 12 15:51:29 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/filters
commit c1687e450572a177ef95b797147fcfac98b6b7ed
Merge: 57dabc8... 630940f...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Nov 12 14:27:34 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
commit 630940fba49a62d6b91121af622339f4d1bb9ab5
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 11 13:24:57 2010 +0100
Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit 8a8fbb4c42c791aa82651793e42b309e7403ac8a
Author: Robert Nagy <robert at openbsd.org>
Date: Thu Nov 4 11:25:15 2010 +0100
include ieeefp.h on OpenBSD
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index f033459..99ed87c 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -40,7 +40,7 @@
#include <mac_end.h>
#endif
-#if defined (SOLARIS) || defined (FREEBSD)
+#if defined (SOLARIS) || defined (FREEBSD) || defined (OPENBSD)
#include <ieeefp.h>
#elif ( defined ( LINUX ) && ( GLIBC < 2 ) )
#include <i386/ieeefp.h>
commit 8a17d523779ed4bddca1ac9640c0f18ec5cfe3f9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Nov 8 00:11:35 2010 +0200
XOutputStream is a class, not a struct
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index d3cabe6..0451f2c 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -26,7 +26,7 @@ namespace text {
class XTextRange;
}
namespace io {
- struct XOutputStream;
+ class XOutputStream;
}
}}}
commit 0bd0c5de807d3ad146540708c7b736f26ade0d0a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Nov 7 09:53:39 2010 +0200
Fix breakage when building with --enable-dbgutil
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 1d07eba..524b728 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -218,7 +218,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
catch( uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
- OSL_ENSURE( false, OUStringToOString(
+ OSL_ENSURE( false, rtl::OUStringToOString(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
OUString::createFromAscii( typeid( ex ).name()) +
OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
@@ -354,7 +354,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
catch( uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
- OSL_ENSURE( false, OUStringToOString(
+ OSL_ENSURE( false, rtl::OUStringToOString(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
OUString::createFromAscii( typeid( ex ).name()) +
OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
@@ -374,7 +374,7 @@ OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const Reference< char
xDoc->getDataProvider(), uno::UNO_QUERY );
if( xConversion.is())
aResult = xConversion->convertRangeToXML( rRange );
- OSL_TRACE("lcl_ConvertRange, the originla formula is %s, the new formula is %s ", OUStringToOString( rRange, RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( aResult, RTL_TEXTENCODING_UTF8 ).getStr());
+ OSL_TRACE("lcl_ConvertRange, the originla formula is %s, the new formula is %s ", rtl::OUStringToOString( rRange, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aResult, RTL_TEXTENCODING_UTF8 ).getStr());
return aResult;
}
@@ -673,7 +673,7 @@ OUString ChartExport::parseFormula( const OUString& rRange )
aResult = aRange;
}
- OSL_TRACE("ChartExport::parseFormula, the originla formula is %s, the new formula is %s ", OUStringToOString( rRange, RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( aResult, RTL_TEXTENCODING_UTF8 ).getStr());
+ OSL_TRACE("ChartExport::parseFormula, the originla formula is %s, the new formula is %s ", rtl::OUStringToOString( rRange, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aResult, RTL_TEXTENCODING_UTF8 ).getStr());
return aResult;
}
@@ -831,7 +831,7 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha
catch( uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
- OSL_ENSURE( false, OUStringToOString(
+ OSL_ENSURE( false, rtl::OUStringToOString(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
OUString::createFromAscii( typeid( ex ).name()) +
OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
@@ -2645,7 +2645,7 @@ void ChartExport::exportDataPoints(
{
(void)rEx; // avoid warning for pro build
DBG_ERROR1( "Exception caught during Export of data point: %s",
- OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ rtl::OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
}
else
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