From 015b29b74aaf16f5bdf6a90f6e7d5c1d210fe281 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Thu, 4 Oct 2012 11:25:41 +0100
Subject: re-base on ALv2 code. Includes:

    clarify Option->Language UI option
    Patch contributed by Herbert Duerr
    http://svn.apache.org/viewvc?view=revision&revision=1173991

    cws mba34issues01: #i117712#: fix several resource errors introduced
    by IAccessible2 implementation
    Patch contributed by Mathias Bauer
    http://svn.apache.org/viewvc?view=revision&revision=1173991

    cws mba34issues01: #i117709#: add missing string resource
    Patch contributed by Mathias Bauer
    http://svn.apache.org/viewvc?view=revision&revision=1172348

    cws mba34issues01: #i117716#: fix missing resources my removing unused code
    Patch contributed by Mathias Bauer
    http://svn.apache.org/viewvc?view=revision&revision=1172345

    re-add Crystal, Tango, Oxygen icon theme listings.

    correct method signature
    Patch contributed by Jean-Louis 'Hans' Fuchs
    http://svn.apache.org/viewvc?view=revision&revision=1306725

    i#119063 - correct serf integration
    Patch contributed by Oliver-Rainer Wittmann
    http://svn.apache.org/viewvc?view=revision&revision=1300521

    i#119036 - adapt serf integration
           -- use transfer-encoding 'chunked' on HTTPS
           -- switch transfer-encoding between 'chunked' and none on 413 HTTP status code
           -- refactoring
           -- improve user experience of certification dialog - only shown once
    Patch contributed by Oliver-Rainer Wittmann
    http://svn.apache.org/viewvc?view=revision&revision=1299727

    118569: Use whole certification chain for verification.
    Patch contributed by Andre Fischer
    http://svn.apache.org/viewvc?view=revision&revision=1295493

    serf integration: improve credential input handling
    Patch contributed by Oliver-Rainer Wittmann
    http://svn.apache.org/viewvc?view=revision&revision=1294557

    warning-free ucb/source/ucp/webdav
    Patch contributed by Pavel Janik
    http://svn.apache.org/viewvc?view=revision&revision=1294086

    some refactoring to PROPPATCH and PROPFIND requests
    Patch contributed by Oliver-Rainer Wittmann
    http://svn.apache.org/viewvc?view=revision&revision=1293281

    i#118569: Replace neon with serf
    Patch contributed by Oliver-Rainer Wittmann
    http://svn.apache.org/viewvc?view=revision&revision=1292832
    http://svn.apache.org/viewvc?view=revision&revision=1292794

    remove OS/2 conditionals for now.

    re-enable webdav unit tests.
---
 cui/util/cui.component | 45 ++++++++++++++++-----------------------------
 cui/util/cui.map       | 17 +++++++++++++++++
 2 files changed, 33 insertions(+), 29 deletions(-)

(limited to 'cui/util')

diff --git a/cui/util/cui.component b/cui/util/cui.component
index ab1129353f13..158087f8f6fb 100644
--- a/cui/util/cui.component
+++ b/cui/util/cui.component
@@ -1,34 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- *
- * 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 or as specified alternatively below. 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
- *       Christian Lippka <cl@lippka.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Major Contributor(s):
- *
- *
- * For minor contributions see the git repository.
- *
- * 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 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 .
+-->
 
 <component loader="com.sun.star.loader.SharedLibrary" prefix="cui"
     xmlns="http://openoffice.org/2010/uno-components">
diff --git a/cui/util/cui.map b/cui/util/cui.map
index 5f35b1685aa2..f8eb4bb0924d 100644
--- a/cui/util/cui.map
+++ b/cui/util/cui.map
@@ -1,3 +1,20 @@
+#
+# 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 .
+#
 UDK_3_0_0 {
     global:
         CreateDialogFactory;
-- 
cgit v1.2.3