diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:14:05 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:14:05 +0200 |
commit | 4b5ea19aa23b5dbb675b74614fa1e7a2cc33f0e0 (patch) | |
tree | d33144cc3c63fd7e73168a81c38f6be300cda103 /connectivity/source/cpool/ZConnectionPool.hxx | |
parent | 648eb69046db96c3dd675543740a95859a0c4d02 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 6f4f1c964ff6ea166412285a4cc0ea9f98da499e (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:06 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit abdccb1813c5eb8d27bd7e7ee8a4731f8ca55fcf
Author: Andras Timar <atimar@suse.com>
Date: Mon May 30 00:07:50 2011 +0200
replace "seagull" icons to LibreOffice icons fdo#37617
Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
.../icons/hicolor/16x16/apps/printeradmin.png | Bin 963 -> 544 bytes
.../icons/hicolor/32x32/apps/printeradmin.png | Bin 2534 -> 1104 bytes
.../icons/hicolor/48x48/apps/printeradmin.png | Bin 4058 -> 1629 bytes
.../icons/locolor/16x16/apps/printeradmin.png | Bin 395 -> 532 bytes
.../icons/locolor/32x32/apps/printeradmin.png | Bin 618 -> 1126 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
commit 1a85a81e01b828881c09b76397dd06e121bbb824
Author: Andras Timar <atimar@suse.com>
Date: Tue May 24 12:05:59 2011 +0200
fdo#37001 - updated license information
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
readlicense_oo/html/THIRDPARTYLICENSEREADME.html |17724 ++++++++++------------
readlicense_oo/odt/LICENSE.odt | Bin 154001 -> 115146 bytes
readlicense_oo/txt/license.txt |11684 +++++++++------
3 files changed, 15007 insertions(+), 14401 deletions(-)
commit 2833c4cb4dc6c6def3d3cb3b134f22eda3a87207
Author: Michael Meeks <michael.meeks@novell.com>
Date: Fri Apr 1 15:55:42 2011 +0100
fix evolution local addressbook integration, which uses a new local: uri
.../source/drivers/evoab2/NDatabaseMetaData.cxx | 13 +++++++------
connectivity/source/drivers/evoab2/NResultSet.cxx | 3 ++-
2 files changed, 9 insertions(+), 7 deletions(-)
commit 71bf17ecbaa46780b112b6307aab879a088910fe
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Mar 29 18:59:05 2011 +0300
Don't pass potentially bogus file: URIs to libxml2
libxml2 doesn't understand our syntax for file: URIs in the case of
UNC paths. Fixes fdo#33970. Picked from OOo's fix for their issue
i#109096.
Signed-off-by: David Tardon <dtardon@redhat.com>
.../source/deployment/registry/dp_backenddb.cxx | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
commit 8424af3e1b69f00f442a5a49a964813ede2f09e7
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Fri Mar 18 13:18:58 2011 +0100
use full path for kdefilepicker helper binary (bnc#31109)
ack by pmladek
fpicker/source/unx/kde_unx/UnxFilePicker.cxx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
Notes
split repo tag: libs-core_libreoffice-3.3.3.1
split repo tag: libs-core_libreoffice-3.3.4.1
Diffstat (limited to 'connectivity/source/cpool/ZConnectionPool.hxx')
-rw-r--r-- | connectivity/source/cpool/ZConnectionPool.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 8c3de660c8a3..0df96c3fbdb0 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -64,7 +64,7 @@ namespace connectivity //= OConnectionPool - the one-instance service for PooledConnections //= manages the active connections and the connections in the pool //========================================================================== - typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base; + typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base; // typedef for the interanl structure typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> > TPooledConnections; @@ -72,8 +72,8 @@ namespace connectivity // contains the currently pooled connections typedef struct { - TPooledConnections aConnections; - sal_Int32 nALiveCount; // will be decremented everytime a time says to, when will reach zero the pool will be deleted + TPooledConnections aConnections; + sal_Int32 nALiveCount; // will be decremented everytime a time says to, when will reach zero the pool will be deleted } TConnectionPool; struct TDigestHolder @@ -86,7 +86,7 @@ namespace connectivity }; - // typedef TDigestHolder + // typedef TDigestHolder struct TDigestLess : public ::std::binary_function< TDigestHolder, TDigestHolder, bool> { @@ -113,17 +113,17 @@ namespace connectivity class OConnectionPool : public OConnectionPool_Base { - TConnectionMap m_aPool; // the pooled connections - TActiveConnectionMap m_aActiveConnections; // the currently active connections - - ::osl::Mutex m_aMutex; - ::rtl::Reference<OPoolTimer> m_xInvalidator; // invalidates the conntection pool when shot - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDriverNode; // config node entry - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; - sal_Int32 m_nTimeOut; - sal_Int32 m_nALiveCount; + TConnectionMap m_aPool; // the pooled connections + TActiveConnectionMap m_aActiveConnections; // the currently active connections + + ::osl::Mutex m_aMutex; + ::rtl::Reference<OPoolTimer> m_xInvalidator; // invalidates the conntection pool when shot + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDriverNode; // config node entry + ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; + sal_Int32 m_nTimeOut; + sal_Int32 m_nALiveCount; private: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const ::rtl::OUString& _rURL, |