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, 18 insertions, 27 deletions

diff --git a/officecfg/util/component-ldif.gen b/officecfg/util/component-ldif.gen
index 4b0fffeaa563..db26e31a35ee 100755
--- a/officecfg/util/component-ldif.gen
+++ b/officecfg/util/component-ldif.gen
@@ -1,30 +1,21 @@
 : # -*- perl -*-
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# 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 is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# 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.
+#   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 .
 #
-# 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.
-#
-#*************************************************************************
 
 # generates of the component schema list an ldap schema in ldif format
 
@@ -42,14 +33,14 @@ $inxcs=0;
 #search all schemas in the makefile except userprofile and format them as e.g org.openoffice.Inet
 while(<INFILE>) {
 	tr/\r\n//d;
-	
+
 	if (/^\s*XCSFILES/) {
 		$inxcs++;
 	}
 	next unless $inxcs;
 
 	if ($inxcs) {
-		
+
 		$inxcs=0 unless /\\$/;
 
 		next if (/^\s*XCSFILES/);
@@ -57,17 +48,17 @@ while(<INFILE>) {
 
 		s/^\s+//;
 		s/\s*\\$//;
-		s/\.xcs.*$//;		
+		s/\.xcs.*$//;
 		s#\$/#.#g;
 
 		push(@comp_names, $_);
-	}	
+	}
 }
 close(INFILE);
 
 # generate the schema in ldif format
-foreach (@comp_names) {	
-		
+foreach (@comp_names) {
+
 	s#org.openoffice.#oo-#g;
 	s#\.#-#g;