diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:08:13 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:08:13 +0200 |
commit | 3bb01d6eda13bf1b4a538a24707605153fe4e37e (patch) | |
tree | 65089ad2a2c6268e4c4ffc753ae2374bd2169089 /mysqlc/source/mysqlc_driver.cxx | |
parent | 1dd3ecc26716372f4e0aeb7578acfd997f125a61 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 8ad61991552caa3f97cc10dc468ce722f2a7217a (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:04 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 4e3b67b32df4df0f1afe0abe0c0dc9a56829986c
Author: Andras Timar <atimar@suse.com>
Date: Sun May 29 21:38:41 2011 +0200
l10n: add br, et, and tr to NLPSolver + fixes to fr and nb
nlpsolver/locale/NLPSolverCommon_bg.properties | 22 +++++++++++++++
nlpsolver/locale/NLPSolverCommon_et.properties | 22 +++++++++++++++
nlpsolver/locale/NLPSolverCommon_nb.properties | 2 +-
nlpsolver/locale/NLPSolverCommon_tr.properties | 22 +++++++++++++++
.../locale/NLPSolverStatusDialog_bg.properties | 28 ++++++++++++++++++++
.../locale/NLPSolverStatusDialog_et.properties | 28 ++++++++++++++++++++
.../locale/NLPSolverStatusDialog_fr.properties | 4 +-
.../locale/NLPSolverStatusDialog_tr.properties | 28 ++++++++++++++++++++
8 files changed, 153 insertions(+), 3 deletions(-)
Notes
split repo tag: extensions_libreoffice-3.3.3.1
split repo tag: extensions_libreoffice-3.3.4.1
Diffstat (limited to 'mysqlc/source/mysqlc_driver.cxx')
-rw-r--r-- | mysqlc/source/mysqlc_driver.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 6b77cd94b2e2..1d4d27890dc7 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -1,7 +1,7 @@ /* -*- 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 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ void MysqlCDriver::disposing() { OSL_TRACE("MysqlCDriver::disposing"); ::osl::MutexGuard aGuard(m_aMutex); - + // when driver will be destroied so all our connections have to be destroied as well for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { @@ -99,7 +99,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static() throw(RuntimeException) { OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static"); - // which service is supported + // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< OUString > aSNS(1); aSNS[0] = OUString::createFromAscii("com.sun.star.sdbc.Driver"); @@ -231,7 +231,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con } catch (sql::SQLException &e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding()); + mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding()); } return xConn; } @@ -312,7 +312,7 @@ Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< X /* {{{ connectivity::mysqlc::release() -I- */ void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, - Reference< XInterface >& _xInterface, + Reference< XInterface >& _xInterface, ::com::sun::star::lang::XComponent* _pObject) { if (osl_decrementInterlockedCount(&_refCount) == 0) { |