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, 0 insertions, 141 deletions

diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
deleted file mode 100644
index f996fbb2764f..000000000000
--- a/desktop/source/deployment/inc/db.hxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- 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.
- *
- * 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.
- *
- ************************************************************************/
-#ifndef BERKELEYDBPROXY_DB_HXX_
-#define BERKELEYDBPROXY_DB_HXX_
-
-#include <boost/noncopyable.hpp>
-
-#ifdef SYSTEM_DB_HEADER
-#include SYSTEM_DB_HEADER
-#else
-#include <berkeleydb/db.h>
-#endif
-
-#include <rtl/string.hxx>
-#include "dp_misc_api.hxx"
-
-extern "C" {
-  typedef void *(*db_malloc_fcn_type)(size_t);
-  typedef void *(*db_realloc_fcn_type)(void *, size_t);
-  typedef void (*db_free_fcn_type)(void *);
-}
-
-namespace berkeleydbproxy {
-
-    class Dbc;
-    class Dbt;
-
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbException
-    {
-        rtl::OString what_;
-    public:
-        explicit DbException(rtl::OString const & theWhat)
-        : what_(theWhat)
-        {}
-
-        const char *what() const
-        { return what_.getStr(); }
-        int get_errno() const
-        { return 0; }
-    };
-
-
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : boost::noncopyable
-    {
-    public:
-        static char *strerror(int);
-    };
-
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : boost::noncopyable
-    {
-    private:
-        DB* m_pDBP;
-
-    public:
-        Db(u_int32_t flags);
-        ~Db();
-
-        int close(u_int32_t flags);
-
-        int open(DB_TXN *txnid,
-                 const char *file,
-                 const char *database,
-                 DBTYPE type,
-                 u_int32_t flags,
-                 int mode);
-
-        int sync(u_int32_t flags);
-        int del(Dbt *key, u_int32_t flags);
-
-        int get(DB_TXN* txnid, Dbt *key, Dbt *data, u_int32_t flags);
-        int put(DB_TXN* txnid, Dbt *key, Dbt *data, u_int32_t flags);
-
-        int cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags);
-    };
-
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : boost::noncopyable
-    {
-        friend class Db;
-        friend class Dbt;
-
-    private:
-        DBC* m_pDBC;
-
-        SAL_DLLPRIVATE explicit Dbc(DBC* pDBC);
-        SAL_DLLPRIVATE ~Dbc();
-
-    public:
-        int close();
-
-        int get(Dbt *key, Dbt *data, u_int32_t flags);
-    };
-
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbt: private DBT
-    {
-        friend class Db;
-        friend class Dbc;
-
-    public:
-        Dbt(void *data_arg, u_int32_t size_arg);
-
-        Dbt();
-        Dbt(const Dbt & other);
-        Dbt & operator=(const Dbt & other);
-
-        ~Dbt();
-
-          void *get_data() const;
-        void set_data(void *value);
-
-          u_int32_t get_size() const;
-        void set_size(u_int32_t value);
-    };
-}
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */