summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/source/deployment/dp_persmap.cxx6
-rw-r--r--desktop/source/deployment/misc/db.cxx3
2 files changed, 6 insertions, 3 deletions
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;