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.

14 files changed, 344 insertions, 419 deletions

diff --git a/ucb/source/ucp/odma/odma.h b/ucb/source/ucp/odma/odma.h
index f59dcca6f3c3..c75f21c844af 100644
--- a/ucb/source/ucp/odma/odma.h
+++ b/ucb/source/ucp/odma/odma.h
@@ -1,6 +1,49 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* odma.h - Definitions, prototypes, etc. for Open Document Managment API
     (ODMA) version 2.0.
+               OPEN DOCUMENT MANAGEMENT API LICENSE 1.0
+
+                 ODMA 2.0 SPECIFICATIONS AND SOFTWARE
+                 ------------------------------------
+
+               Copyright � 1994-1998 AIIM International
+
+LICENSE:
+
+    Redistribution and use in source and binary forms, with or
+    without modifications, are permitted provided that the
+    following conditions are met:
+
+      * Redistributions of source code must retain the above
+        copyright notice, this list of conditions and the
+        following disclaimer.
+
+      * Redistributions in binary form must reproduce the
+        above copyright notice, this list of conditions and
+        the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+
+      * Neither the name of AIIM International nor the names
+        of its contributors may be used to endorse or promote
+        products derived from this software without specific
+        prior written permission.
+
+DISCLAIMER:
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+    CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
 
     COPYRIGHT (C) 1994, 1995
     AIIM International
@@ -16,201 +59,201 @@ typedef LPSTR (*ODMSAVEASCALLBACK)(DWORD dwEnvData, LPSTR lpszFormat, LPVOID pIn
 typedef int ODMSTATUS;
 
 /* Constants */
-#define ODM_API_VERSION         200     /* Version of the API */
+#define ODM_API_VERSION            200        /* Version of the API */
 
 #ifdef WIN32
-    #define ODM_DOCID_MAX       255     /* Win32 */
+    #define ODM_DOCID_MAX        255        /* Win32 */
 
 #elif defined( _WINDOWS_ ) || defined( _MSDOS )
-    #define ODM_DOCID_MAX       80      /* Windows 3.x */
+    #define ODM_DOCID_MAX        80        /* Windows 3.x */
 
 #else
-    #define ODM_DOCID_MAX       255     /* Other platforms */
+    #define ODM_DOCID_MAX        255        /* Other platforms */
 #endif
 
-#define ODM_DMSID_MAX           9       /* Max length of a DMS ID including the
-                                           terminating NULL character.  */
+#define ODM_DMSID_MAX            9        /* Max length of a DMS ID including the
+                               terminating NULL character.  */
 
-#define ODM_APPID_MAX           16      /* Max length of a application ID including
-                                           the terminating NULL character.  */
+#define ODM_APPID_MAX            16        /* Max length of a application ID including
+                               the terminating NULL character.  */
 
 // ODMA 2.0
-#define ODM_QUERYID_MAX         255     // Max length of a query ID including
+#define ODM_QUERYID_MAX            255        // Max length of a query ID including
                                                     // the terminating NULL character.
 
-#define ODM_FORMAT_MAX          81 // Max length of a format including
+#define ODM_FORMAT_MAX            81 // Max length of a format including
                                                     // the terminating NULL character.
 
 // Maximum length of a filename returned by ODMA including the terminating
-//  NULL character.  Platform dependent.
+//    NULL character.  Platform dependent.
 
 #ifdef WIN32
-    #define ODM_FILENAME_MAX    255     /* Win32 */
+    #define ODM_FILENAME_MAX    255        /* Win32 */
 
 #elif defined( _WINDOWS_ ) || defined( _MSDOS )
-    #define ODM_FILENAME_MAX    128     /* Windows 3.x */
+    #define ODM_FILENAME_MAX    128        /* Windows 3.x */
 
 #elif defined( unix ) || defined( _UNIX )
     #define ODM_FILENAME_MAX    1024    /* Unix */
 
 #else
-    #define ODM_FILENAME_MAX    255     /* Other platforms */
+    #define ODM_FILENAME_MAX    255        /* Other platforms */
 #endif
 
 
 /* Common format type names */
-#define ODM_FORMAT_TEXT "Text"
-#define ODM_FORMAT_RTF  "Rich text format"
-#define ODM_FORMAT_DCA  "DCA RFT"       /* IBM DCA Rich Format Text */
-#define ODM_FORMAT_TIFF "Tiff"
-#define ODM_FORMAT_GIF  "Gif"               /* Compuserve Graphics Interchange Format */
-#define ODM_FORMAT_BMP  "Windows bitmap"
-#define ODM_FORMAT_PCX  "PCX"
-#define ODM_FORMAT_CGM  "CGM"               /* Computer Graphics Metafile */
-#define ODM_FORMAT_EXE  "Executable file"
-#define ODM_FORMAT_PCL  "PCL"               /* HP Printer Control Language */
-#define ODM_FORMAT_PS   "PostScript"
+#define ODM_FORMAT_TEXT    "Text"
+#define ODM_FORMAT_RTF    "Rich text format"
+#define ODM_FORMAT_DCA    "DCA RFT"        /* IBM DCA Rich Format Text */
+#define ODM_FORMAT_TIFF    "Tiff"
+#define ODM_FORMAT_GIF    "Gif"                /* Compuserve Graphics Interchange Format */
+#define ODM_FORMAT_BMP    "Windows bitmap"
+#define ODM_FORMAT_PCX    "PCX"
+#define ODM_FORMAT_CGM    "CGM"                /* Computer Graphics Metafile */
+#define ODM_FORMAT_EXE    "Executable file"
+#define ODM_FORMAT_PCL    "PCL"                /* HP Printer Control Language */
+#define ODM_FORMAT_PS    "PostScript"
 
 
 /* Error returns */
-#define ODM_SUCCESS         0       // Success!
-#define ODM_E_FAIL          1       /* Unspecified failure */
-#define ODM_E_CANCEL        2       /* Action was cancelled at user's request */
-#define ODM_E_NODMS         3       /* DMS not registered */
-#define ODM_E_CANTINIT      4       /* DMS failed to initalize */
-#define ODM_E_VERSION       5       /* DMS doesn't support the requested
+#define ODM_SUCCESS            0        // Success!
+#define ODM_E_FAIL            1        /* Unspecified failure */
+#define ODM_E_CANCEL        2        /* Action was cancelled at user's request */
+#define ODM_E_NODMS            3        /* DMS not registered */
+#define ODM_E_CANTINIT        4        /* DMS failed to initalize */
+#define ODM_E_VERSION        5        /* DMS doesn't support the requested
                                                version of ODMA */
-#define ODM_E_APPSELECT     6        /* User has indicated that he wants to use
+#define ODM_E_APPSELECT        6        /* User has indicated that he wants to use
                                        the application's file selection
                                        capabilities rather than those of the
                                        DMS. */
-#define ODM_E_USERINT       7        /* Requested action cannot be performed
+#define ODM_E_USERINT        7        /* Requested action cannot be performed
                                        without user interaction, but silent
                                        mode was specified. */
 #define ODM_E_HANDLE        8        /* The DMHANDLE argument was invalid. */
 #define ODM_E_ACCESS        9        /* User does not have requested access
                                        rights to specified document. */
-#define ODM_E_INUSE         10        /* Document is currently in use and cannot
+#define ODM_E_INUSE            10        /* Document is currently in use and cannot
                                        be accessed in specified mode. */
-#define ODM_E_DOCID         11        /* Invalid document ID */
-#define ODM_E_OPENMODE      12        /* The specified action is incompatible
+#define ODM_E_DOCID            11        /* Invalid document ID */
+#define ODM_E_OPENMODE        12        /* The specified action is incompatible
                                        with the mode in which the document was
                                        opened. */
 #define ODM_E_NOOPEN        13        /* The specified document is not open. */
-#define ODM_E_ITEM          14        /* Invalid item specifier. */
-#define ODM_E_OTHERAPP      15        /* Selected document was for another app. */
-#define ODM_E_NOMOREDATA    16      /* No more data is available */
-#define ODM_E_PARTIALSUCCESS 17     /* */
+#define ODM_E_ITEM            14        /* Invalid item specifier. */
+#define ODM_E_OTHERAPP        15        /* Selected document was for another app. */
+#define ODM_E_NOMOREDATA    16        /* No more data is available */
+#define ODM_E_PARTIALSUCCESS 17        /* */
 // Additional Error code from ODMA 2.0
-#define ODM_E_REQARG        18      /* */
-#define ODM_E_NOSUPPORT     19      /* */
-#define ODM_E_TRUNCATED     20      /* */
+#define ODM_E_REQARG        18        /* */
+#define ODM_E_NOSUPPORT        19        /* */
+#define ODM_E_TRUNCATED        20        /* */
 #define ODM_E_INVARG  21
-#define ODM_E_OFFLINE  22       /* */
+#define ODM_E_OFFLINE  22        /* */
 
 
 // ODMOpenDoc modes
-#define ODM_MODIFYMODE      1        /* Open document in a modifiable mode. */
+#define ODM_MODIFYMODE        1        /* Open document in a modifiable mode. */
 #define ODM_VIEWMODE        2        /* Open document in non-modifiable mode. */
 // ODMA 2.0
-#define ODM_REFCOPY         3
+#define ODM_REFCOPY            3
 
 
 // Actions for ODMActivate
-#define ODM_NONE            0        /* No specific action is requested.  */
-#define ODM_DELETE          1        /* Delete the specified document.  */
-#define ODM_SHOWATTRIBUTES  2        /* Display the specified document's profile
-                                       or attributes. */
-#define ODM_EDITATTRIBUTES  3        /* Edit the specified document's profile or
-                                       attributes. */
-#define ODM_VIEWDOC         4        /* Display the specified document in a
-                                       viewer window. */
-#define ODM_OPENDOC         5        /* Open the specified document in its
-                                       native application.  */
+#define ODM_NONE              0        /* No specific action is requested.  */
+#define ODM_DELETE            1        /* Delete the specified document.  */
+#define ODM_SHOWATTRIBUTES    2        /* Display the specified document's profile
+                                          or attributes. */
+#define ODM_EDITATTRIBUTES    3        /* Edit the specified document's profile or
+                                          attributes. */
+#define ODM_VIEWDOC           4        /* Display the specified document in a
+                                          viewer window. */
+#define ODM_OPENDOC           5        /* Open the specified document in its
+                                          native application.  */
 // ODMA 2.0
-#define ODM_NEWDOC          6
-#define ODM_CHECKOUT        7
-#define ODM_CANCELCHECKOUT  8
-#define ODM_CHECKIN         9
-#define ODM_SHOWHISTORY     10
+#define ODM_NEWDOC            6
+#define ODM_CHECKOUT          7
+#define ODM_CANCELCHECKOUT    8
+#define ODM_CHECKIN           9
+#define ODM_SHOWHISTORY      10
 
 
 // Item selectors for ODMGetDocInfo and ODMSetDocInfo
-#define ODM_AUTHOR          1        /* Author of the document. */
-#define ODM_NAME            2        /* Descriptive name of the document.  */
-#define ODM_TYPE            3        /* Type of the document.  */
-#define ODM_TITLETEXT       4        /* Suggested text to display in the
-                                       document window's title bar. */
-#define ODM_DMS_DEFINED     5        /* DMS defined data. */
-#define ODM_CONTENTFORMAT   6        /* String describing document's format */
+#define ODM_AUTHOR            1         /* Author of the document. */
+#define ODM_NAME            2           /* Descriptive name of the document.  */
+#define ODM_TYPE            3           /* Type of the document.  */
+#define ODM_TITLETEXT        4          /* Suggested text to display in the
+                                           document window's title bar. */
+#define ODM_DMS_DEFINED        5        /* DMS defined data. */
+#define ODM_CONTENTFORMAT    6          /* String describing document's format */
 // ODMA 2.0
 #define ODM_ALTERNATE_RENDERINGS    7
 #define ODM_CHECKEDOUTBY    8
-#define ODM_CHECKOUTCOMMENT 9
+#define ODM_CHECKOUTCOMMENT    9
 #define ODM_CHECKOUTDATE    10
-#define ODM_CREATEDBY       11
-#define ODM_CREATEDDATE     12
+#define ODM_CREATEDBY        11
+#define ODM_CREATEDDATE        12
 #define ODM_DOCID_LATEST    13
-#define ODM_DOCID_RELEASED  14
-#define ODM_DOCVERSION      15
-#define ODM_DOCVERSION_LATEST   16
-#define ODM_DOCVERSION_RELEASED 17
+#define ODM_DOCID_RELEASED    14
+#define ODM_DOCVERSION        15
+#define ODM_DOCVERSION_LATEST    16
+#define ODM_DOCVERSION_RELEASED    17
 #define ODM_LOCATION        18
 #define ODM_KEYWORDS        19
-#define ODM_LASTCHECKINBY   20
-#define ODM_LASTCHECKINDATE 21
-#define ODM_MODIFYDATE      22
-#define ODM_MODIFYDATE_LATEST   23
-#define ODM_MODIFYDATE_RELEASED 24
-#define ODM_OWNER           25
-#define ODM_SUBJECT         26
+#define ODM_LASTCHECKINBY    20
+#define ODM_LASTCHECKINDATE    21
+#define ODM_MODIFYDATE        22
+#define ODM_MODIFYDATE_LATEST    23
+#define ODM_MODIFYDATE_RELEASED    24
+#define ODM_OWNER            25
+#define ODM_SUBJECT            26
 #define ODM_TITLETEXT_RO    27
-#define ODM_URL             28
+#define ODM_URL                28
 
 
 // Item selectors for ODMQueryCapability ODMA 2.0
-#define ODM_QC_ACTIVATE             1
-#define ODM_QC_CLOSEDOC             2
-#define ODM_QC_CLOSEDOCEX           3
-#define ODM_QC_GETALTERNATECONTENT  4
-#define ODM_QC_GETDMSINFO           5
-#define ODM_QC_GETDOCINFO           6
-#define ODM_QC_GETDOCRELATION       7
-#define ODM_QC_GETLEADMONIKER       8
-#define ODM_QC_NEWDOC               9
-#define ODM_QC_OPENDOC              10
-#define ODM_QC_QUERYCLOSE           11
-#define ODM_QC_QUERYEXECUTE         12
-#define ODM_QC_QUERYGETRESULTS      13
-#define ODM_QC_SAVEAS               14
-#define ODM_QC_SAVEASEX             15
-#define ODM_QC_SAVEDOC              16
+#define ODM_QC_ACTIVATE                1
+#define ODM_QC_CLOSEDOC                2
+#define ODM_QC_CLOSEDOCEX            3
+#define ODM_QC_GETALTERNATECONTENT    4
+#define ODM_QC_GETDMSINFO            5
+#define ODM_QC_GETDOCINFO            6
+#define ODM_QC_GETDOCRELATION        7
+#define ODM_QC_GETLEADMONIKER        8
+#define ODM_QC_NEWDOC                9
+#define ODM_QC_OPENDOC                10
+#define ODM_QC_QUERYCLOSE            11
+#define ODM_QC_QUERYEXECUTE            12
+#define ODM_QC_QUERYGETRESULTS        13
+#define ODM_QC_SAVEAS                14
+#define ODM_QC_SAVEASEX                15
+#define ODM_QC_SAVEDOC                16
 #define ODM_QC_SAVEDOCEX            17
 #define ODM_QC_SELECTDOC            18
-#define ODM_QC_SELECTDOCEX          19
-#define ODM_QC_SETALTERNATECONTENT  20
-#define ODM_QC_SETDOCEVENT          21
-#define ODM_QC_SETDOCRELATION       22
-#define ODM_QC_SETDOCINFO           23
+#define ODM_QC_SELECTDOCEX            19
+#define ODM_QC_SETALTERNATECONTENT    20
+#define ODM_QC_SETDOCEVENT            21
+#define ODM_QC_SETDOCRELATION        22
+#define ODM_QC_SETDOCINFO            23
 
 
 // Misc. modes, flags
-#define ODM_SILENT          16        /* Don't interact with the user while
-                                       fulfilling this request. */
+#define ODM_SILENT            16        /* Don't interact with the user while
+                                           fulfilling this request. */
 //ODMA 2.0
-#define ODM_VERSION_SAME    1
-#define ODM_VERSION_MAJOR   2
-#define ODM_VERSION_MINOR   4
-#define ODM_VERSION_CHANGED 8
-#define ODM_ALT_DELETE      32
+#define ODM_VERSION_SAME       1
+#define ODM_VERSION_MAJOR      2
+#define ODM_VERSION_MINOR      4
+#define ODM_VERSION_CHANGED    8
+#define ODM_ALT_DELETE        32
 
 //ODMA 2.0 DMS Info Flags
-#define ODM_EXT_QUERY       1
-#define ODM_EXT_WORKFLOW    2
+#define ODM_EXT_QUERY        1
+#define ODM_EXT_WORKFLOW     2
 
 // Flags for Query Interface
-#define ODM_ALL             1       // All DMS's should be searched
-#define ODM_SPECIFIC        2       // Only specific DMS's should be searched
+#define ODM_ALL              1       // All DMS's should be searched
+#define ODM_SPECIFIC        2        // Only specific DMS's should be searched
 
 
 // Function prototypes
@@ -282,7 +325,7 @@ ODMSTATUS WINAPI ODMSaveAsEx(ODMHANDLE odmHandle, LPSTR lpszDocId,
                             LPVOID pInstanceData, LPDWORD pdwFlags);
 
 ODMSTATUS WINAPI ODMSaveDocEx(ODMHANDLE odmHandle, LPSTR lpszDocId,
-                            LPSTR lpszNewDocId, LPDWORD pdwFlags);
+                            LPSTR lpszNewDocId,    LPDWORD pdwFlags);
 
 ODMSTATUS WINAPI ODMSelectDocEx(ODMHANDLE odmHandle, LPSTR lpszDocIds,
                             LPWORD pwDocIdsLen, LPWORD pwDocCount, LPDWORD pdwFlags,
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index 5ca37c71461f..4c1269e36344 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 
 #include <osl/diagnose.h>
diff --git a/ucb/source/ucp/odma/odma_content.hxx b/ucb/source/ucp/odma/odma_content.hxx
index 8f9052efe5e2..1741d11c742e 100644
--- a/ucb/source/ucp/odma/odma_content.hxx
+++ b/ucb/source/ucp/odma/odma_content.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 #ifndef ODMA_CONTENT_HXX
 #define ODMA_CONTENT_HXX
diff --git a/ucb/source/ucp/odma/odma_contentcaps.cxx b/ucb/source/ucp/odma/odma_contentcaps.cxx
index 29fa2301c127..b27c920d188a 100644
--- a/ucb/source/ucp/odma/odma_contentcaps.cxx
+++ b/ucb/source/ucp/odma/odma_contentcaps.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * 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).
+ * 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/.
  *
- * 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.
+ * 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 .
+ */
 
 
 #include <com/sun/star/beans/Property.hpp>
diff --git a/ucb/source/ucp/odma/odma_contentprops.hxx b/ucb/source/ucp/odma/odma_contentprops.hxx
index ba59f62e8f72..5b0aeba113a5 100644
--- a/ucb/source/ucp/odma/odma_contentprops.hxx
+++ b/ucb/source/ucp/odma/odma_contentprops.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 #ifndef ODMA_CONTENTPROPS_HXX
 #define ODMA_CONTENTPROPS_HXX
 
diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx
index 4516845ad4ca..b4ed1496a728 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * 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).
+ * 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/.
  *
- * 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.
+ * 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 .
+ */
 
 
 #ifdef WNT
diff --git a/ucb/source/ucp/odma/odma_inputstream.cxx b/ucb/source/ucp/odma/odma_inputstream.cxx
index 1dd96dfd31c7..839e5ccbb273 100644
--- a/ucb/source/ucp/odma/odma_inputstream.cxx
+++ b/ucb/source/ucp/odma/odma_inputstream.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 #include "com/sun/star/io/IOException.hpp"
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index 7fc8154d9f41..157fad76196b 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 #ifdef WNT
 #include <windows.h>
diff --git a/ucb/source/ucp/odma/odma_lib.hxx b/ucb/source/ucp/odma/odma_lib.hxx
index b11546417c29..e40f0c2d012e 100644
--- a/ucb/source/ucp/odma/odma_lib.hxx
+++ b/ucb/source/ucp/odma/odma_lib.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 #ifndef ODMA_LIB_HXX
 #define ODMA_LIB_HXX
 
diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx
index 4123c78ab4f5..8d47eb90c03b 100644
--- a/ucb/source/ucp/odma/odma_main.cxx
+++ b/ucb/source/ucp/odma/odma_main.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 
 #ifdef WNT
diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx
index 90a0d7309d36..b4d4eb9bd1a6 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 
 #ifdef WNT
diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx
index 7f99bbeccdb7..590e6b569d3c 100644
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_provider.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 #ifndef ODMA_PROVIDER_HXX
 #define ODMA_PROVIDER_HXX
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index 93d7d1f41246..e118e19d7b25 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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
- * only, as published by the Free Software Foundation.
- *
- * 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.
- *
- ************************************************************************/
+ *   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 .
+ */
 
 #ifdef WNT
 #include <windows.h>
diff --git a/ucb/source/ucp/odma/ucpodma1.component b/ucb/source/ucp/odma/ucpodma1.component
index 709ebea17d11..754e8ae98983 100644
--- a/ucb/source/ucp/odma/ucpodma1.component
+++ b/ucb/source/ucp/odma/ucpodma1.component
@@ -1,31 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* 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
-* only, as published by the Free Software Foundation.
-*
-* 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.
-*
-**********************************************************************-->
-
+<!--
+ * 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="ucpodma1"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.FileProvider">