re-base on ALv2 code. Includes:

Patch contributed by Herbert Duerr:
#i118662# remove berkeleyDB from module xmlhelp (author=orwitt)
http://svn.apache.org/viewvc?view=revision&revision=1213188
#i119141# remove ISCII converter for now
http://svn.apache.org/viewvc?view=revision&revision=1306246
make exceptions for cppunittester verbose
http://svn.apache.org/viewvc?view=revision&revision=1174831

Patches contributed by Pedro Giffuni:
Avoid some uses of non portable #!/bin/bash in shell scripts.
http://svn.apache.org/viewvc?view=revision&revision=1235297

Patch contributed by Oliver-Rainer Wittmann
88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585

drop OS/2 code, remove in-line assembler ARM atomics,
and obsolete armarch header.

1 files changed, 22 insertions, 31 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 1afcdba26011..9961cfee2f18 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.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 _DATABASES_HXX_
 #define _DATABASES_HXX_
@@ -52,9 +43,9 @@
 // Forward declaration
 
 
-namespace berkeleydbproxy {
+namespace helpdatafileproxy {
 
-    class Db;
+    class Hdf;
 
 }
 
@@ -118,7 +109,7 @@ namespace chelp {
         public:
 
             KeywordElement( Databases* pDatabases,
-                            berkeleydbproxy::Db* pDb,
+                            helpdatafileproxy::Hdf* pHdf,
                             rtl::OUString& key,
                             rtl::OUString& ids );
 
@@ -129,7 +120,7 @@ namespace chelp {
             com::sun::star::uno::Sequence< rtl::OUString > listAnchor;
             com::sun::star::uno::Sequence< rtl::OUString > listTitle;
 
-            void init( Databases *pDatabases,berkeleydbproxy::Db* pDb,const rtl::OUString& ids );
+            void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const rtl::OUString& ids );
         };
 
 
@@ -205,7 +196,7 @@ namespace chelp {
         KeywordInfo* getKeyword( const rtl::OUString& Module,
                                  const rtl::OUString& Language );
 
-        berkeleydbproxy::Db* getBerkeley( const rtl::OUString& Module,
+        helpdatafileproxy::Hdf* getHelpDataFile( const rtl::OUString& Module,
                          const rtl::OUString& Language, bool helpText = false,
                          const rtl::OUString* pExtensionPath = NULL );
 
@@ -327,7 +318,7 @@ namespace chelp {
 
         std::vector< rtl::OUString >    m_avModules;
 
-        typedef boost::unordered_map< rtl::OUString,berkeleydbproxy::Db*,ha,eq >   DatabasesTable;
+        typedef boost::unordered_map< rtl::OUString,helpdatafileproxy::Hdf*,ha,eq >   DatabasesTable;
         DatabasesTable m_aDatabases;         // Language and module dependent databases
 
         typedef  boost::unordered_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable;
@@ -481,11 +472,11 @@ namespace chelp {
                 , m_bHelpText( bHelpText )
         {}
 
-        berkeleydbproxy::Db* nextDb( rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL );
+        helpdatafileproxy::Hdf* nextHdf( rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL );
 
 
     private:
-        berkeleydbproxy::Db* implGetDbFromPackage(
+        helpdatafileproxy::Hdf* implGetHdfFromPackage(
             com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage,
             rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath );