diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-04-01 15:55:42 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-04-01 16:03:50 +0100 |
| commit | 2833c4cb4dc6c6def3d3cb3b134f22eda3a87207 (patch) | |
| tree | b96e302100c0ef7a97350bbe9f9cd1c232561890 | |
| parent | 71bf17ecbaa46780b112b6307aab879a088910fe (diff) | |
fix evolution local addressbook integration, which uses a new local: uri
| -rw-r--r-- | connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 13 | ||||
| -rw-r--r-- | connectivity/source/drivers/evoab2/NResultSet.cxx | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index c6dc8bbf7a..d868b2a8c0 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -1147,19 +1147,20 @@ 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 + 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 )) + case SDBCAddress::EVO_LDAP: + if ( !strncmp( "ldap://", p, 6 )) break; - else + else continue; case SDBCAddress::Unknown: break; diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 4bea08aab6..e16e459bf6 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 ) |