diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:14:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:14:51 +0000 |
| commit | c7dd89ac38be394e6cffaa45a38ca7fe4f39a08d (patch) | |
| tree | 766ddb193942f1d959e33e9218fa2d54e1018b6f /connectivity/inc/connectivity | |
| parent | c43ee106f4f98aa7b15f662450bc8d24f8bdb257 (diff) | |
INTEGRATION: CWS dba30c (1.11.10); FILE MERGED
2008/05/05 10:57:50 oj 1.11.10.1: #i87131# collect keys only once, getKeys always refetch the keys
Diffstat (limited to 'connectivity/inc/connectivity')
| -rw-r--r-- | connectivity/inc/connectivity/sdbcx/VKey.hxx | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index 5e3533c506..94b0a03898 100644 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: VKey.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -41,12 +41,31 @@ #include "connectivity/sdbcx/VDescriptor.hxx" #include <cppuhelper/implbase1.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> +#include <boost/shared_ptr.hpp> namespace connectivity { namespace sdbcx { + struct KeyProperties + { + ::rtl::OUString m_ReferencedTable; + sal_Int32 m_Type; + sal_Int32 m_UpdateRule; + sal_Int32 m_DeleteRule; + KeyProperties(const ::rtl::OUString& _ReferencedTable, + sal_Int32 _Type, + sal_Int32 _UpdateRule, + sal_Int32 _DeleteRule) + :m_ReferencedTable(_ReferencedTable), + m_Type(_Type), + m_UpdateRule(_UpdateRule), + m_DeleteRule(_DeleteRule) + {} + KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){} + }; + typedef ::boost::shared_ptr< KeyProperties > TKeyProperties; typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OKey_BASE; class OCollection; @@ -58,11 +77,7 @@ namespace connectivity public OKey_BASE { protected: - ::rtl::OUString m_ReferencedTable; - sal_Int32 m_Type; - sal_Int32 m_UpdateRule; - sal_Int32 m_DeleteRule; - + TKeyProperties m_aProps; OCollection* m_pColumns; using ODescriptor_BASE::rBHelper; @@ -72,12 +87,13 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OKey(sal_Bool _bCase); - OKey( const ::rtl::OUString& _Name, + OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase); + /*OKey( const ::rtl::OUString& _Name, const ::rtl::OUString& _ReferencedTable, sal_Int32 _Type, sal_Int32 _UpdateRule, sal_Int32 _DeleteRule, - sal_Bool _bCase); + sal_Bool _bCase);*/ virtual ~OKey( ); |