[Libreoffice-commits] core.git: connectivity/source include/comphelper
connectivity/source/drivers/ado/AColumns.cxx |3 ++-
connectivity/source/drivers/ado/AGroups.cxx |3 ++-
connectivity/source/drivers/ado/AIndexes.cxx |3 ++-
connectivity/source/drivers/ado/AKeys.cxx|3 ++-
connectivity/source/drivers/ado/ATable.cxx |2 +-
connectivity/source/drivers/ado/ATables.cxx |3 ++-
connectivity/source/drivers/ado/AUsers.cxx |3 ++-
connectivity/source/drivers/ado/AViews.cxx |3 ++-
include/comphelper/types.hxx | 10 --
9 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit c1e1806c9c01d2ac2f62f95dd79cbb2037bc87af
Author: Arkadiy Illarionov
AuthorDate: Sat Sep 7 01:14:48 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Sat Sep 7 12:34:16 2019 +0200
tdf#39593 drop comphelper::getImplementation
Replace with comphelper::getUnoTunnelImplementation.
Change-Id: I96277aa9c17532ea6e2781dbc3305b2dbaa4e5c2
Reviewed-on: https://gerrit.libreoffice.org/78733
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/connectivity/source/drivers/ado/AColumns.cxx
b/connectivity/source/drivers/ado/AColumns.cxx
index ef010cfb4062..e9dc7720fc99 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -59,7 +60,7 @@ Reference< XPropertySet > OColumns::createDescriptor()
// XAppend
sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference<
XPropertySet >& descriptor )
{
-OAdoColumn* pColumn = getImplementation( descriptor );
+OAdoColumn* pColumn = getUnoTunnelImplementation( descriptor );
Reference< XPropertySet > xColumn;
if ( pColumn == nullptr )
{
diff --git a/connectivity/source/drivers/ado/AGroups.cxx
b/connectivity/source/drivers/ado/AGroups.cxx
index 506aead14f7d..211f34f6bebe 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -57,7 +58,7 @@ Reference< XPropertySet > OGroups::createDescriptor()
// XAppend
sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
-OAdoGroup* pGroup = getImplementation(descriptor);
+OAdoGroup* pGroup = getUnoTunnelImplementation(descriptor);
if ( pGroup == nullptr )
m_pCatalog->getConnection()->throwGenericSQLException(
STR_INVALID_GROUP_DESCRIPTOR_ERROR,static_cast(this) );
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx
b/connectivity/source/drivers/ado/AIndexes.cxx
index 46cd1c1a4b86..616cd863ada4 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -57,7 +58,7 @@ Reference< XPropertySet > OIndexes::createDescriptor()
// XAppend
sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
-OAdoIndex* pIndex = getImplementation(descriptor);
+OAdoIndex* pIndex = getUnoTunnelImplementation(descriptor);
if ( pIndex == nullptr )
m_pConnection->throwGenericSQLException(
STR_INVALID_INDEX_DESCRIPTOR_ERROR,static_cast(this) );
diff --git a/connectivity/source/drivers/ado/AKeys.cxx
b/connectivity/source/drivers/ado/AKeys.cxx
index e306f918a726..19027e79ffb6 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -57,7 +58,7 @@ Reference< XPropertySet > OKeys::createDescriptor()
// XAppend
sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference<
XPropertySet >& descriptor )
{
-OAdoKey* pKey = getImplementation( descriptor );
+OAdoKey* pKey = getUnoTunnelImplementation( descriptor );
if ( pKey == nullptr)
m_pConnection->throwGenericSQLException(
STR_INVALID_KEY_DESCRIPTOR_ERROR,static_cast(this) );
diff --git a/connectivity/source/drivers/ado/ATable.cxx
b/connectivity/source/drivers/ado/ATable.cxx
index 807dbb19055c..209255598476 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -164,7 +164,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString&
colName, const Refer
checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
bool bError = true;
-OAdoColumn* pColumn =
::comphelper::getImplementation(descriptor);
+OAdoColumn* pColumn =
comphelper::getUnoTunnelImplementation(descriptor);
if(pColumn != nullptr)
{
WpADOColumns aColumns = m_aTable.get_Columns();
diff --git a/connectivity/source/drivers/ado/ATables.cxx
b/connectivity/source/drivers/ado/ATables.cxx
[Libreoffice-commits] core.git: connectivity/source include/comphelper
connectivity/source/drivers/ado/AColumn.cxx|5 +++--
connectivity/source/drivers/ado/AConnection.cxx|5 +++--
connectivity/source/drivers/ado/ADriver.cxx|2 +-
connectivity/source/drivers/ado/AGroup.cxx |5 +++--
connectivity/source/drivers/ado/AIndex.cxx |5 +++--
connectivity/source/drivers/ado/AKey.cxx |5 +++--
connectivity/source/drivers/ado/ATable.cxx |5 +++--
connectivity/source/drivers/ado/AUser.cxx |5 +++--
connectivity/source/drivers/ado/AView.cxx |5 +++--
connectivity/source/drivers/dbase/DIndex.cxx |2 +-
connectivity/source/drivers/file/FDatabaseMetaData.cxx |2 +-
connectivity/source/drivers/file/FResultSet.cxx|7 ---
connectivity/source/drivers/file/FStatement.cxx|2 +-
connectivity/source/drivers/file/FTable.cxx|5 +++--
connectivity/source/inc/ado/AColumn.hxx|2 +-
connectivity/source/inc/ado/AConnection.hxx|2 +-
connectivity/source/inc/ado/AGroup.hxx |2 +-
connectivity/source/inc/ado/AIndex.hxx |2 +-
connectivity/source/inc/ado/AKey.hxx |2 +-
connectivity/source/inc/ado/ATable.hxx |2 +-
connectivity/source/inc/ado/AUser.hxx |2 +-
connectivity/source/inc/ado/AView.hxx |2 +-
connectivity/source/inc/file/FResultSet.hxx|2 +-
connectivity/source/inc/file/FTable.hxx|2 +-
include/comphelper/types.hxx |2 +-
25 files changed, 46 insertions(+), 36 deletions(-)
New commits:
commit 03747db026a5b4959ec0700d9addf0482e6f5977
Author: Arkadiy Illarionov
AuthorDate: Sat Sep 7 00:15:12 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Sat Sep 7 00:05:26 2019 +0200
tdf#39593 use isUnoTunnelId in connectivity
Change-Id: I458049e23e9fc1855cb4ba9519b9b940f170b024
Reviewed-on: https://gerrit.libreoffice.org/78732
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/connectivity/source/drivers/ado/AColumn.cxx
b/connectivity/source/drivers/ado/AColumn.cxx
index 236d758760d1..c7d5a5fce5c2 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -74,7 +75,7 @@ OAdoColumn::OAdoColumn(bool _bCase,OConnection* _pConnection)
}
-Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId()
+Sequence< sal_Int8 > OAdoColumn::getUnoTunnelId()
{
static ::cppu::OImplementationId implId;
@@ -85,7 +86,7 @@ Sequence< sal_Int8 >
OAdoColumn::getUnoTunnelImplementationId()
sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId )
{
-return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
+return isUnoTunnelId(rId)
? reinterpret_cast< sal_Int64 >( this )
: OColumn_ADO::getSomething(rId);
}
diff --git a/connectivity/source/drivers/ado/AConnection.cxx
b/connectivity/source/drivers/ado/AConnection.cxx
index 32e0bcd4d2b6..c9251a9be88b 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -487,14 +488,14 @@ void OConnection::disposing()
sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence<
sal_Int8 >& rId )
{
-return (rId.getLength() == 16 && 0 ==
memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16
) )
+return isUnoTunnelId(rId)
?
reinterpret_cast< sal_Int64 >( this )
:
OConnection_BASE::getSomething(rId);
}
-Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId()
+Sequence< sal_Int8 > OConnection::getUnoTunnelId()
{
static ::cppu::OImplementationId implId;
diff --git a/connectivity/source/drivers/ado/ADriver.cxx
b/connectivity/source/drivers/ado/ADriver.cxx
index d97d018bc202..eae5ee686996 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -199,7 +199,7 @@ Reference< XTablesSupplier > SAL_CALL
ODriver::getDataDefinitionByConnection( co
Reference< css::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY);
if(xTunnel.is())
{
-OConnection* pSearchConnection = reinterpret_cast< OConnection* >(
xTunnel->getSomething(OConnection::getUnoTunnelImplementationId()) );
+OConnection* pSearchConnection = reinterpret_cast< OConnection* >(
xTunnel->getSomething(OConnection::getUnoTunnelId()) );
auto foundConnection = std::any_of(m_xConnections.begin(),
m_xConnections.end(),
[&pSe
[Libreoffice-commits] core.git: connectivity/source include/comphelper
connectivity/source/drivers/ado/AColumns.cxx |4 ++--
connectivity/source/drivers/ado/AGroups.cxx |4 ++--
connectivity/source/drivers/ado/AIndexes.cxx |4 ++--
connectivity/source/drivers/ado/AKeys.cxx|4 ++--
connectivity/source/drivers/ado/ATable.cxx |4 ++--
connectivity/source/drivers/ado/ATables.cxx |4 ++--
connectivity/source/drivers/ado/AUsers.cxx |4 ++--
connectivity/source/drivers/ado/AViews.cxx |4 ++--
include/comphelper/types.hxx |7 +++
9 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit 3d4b1c0eee7a3055e67df6b0b342ea25b0f5bf55
Author: Arkadiy Illarionov
AuthorDate: Sat Jun 22 00:17:00 2019 +0300
Commit: Stephan Bergmann
CommitDate: Mon Jun 24 09:09:50 2019 +0200
tdf#39593 Change comphelper::getImplementation signature
To merge with comphelper::getUnoTunnelImplementation
Change-Id: I976d768d7fb159d50fa90e27ec36f2bea91ea2cb
Reviewed-on: https://gerrit.libreoffice.org/74542
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/drivers/ado/AColumns.cxx
b/connectivity/source/drivers/ado/AColumns.cxx
index e72681b8d41f..ef010cfb4062 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -59,9 +59,9 @@ Reference< XPropertySet > OColumns::createDescriptor()
// XAppend
sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference<
XPropertySet >& descriptor )
{
-OAdoColumn* pColumn = nullptr;
+OAdoColumn* pColumn = getImplementation( descriptor );
Reference< XPropertySet > xColumn;
-if ( !getImplementation( pColumn, descriptor ) || pColumn == nullptr )
+if ( pColumn == nullptr )
{
// m_pConnection->throwGenericSQLException(
STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast(this) );
pColumn = new OAdoColumn(isCaseSensitive(),m_pConnection);
diff --git a/connectivity/source/drivers/ado/AGroups.cxx
b/connectivity/source/drivers/ado/AGroups.cxx
index 80d23e20f9dc..506aead14f7d 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -57,8 +57,8 @@ Reference< XPropertySet > OGroups::createDescriptor()
// XAppend
sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
-OAdoGroup* pGroup = nullptr;
-if ( !getImplementation(pGroup,descriptor) || pGroup == nullptr )
+OAdoGroup* pGroup = getImplementation(descriptor);
+if ( pGroup == nullptr )
m_pCatalog->getConnection()->throwGenericSQLException(
STR_INVALID_GROUP_DESCRIPTOR_ERROR,static_cast(this) );
m_aCollection.Append( pGroup->getImpl() );
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx
b/connectivity/source/drivers/ado/AIndexes.cxx
index a54887d2832e..46cd1c1a4b86 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -57,8 +57,8 @@ Reference< XPropertySet > OIndexes::createDescriptor()
// XAppend
sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const
Reference< XPropertySet >& descriptor )
{
-OAdoIndex* pIndex = nullptr;
-if ( !getImplementation(pIndex,descriptor) || pIndex == nullptr )
+OAdoIndex* pIndex = getImplementation(descriptor);
+if ( pIndex == nullptr )
m_pConnection->throwGenericSQLException(
STR_INVALID_INDEX_DESCRIPTOR_ERROR,static_cast(this) );
ADOIndexes* pIndexes = m_aCollection;
diff --git a/connectivity/source/drivers/ado/AKeys.cxx
b/connectivity/source/drivers/ado/AKeys.cxx
index 559d7a7f101d..e306f918a726 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -57,8 +57,8 @@ Reference< XPropertySet > OKeys::createDescriptor()
// XAppend
sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference<
XPropertySet >& descriptor )
{
-OAdoKey* pKey = nullptr;
-if ( !getImplementation( pKey, descriptor ) || pKey == nullptr)
+OAdoKey* pKey = getImplementation( descriptor );
+if ( pKey == nullptr)
m_pConnection->throwGenericSQLException(
STR_INVALID_KEY_DESCRIPTOR_ERROR,static_cast(this) );
// To pass as column parameter to Key's Append method
diff --git a/connectivity/source/drivers/ado/ATable.cxx
b/connectivity/source/drivers/ado/ATable.cxx
index 09c4c397051d..34597d55fff5 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -163,8 +163,8 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString&
colName, const Refer
checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
bool bError = true;
-OAdoColumn* pColumn = nullptr;
-if(::comphelper::getImplementation(pColumn,descriptor) && pColumn !=
nullptr)
+OAdoColumn* pColumn =
::comphelper::getImplementation(descriptor);
+if(pColumn != nullptr)
[Libreoffice-commits] core.git: connectivity/source include/comphelper mysqlc/source odk/examples
connectivity/source/drivers/firebird/SubComponent.hxx |3 --- connectivity/source/inc/hsqldb/HTable.hxx |3 --- connectivity/source/inc/mysql/YTable.hxx |3 --- include/comphelper/IdPropArrayHelper.hxx |3 --- include/comphelper/proparrhlp.hxx |3 --- mysqlc/source/mysqlc_subcomponent.hxx |3 --- odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx |3 --- 7 files changed, 21 deletions(-) New commits: commit d4398c776706fd3a5bc3b3fa9f8a3e965a7a6306 Author: Stephan Bergmann Date: Thu Oct 27 17:08:09 2016 +0200 Remove bogus comments about ~IPropertyArrayHelper not being virtual ...which isn't true at least ever since b525a3115f54576017a576ff842dede5e2e3545d "initial import", but got copy/pasted all over the place Change-Id: I47d3d8a594aef3ac3736d7176ae964a118821014 diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index 5c87097..609c07a 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -80,9 +80,6 @@ namespace connectivity This method needs to be implemented in derived classes. The method gets called with s_aMutex acquired. - -as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper -assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const = 0; diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx index 4673e41..08ed264 100644 --- a/connectivity/source/inc/hsqldb/HTable.hxx +++ b/connectivity/source/inc/hsqldb/HTable.hxx @@ -65,9 +65,6 @@ namespace connectivity This method needs to be implemented in derived classes. The method gets called with s_aMutex acquired. - -as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper -assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const override; diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx index a8055e6..8fca785 100644 --- a/connectivity/source/inc/mysql/YTable.hxx +++ b/connectivity/source/inc/mysql/YTable.hxx @@ -72,9 +72,6 @@ namespace connectivity This method needs to be implemented in derived classes. The method gets called with s_aMutex acquired. - -as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper -assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const override; diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx index 18367b0..a8b2f4e 100644 --- a/include/comphelper/IdPropArrayHelper.hxx +++ b/include/comphelper/IdPropArrayHelper.hxx @@ -74,9 +74,6 @@ namespace comphelper This method needs to be implemented in derived classes. The method gets called with Mutex acquired. - -as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper -assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const = 0; diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx index 507c51b..3584553 100644 --- a/include/comphelper/proparrhlp.hxx +++ b/include/comphelper/proparrhlp.hxx @@ -57,9 +57,6 @@ protected: This method needs to be implemented in derived classes. The method gets called with Mutex acquired. - -as long as IPropertyArrayHelper
[Libreoffice-commits] core.git: connectivity/source include/comphelper sot/source ucb/source
connectivity/source/drivers/postgresql/pq_connection.hxx |4 +---
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |4 +---
include/comphelper/numberedcollection.hxx |4 +---
sot/source/sdstor/stgcache.hxx |3 +--
ucb/source/ucp/file/filtask.hxx|2 +-
5 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 00ecf7899a97d09ecf4a8b6d81b10e1f66903f5a
Author: Jaskaran
Date: Fri Mar 4 10:04:07 2016 +0530
tdf#97499 Remove some Default arguments in unordered container
Change-Id: Ic008e244b8ae1888fa45379371f5525ee77f6087
Reviewed-on: https://gerrit.libreoffice.org/22887
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx
b/connectivity/source/drivers/postgresql/pq_connection.hxx
index b3610f0..1d1e35a 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -156,9 +156,7 @@ typedef ::std::vector< OString > OStringVector;
typedef std::unordered_map
<
sal_Int32,
-OUString,
-::std::hash< sal_Int32 >,
-::std::equal_to< sal_Int32 >
+OUString
> Int2StringMap;
class Connection : public ConnectionBase
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 22965d1..e60043e 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1420,9 +1420,7 @@ namespace {
typedef std::unordered_map
<
sal_Int32,
-DatabaseTypeDescription,
-::std::hash< sal_Int32 >,
-::std::equal_to< sal_Int32 >
+DatabaseTypeDescription
> Oid2DatabaseTypeDescriptionMap;
static void columnMetaData2DatabaseTypeDescription(
diff --git a/include/comphelper/numberedcollection.hxx
b/include/comphelper/numberedcollection.hxx
index 1f44fd0..48379ea 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -61,9 +61,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private
::cppu::BaseMutex
typedef std::unordered_map<
long,
-TNumberedItem,
-::std::hash,
-::std::equal_to< long > > TNumberedItemHash;
+TNumberedItem > TNumberedItemHash;
typedef ::std::vector< long > TDeadItemList;
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index b9d0fab..9911f4b 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -39,8 +39,7 @@ class StgCache
{
typedef std::unordered_map
<
-sal_Int32, rtl::Reference< StgPage >,
-std::hash< sal_Int32 >, std::equal_to< sal_Int32 >
+sal_Int32, rtl::Reference< StgPage >
> IndexToStgPage;
typedef std::vector< rtl::Reference< StgPage > > LRUList;
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index bb37c2e..3bb6e26 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -128,7 +128,7 @@ namespace fileaccess
}; // end class TaskHandling
-typedef std::unordered_map< sal_Int32,TaskHandling,std::hash<
sal_Int32 > > TaskMap;
+typedef std::unordered_map< sal_Int32,TaskHandling > TaskMap;
private:
osl::Mutex
m_aMutex;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source include/comphelper include/connectivity include/svx
connectivity/source/parse/sqliterator.cxx| 12 ++--
include/comphelper/logging.hxx |7 +++
include/comphelper/sharedmutex.hxx |7 ++-
include/connectivity/formattedcolumnvalue.hxx| 14 +-
include/connectivity/sdbcx/VKey.hxx |4 ++--
include/connectivity/sqlerror.hxx|8 +++-
include/connectivity/sqlnode.hxx |6 +++---
include/connectivity/statementcomposer.hxx |8
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx |6 +++---
9 files changed, 31 insertions(+), 41 deletions(-)
New commits:
commit 6106d99a905883c7325dae252b8b071be1896641
Author: Caolán McNamara
Date: Wed Feb 18 17:18:15 2015 +
boost->std
Change-Id: Ifa87783f68b0fab98f8a0f7cd6ed867202b4532f
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index 2e668e1..dbe0577 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -40,7 +40,7 @@
#include
-#include
+#include
using namespace ::comphelper;
using namespace ::connectivity;
@@ -65,9 +65,9 @@ namespace connectivity
Reference< XNameAccess >m_xTableContainer;
Reference< XNameAccess >m_xQueryContainer;
-::boost::shared_ptr< OSQLTables > m_pTables; // all tables
which participate in the SQL statement
-::boost::shared_ptr< OSQLTables > m_pSubTables; // all tables from
sub queries not the tables from the select tables
-::boost::shared_ptr< QueryNameSet > m_pForbiddenQueryNames;
+std::shared_ptr< OSQLTables > m_pTables; // all tables which
participate in the SQL statement
+std::shared_ptr< OSQLTables > m_pSubTables; // all tables from sub
queries not the tables from the select tables
+std::shared_ptr< QueryNameSet > m_pForbiddenQueryNames;
sal_uInt32 m_nIncludeMask;
@@ -114,7 +114,7 @@ namespace connectivity
*/
class ForbidQueryName
{
-::boost::shared_ptr< QueryNameSet >&m_rpAllForbiddenNames;
+std::shared_ptr< QueryNameSet >&m_rpAllForbiddenNames;
OUString m_sForbiddenQueryName;
public:
@@ -332,7 +332,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns(
const OSQLTable& _rQu
break;
OUString sError;
-boost::scoped_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser&
>( m_rParser ).parseTree( sError, sSubQueryCommand, false ) );
+std::unique_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >(
m_rParser ).parseTree( sError, sSubQueryCommand, false ) );
if ( !pSubQueryNode.get() )
break;
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 2e52869..0a5e807 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -26,9 +26,8 @@
#include
#include
-#include
#include
-
+#include
namespace comphelper
{
@@ -93,7 +92,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC EventLogger
{
protected:
-::boost::shared_ptr< EventLogger_Impl > m_pImpl;
+std::shared_ptr< EventLogger_Impl > m_pImpl;
public:
/** creates an EventLogger instance working with a
css.logging.XLogger
@@ -513,7 +512,7 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC ResourceBasedEventLogger : public EventLogger
{
private:
-::boost::shared_ptr< ResourceBasedEventLogger_Data >m_pData;
+std::shared_ptr< ResourceBasedEventLogger_Data >m_pData;
public:
/** creates a resource based event logger
diff --git a/include/comphelper/sharedmutex.hxx
b/include/comphelper/sharedmutex.hxx
index 03397d6..cca7239 100644
--- a/include/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
@@ -21,11 +21,8 @@
#define INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
#include
-
#include
-
-#include
-
+#include
namespace comphelper
{
@@ -48,7 +45,7 @@ namespace comphelper
inline operator ::osl::Mutex& () { return *m_pMutexImpl; }
private:
-::boost::shared_ptr< ::osl::Mutex > m_pMutexImpl;
+std::shared_ptr< ::osl::Mutex > m_pMutexImpl;
};
diff --git a/include/connectivity/formattedcolumnvalue.hxx
b/include/connectivity/formattedcolumnvalue.hxx
index 35b45d2..4ce1309 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -26,17 +26,11 @@
#include
#include
#include
-
-#include
-
-#include
#include
-
+#include
namespace dbtools
{
-
-
struct FormattedColumnValue_Data;
//= FormattedColumnValue
@@ -44,7 +38,7 @@ namespace dbtools
/** a class which helps retrieving and setting the value of a database
column
[Libreoffice-commits] core.git: connectivity/source include/comphelper
connectivity/source/drivers/jdbc/JStatement.cxx|4 ++--
connectivity/source/drivers/jdbc/Object.cxx|4 ++--
connectivity/source/drivers/jdbc/PreparedStatement.cxx |2 +-
connectivity/source/inc/java/lang/Object.hxx |2 +-
connectivity/source/inc/java/sql/JStatement.hxx|2 +-
include/comphelper/basicio.hxx |3 +++
include/comphelper/logging.hxx |1 +
7 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 6759faa1e65c311b07b65e64276cd9f3a9480004
Author: Stephan Bergmann
Date: Tue Feb 18 10:53:46 2014 +0100
sal_Bool -> bool fixup
Change-Id: Id1d838fe4316bbc0e1137d395bb15db3585aed84
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx
b/connectivity/source/drivers/jdbc/JStatement.cxx
index 7bfb0cb..c4b0f29 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -501,11 +501,11 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32
_par0) throw(SQLExceptio
}
//--
-void java_sql_Statement_Base::setEscapeProcessing(sal_Bool _par0)
throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setEscapeProcessing(bool _par0)
throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
-m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, (bool)_par0
);
+m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, _par0 );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
m_bEscapeProcessing = _par0;
diff --git a/connectivity/source/drivers/jdbc/Object.cxx
b/connectivity/source/drivers/jdbc/Object.cxx
index 4089cb8..461c1ba 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -315,13 +315,13 @@ void java_lang_Object::callVoidMethodWithIntArg( const
char* _pMethodName, jmeth
ThrowSQLException( t.pEnv, NULL );
}
// -
-void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException ) const
+void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, bool _nArgument,bool _bIgnoreException ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment
anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(Z)V", _inout_MethodID);
// call method
-t.pEnv->CallVoidMethod( object, _inout_MethodID,_nArgument );
+t.pEnv->CallVoidMethod( object, _inout_MethodID,int(_nArgument) );
if ( _bIgnoreException )
isExceptionOccurred(t.pEnv,sal_True);
else
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 9843884..c66b703 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -161,7 +161,7 @@ void SAL_CALL java_sql_PreparedStatement::setString(
sal_Int32 parameterIndex, c
void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32
parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
-m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex,
(bool)x );
+m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex,
bool(x) );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/inc/java/lang/Object.hxx
b/connectivity/source/inc/java/lang/Object.hxx
index 7d13c62..c7298c8 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -121,7 +121,7 @@ namespace connectivity
OUString callStringMethodWithIntArg( const char* _pMethodName,
jmethodID& _inout_MethodID , sal_Int32 _nArgument) const;
voidcallVoidMethod( const char* _pMethodName, jmethodID&
_inout_MethodID) const;
voidcallVoidMethodWithIntArg( const char* _pMethodName,
jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException = false
) const;
-voidcallVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException = false
) const;
+voidcallVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, bool _nArgument,bool _bIgnoreException = false )
const;
voidcallVoidMethodWithStringArg( const char* _pMethodName,
jmethodID& _inout_MethodID, const OUString& _nArgument ) const;
