summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-01-19 14:30:24 +0000
committerOliver Bolte <obo@openoffice.org>2006-01-19 14:30:24 +0000
commit2714279685ef127e3e3daffc50d8bb7bf460a94f (patch)
treeab3d86a1b0920e249b8174ce031f4a18762c8b0f
parent5e731fbc1429d7c2eae1986239b716d70da27fd2 (diff)
INTEGRATION: CWS dba202e (1.2.14); FILE MERGED
2006/01/10 14:23:16 fs 1.2.14.1: copying fixes for #i59673# and #i60062# to this (earlier) CWS
-rw-r--r--connectivity/source/drivers/kab/KConnection.cxx19
1 files changed, 17 insertions, 2 deletions
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index f74953e18b62..78310b059c5c 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: KConnection.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: obo $ $Date: 2005-12-19 16:48:35 $
+ * last change: $Author: obo $ $Date: 2006-01-19 15:30:24 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -57,6 +57,8 @@
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
#endif
+#include <kabc/stdaddressbook.h>
+
using namespace connectivity::kab;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -332,3 +334,16 @@ Reference< XTablesSupplier > SAL_CALL KabConnection::createCatalog()
}
return xTab;
}
+// -----------------------------------------------------------------------------
+::KABC::AddressBook* KabConnection::getAddressBook() const
+{
+ return m_pAddressBook;
+}
+// -----------------------------------------------------------------------------
+extern "C" void* SAL_CALL createKabConnection( void* _pDriver )
+{
+ KabConnection* pConnection = new KabConnection( static_cast< KabDriver* >( _pDriver ) );
+ // by definition, the pointer crossing library boundaries as void ptr is acquired once
+ pConnection->acquire();
+ return pConnection;
+}