diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:26:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:26:25 +0000 |
| commit | 4e9cc1bae029b9ca471621b75590833afe0c5a37 (patch) | |
| tree | f346cf08ed43faf74136a3bbd9eca31b3945fde6 /connectivity/source/sdbcx | |
| parent | 70440dfe62d6231391896bd273bb9d8290f260f8 (diff) | |
INTEGRATION: CWS dba30c (1.17.10); FILE MERGED
2008/05/05 10:57:51 oj 1.17.10.1: #i87131# collect keys only once, getKeys always refetch the keys
Diffstat (limited to 'connectivity/source/sdbcx')
| -rw-r--r-- | connectivity/source/sdbcx/VKey.cxx | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index 67708992e640..8bdbca68b261 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: VKey.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.18 $ * * This file is part of OpenOffice.org. * @@ -81,25 +81,34 @@ sal_Bool SAL_CALL OKey::supportsService( const ::rtl::OUString& _rServiceName ) // ------------------------------------------------------------------------- OKey::OKey(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True) + , m_aProps(new KeyProperties()) , m_pColumns(NULL) { } // ------------------------------------------------------------------------- -OKey::OKey( const ::rtl::OUString& _Name, - const ::rtl::OUString& _ReferencedTable, - sal_Int32 _Type, - sal_Int32 _UpdateRule, - sal_Int32 _DeleteRule, - sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) - ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) - ,m_ReferencedTable(_ReferencedTable) - ,m_Type(_Type) - ,m_UpdateRule(_UpdateRule) - ,m_DeleteRule(_DeleteRule) - ,m_pColumns(NULL) +OKey::OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase) +: ODescriptor_BASE(m_aMutex) + ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) + ,m_aProps(_rProps) + ,m_pColumns(NULL) { m_Name = _Name; } +//OKey::OKey( const ::rtl::OUString& _Name, +// const ::rtl::OUString& _ReferencedTable, +// sal_Int32 _Type, +// sal_Int32 _UpdateRule, +// sal_Int32 _DeleteRule, +// sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) +// ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) +// ,m_ReferencedTable(_ReferencedTable) +// ,m_Type(_Type) +// ,m_UpdateRule(_UpdateRule) +// ,m_DeleteRule(_DeleteRule) +// ,m_pColumns(NULL) +//{ +// m_Name = _Name; +//} // ------------------------------------------------------------------------- OKey::~OKey( ) { @@ -134,10 +143,10 @@ void OKey::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); } // ------------------------------------------------------------------------- void SAL_CALL OKey::disposing() |