From 907ba5e528225ea62404ab49e13821da4687f1d8 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 23 Mar 2012 20:47:22 +0000
Subject: match DB_ENV creation flags to DB creation flags

---
 desktop/source/deployment/dp_persmap.cxx | 6 ++++--
 desktop/source/deployment/misc/db.cxx    | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'desktop')

diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 7c505bbd75d2..9b794ad6b461 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -80,7 +80,8 @@ PersistentMap::~PersistentMap()
 PersistentMap::PersistentMap( OUString const & url )
     : m_db( 0 )
 {
-    try {
+    try
+    {
         rtl::OUString fileURL = expandUnoRcUrl(url);
         if ( File::getSystemPathFromFileURL( fileURL, m_sysPath ) != File::E_None )
             OSL_ASSERT( false );
@@ -94,7 +95,8 @@ PersistentMap::PersistentMap( OUString const & url )
         if (err != 0)
             throw_rtexc(err);
     }
-    catch (DbException & exc) {
+    catch (const DbException & exc)
+    {
         throw_rtexc( exc.get_errno(), exc.what() );
     }
 }
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index 98cfc0189887..42cd98744b51 100644
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
@@ -81,7 +81,8 @@ namespace
         if (pSharedEnv == NULL)
         {
             db_env_create(&pSharedEnv, 0);
-            pSharedEnv->open(pSharedEnv, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
+            // xxx todo: DB_THREAD currently not used
+            pSharedEnv->open(pSharedEnv, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE /*| DB_THREAD*/, 0);
         }
         ++nSharedEnv;
         return pSharedEnv;
-- 
cgit