diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:24 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:24 +0200 |
| commit | f18378b2d9d6a5996322231fc6618ab2ea2d9906 (patch) | |
| tree | 06d2b5ded42cb7b467d1bcc4076183820195a086 /connectivity | |
| parent | 34d4fb1fe53d819880561b4062b71dedca770095 (diff) | |
| parent | c385e76c10b173b9820967825f0ce0c6fb71e9dd (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/drivers/evoab2/NResultSet.cxx | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 4aed0b3ee05a..3b06a0cb1ee1 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -1147,17 +1147,18 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( switch (m_pConnection->getSDBCAddressType()) { case SDBCAddress::EVO_GWISE: - if (0==strncmp( "groupwise://", p, 11 )) + if ( !strncmp( "groupwise://", p, 11 )) break; else continue; case SDBCAddress::EVO_LOCAL: - if (0==strncmp( "file://", p, 6 )) + if ( !strncmp( "file://", p, 6 ) || + !strncmp( "local://", p, 6 ) ) break; else continue; case SDBCAddress::EVO_LDAP: - if (0==strncmp( "ldap://", p, 6 )) + if ( !strncmp( "ldap://", p, 6 )) break; else continue; diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 8fc193ae4f10..d7e7db02c81a 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -182,7 +182,8 @@ static bool isLDAP( EBook *pBook ) static bool isLocal( EBook *pBook ) { - return pBook && !strncmp( "file://", e_book_get_uri( pBook ), 6 ); + return pBook && ( !strncmp( "file://", e_book_get_uri( pBook ), 6 ) || + !strncmp( "local:", e_book_get_uri( pBook ), 6 ) ); } static bool isAuthRequired( EBook *pBook ) |