DbEnv argument is always NULL

3 files changed, 8 insertions, 13 deletions

diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index ca55e5fce2ff..7c505bbd75d2 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -78,7 +78,7 @@ PersistentMap::~PersistentMap()
 
 //______________________________________________________________________________
 PersistentMap::PersistentMap( OUString const & url )
-    : m_db( 0, 0 )
+    : m_db( 0 )
 {
     try {
         rtl::OUString fileURL = expandUnoRcUrl(url);
@@ -101,7 +101,7 @@ PersistentMap::PersistentMap( OUString const & url )
 
 //______________________________________________________________________________
 PersistentMap::PersistentMap()
-    : m_db( 0, 0 )
+    : m_db( 0 )
 {
     try {
         // xxx todo: DB_THREAD, DB_DBT_MALLOC currently not used
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index a2dd27df80b2..f996fbb2764f 100644
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
@@ -47,7 +47,6 @@ extern "C" {
 
 namespace berkeleydbproxy {
 
-    class DbEnv;
     class Dbc;
     class Dbt;
 
@@ -68,11 +67,6 @@ namespace berkeleydbproxy {
 
     class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : boost::noncopyable
     {
-        friend class Db;
-
-    private:
-        DB_ENV* m_pDBENV;
-
     public:
         static char *strerror(int);
     };
@@ -83,7 +77,7 @@ namespace berkeleydbproxy {
         DB* m_pDBP;
 
     public:
-        Db(DbEnv* dbbenv,u_int32_t flags);
+        Db(u_int32_t flags);
         ~Db();
 
         int close(u_int32_t flags);
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index 666bbcb9074f..45f91c7e4cf0 100644
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
@@ -49,16 +49,17 @@ namespace berkeleydbproxy {
 
 //----------------------------------------------------------------------------
 
-char *DbEnv::strerror(int error) {
+char *DbEnv::strerror(int error)
+{
     return (db_strerror(error));
 }
 
 //----------------------------------------------------------------------------
 
-Db::Db(DbEnv* pDbenv,u_int32_t flags)
-: m_pDBP(0)
+Db::Db(u_int32_t flags)
+    : m_pDBP(0)
 {
-    db_internal::check_error( db_create(&m_pDBP,pDbenv ? pDbenv->m_pDBENV:0,flags),"Db::Db" );
+    db_internal::check_error( db_create(&m_pDBP, NULL, flags),"Db::Db" );
 }