re-base on ALv2 code. Includes:

    Patch contributed by: Jurgen Schmidt
    remove onlineregistration with dependencies
    http://svn.apache.org/viewvc?view=revision&revision=1240245
    imported patch package_eventlistener.patch
    http://svn.apache.org/viewvc?view=revision&revision=1172103

    Patch contributed by Pedro Giffuni
    Accept Google Chrome OS fonts as equivalent to MS fonts.
    http://svn.apache.org/viewvc?view=revision&revision=1233155
    http://svn.apache.org/viewvc?view=revision&revision=1233408

    Patch contributed by Andre Fischer
    Do not add targets for junit tests when junit is disabled.
    http://svn.apache.org/viewvc?view=revision&revision=1241508

    Patches contributed by Mathias Bauer (and others)
    gnumake4 work variously
    http://svn.apache.org/viewvc?view=revision&revision=1394707
    http://svn.apache.org/viewvc?view=revision&revision=1394326
    cws mba34issues01: #i114600#: remove forbidden characters
    from list of unencoded characters
    http://svn.apache.org/viewvc?view=revision&revision=1172370

    Patches contributed by Oliver Rainer-Wittman
    some clean up in JPEGReader due to memory constraints
    http://svn.apache.org/viewvc?view=revision&revision=1299729
    119114 - method <UpdateDialog::addSpecificError(..)> - create
    entry with correct type
    http://svn.apache.org/viewvc?view=revision&revision=1305265

    Patches contributed by Ariel Constenla-Haile
    i118707 - make toolbar control's popup window grab focus
    http://svn.apache.org/viewvc?view=revision&revision=1225846

    Patches contributed by Herbert Duerr
    #i118662# remove usage of BerkeleyDB in desktop module
    http://svn.apache.org/viewvc?view=revision&revision=1213171
    minor cleanups in dp_persmap.*
    http://svn.apache.org/viewvc?view=revision&revision=1215064
    flush early to prevent problem with extension manager not
    cleaning up its objects
    http://svn.apache.org/viewvc?view=revision&revision=1228147
    i118726 do not flush *pmap file while reading it
    http://svn.apache.org/viewvc?view=revision&revision=1230614
    #i119048# migrate BDB extension entries using a simple heuristic
    http://svn.apache.org/viewvc?view=revision&revision=1300972
    #i119048# handle edge cases when importing BDB hash files
    http://svn.apache.org/viewvc?view=revision&revision=1301428
    #i119113# fix of-by-one when importing BDB files
    http://svn.apache.org/viewvc?view=revision&revision=1305420

restore our encryption settings, icon themes, and dictionaries.
removed wrapper hacks, kill obsolete bundled extension blob /
pre-registration handling, remove duplicated quickstart code.
remove OS/2 conditionals.

1 files changed, 21 insertions, 3 deletions

diff --git a/officecfg/registry/schema/oo-ldap-attr-map.properties b/officecfg/registry/schema/oo-ldap-attr-map.properties
index 684dfbdebfa3..0d4222da8e4c 100755
--- a/officecfg/registry/schema/oo-ldap-attr-map.properties
+++ b/officecfg/registry/schema/oo-ldap-attr-map.properties
@@ -1,3 +1,21 @@
+#
+# 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 .
+#
+
 # inetOrgPerson.givenName
 # x-no-translate
 org.openoffice.UserProfile/Data/givenname = givenname
@@ -9,7 +27,7 @@ org.openoffice.UserProfile/Data/sn = sn
 org.openoffice.UserProfile/Data/initials = initials
 
 # organizationalPerson.street
-org.openoffice.UserProfile/Data/street = street,postalAddress,streetAddress 
+org.openoffice.UserProfile/Data/street = street,postalAddress,streetAddress
 
 # organizationalPerson.l (city)
 org.openoffice.UserProfile/Data/l = l
@@ -21,7 +39,7 @@ org.openoffice.UserProfile/Data/st = st
 org.openoffice.UserProfile/Data/postalcode = postalcode
 
 # country.c (country)
-org.openoffice.UserProfile/Data/c = 
+org.openoffice.UserProfile/Data/c =
 
 # organizationalPerson.o (company)
 org.openoffice.UserProfile/Data/o = o,organizationName
@@ -35,7 +53,7 @@ org.openoffice.UserProfile/Data/title = title
 # inetOrgPerson.homePhone
 org.openoffice.UserProfile/Data/homephone = homephone
 
-# organizationalPerson.telephoneNumber 
+# organizationalPerson.telephoneNumber
 org.openoffice.UserProfile/Data/telephonenumber = telephonenumber
 
 # organizationalPerson.facsimileTelephoneNumber