From c73745117d7ce0dc6020020b49120ef3ba350e78 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Wed, 26 Sep 2012 15:07:16 +0100
Subject: re-base on ALv2 code. Includes:

    linecap: Reintegrating finished LineCap feature
    Work contributed by Regina Henschel
    http://svn.apache.org/viewvc?view=revision&revision=1232507

    i118815 - Deprecate service due to removed implementation
    Patch contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1233320

    i118814 - Allow set timeout in Mail API
    Patch contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1235679

    included in the Apache baseline:
    dr80: #i117511# remove some assertions in xlsx/xlsb import filters
    Patch contributed by Daniel Rentz
---
 offapi/util/checknewapi.pl | 19 +++++++++++++++++--
 offapi/util/regfilter.sed  |  2 --
 2 files changed, 17 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 offapi/util/checknewapi.pl
 delete mode 100644 offapi/util/regfilter.sed

(limited to 'offapi/util')

diff --git a/offapi/util/checknewapi.pl b/offapi/util/checknewapi.pl
old mode 100755
new mode 100644
index de7866f69716..99cfb1bd5019
--- a/offapi/util/checknewapi.pl
+++ b/offapi/util/checknewapi.pl
@@ -1,10 +1,25 @@
 #
+# This file is part of the LibreOffice project.
+#
+# 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/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+#
+#
 # checknewapi - a perl script to check for new API's
 # using two outputs from regview and dump the interscetion
 # of new types
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
 
 if($#ARGV != 3)
 {
diff --git a/offapi/util/regfilter.sed b/offapi/util/regfilter.sed
deleted file mode 100644
index 1c3069b19836..000000000000
--- a/offapi/util/regfilter.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-/ com::sun::star::i18n::/d
-/ com::sun::star::linguistic2::XLinguServiceManager/d
-- 
cgit