summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/ado/Awrapado.cxx24
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MColumnAlias.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MDriver.cxx2
4 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 76318521576f..c29ef1652ad2 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -1639,7 +1639,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -1679,7 +1679,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -1721,7 +1721,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any&
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -1761,7 +1761,7 @@ ADORecordset* WpADOConnection::getIndexInfo(
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -1803,7 +1803,7 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -1849,7 +1849,7 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -1898,7 +1898,7 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any&
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -1939,7 +1939,7 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno:
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -2011,7 +2011,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
varCriteria[nPos].setString(sTypeNames);
// Create SafeArray Bounds and initialize the array
- const sal_Int32 nCrit = SAL_N_ELEMENTS( varCriteria );
+ const sal_Int32 nCrit = sizeof varCriteria / sizeof varCriteria[0];
SAFEARRAYBOUND rgsabound[1];
rgsabound[0].lLbound = 0;
rgsabound[0].cElements = nCrit;
@@ -2048,7 +2048,7 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -2092,7 +2092,7 @@ ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno:
// Create SafeArray Bounds and initialize the array
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = SAL_N_ELEMENTS( varCriteria );
+ rgsabound[0].cElements = sizeof varCriteria / sizeof varCriteria[0];
psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound );
sal_Int32 nPos=0;
@@ -2127,7 +2127,7 @@ ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/)
{
// Create elements used in the array
OLEVariant varCriteria[2];
- const int nCrit = SAL_N_ELEMENTS( varCriteria );
+ const int nCrit = sizeof varCriteria / sizeof varCriteria[0];
// Create SafeArray Bounds and initialize the array
SAFEARRAYBOUND rgsabound[1];
rgsabound[0].lLbound = 0;
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index cdde095e21c0..24546b3b38f3 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -460,7 +460,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
for (sal_Int32 i = 1 ; i <= nCount ; ++i)
{
sColumnName = xMeta->getColumnName(i);
- for (sal_uInt32 j = 0 ; j < SAL_N_ELEMENTS(sPrivs); ++j)
+ for (sal_uInt32 j = 0 ; j < sizeof(sPrivs)/sizeof(sPrivs[0]); ++j)
{
if ( sPrivs[j] == sColumnName )
{
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 5530e2f8fb76..e24a0f08f5f3 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -90,7 +90,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::
"Notes",
};
- for ( size_t i = 0; i < SAL_N_ELEMENTS( s_pProgrammaticNames ); ++i )
+ for ( size_t i = 0; i < sizeof( s_pProgrammaticNames ) / sizeof( s_pProgrammaticNames[0] ); ++i )
m_aAliasMap[ ::rtl::OUString::createFromAscii( s_pProgrammaticNames[i] ) ] = AliasEntry( s_pProgrammaticNames[i], i );
initialize( _rxORB );
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 89f2321b832c..29919df00a70 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -258,7 +258,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url )
{ LDAP, "ldap" }
};
- for ( size_t i=0; i < SAL_N_ELEMENTS( aSchemeMap ); ++i )
+ for ( size_t i=0; i < sizeof( aSchemeMap ) / sizeof( aSchemeMap[0] ); ++i )
{
if ( aAddrbookScheme.compareToAscii( aSchemeMap[i].pScheme ) == 0 )
return aSchemeMap[i].eType;
generated by cgit (git 2.34.1) at 2024-07-08 17:38:34 +0000