User: rt Date: 2008-06-06 13:14:54+0000 Modified: dba/connectivity/inc/connectivity/sdbcx/VKey.hxx
Log: 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 File Changes: Directory: /dba/connectivity/inc/connectivity/sdbcx/ ==================================================== File [changed]: VKey.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sdbcx/VKey.hxx?r1=1.11&r2=1.12 Delta lines: +23 -7 -------------------- --- VKey.hxx 2008-04-10 07:44:41+0000 1.11 +++ VKey.hxx 2008-06-06 13:14:51+0000 1.12 @@ -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 @@ 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 @@ 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( ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
