diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-19 17:06:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-20 14:13:35 +0200 |
| commit | 809e2d33b45b54b4438a4c55aed93efd73d2aa49 (patch) | |
| tree | 27f4995f949f25e7f26b3ac94028cecf0624ecb8 /connectivity/source/drivers/postgresql/pq_xcolumn.cxx | |
| parent | f6add3f04bd5acc162ada79597a87398236f1320 (diff) | |
create comphelper::RefCountedMutex
and merge the two existing implementations of the idea - SotMutexHolder
from package and RefCountedMutex from connectivity
Change-Id: I87f09f359ac798cf934381a2c75225dab71dd43e
Reviewed-on: https://gerrit.libreoffice.org/38972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/drivers/postgresql/pq_xcolumn.cxx')
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_xcolumn.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index 5caf2d0f88af..bda0a88a0407 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -45,7 +45,7 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { -Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex, +Column::Column( const ::rtl::Reference< comphelper::RefCountedMutex > & refMutex, const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( @@ -60,13 +60,13 @@ Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex, Reference< XPropertySet > Column::createDataDescriptor( ) { ColumnDescriptor * pColumn = new ColumnDescriptor( - m_refMutex, m_conn, m_pSettings ); + m_xMutex, m_conn, m_pSettings ); pColumn->copyValuesFrom( this ); return Reference< XPropertySet > ( pColumn ); } ColumnDescriptor::ColumnDescriptor( - const ::rtl::Reference< RefCountedMutex > & refMutex, + const ::rtl::Reference< comphelper::RefCountedMutex > & refMutex, const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( @@ -81,7 +81,7 @@ ColumnDescriptor::ColumnDescriptor( Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) { ColumnDescriptor * pColumn = new ColumnDescriptor( - m_refMutex, m_conn, m_pSettings ); + m_xMutex, m_conn, m_pSettings ); pColumn->copyValuesFrom( this ); return Reference< XPropertySet > ( pColumn ); |