User: obo Date: 2006/07/10 08:03:00 Modified: dba/dbaccess/source/core/api/KeySet.hxx
Log: INTEGRATION: CWS qiq (1.24.2); FILE MERGED 2006/06/27 11:54:04 fs 1.24.2.2: RESYNC: (1.24-1.25); FILE MERGED 2006/06/16 14:16:04 fs 1.24.2.1: during #i51143#: replaced TTypeDefaultValuePair/TPositionTypePair with struct with named members - this is much more readable than ::std::pair< ..., ::std::pair< ..., ... > > File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: KeySet.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/KeySet.hxx?r1=1.25&r2=1.26 Delta lines: +24 -6 -------------------- --- KeySet.hxx 20 Jun 2006 02:35:21 -0000 1.25 +++ KeySet.hxx 10 Jul 2006 15:02:57 -0000 1.26 @@ -57,15 +57,33 @@ namespace dbaccess { - typedef ::std::pair<sal_Int32,::rtl::OUString> TTypeDefaultValuePair; - typedef ::std::pair<sal_Int32,TTypeDefaultValuePair> TPositionTypePair; - DECLARE_STL_MAP(::rtl::OUString, TPositionTypePair,::comphelper::UStringMixLess,OColumnNamePos); + struct SelectColumnDescription + { + sal_Int32 nPosition; + sal_Int32 nType; + ::rtl::OUString sDefaultValue; + + SelectColumnDescription() + :nPosition( 0 ) + ,nType( 0 ) + ,sDefaultValue() + { + } + + SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, const ::rtl::OUString& _rDefaultValue ) + :nPosition( _nPosition ) + ,nType( _nType ) + ,sDefaultValue( _rDefaultValue ) + { + } + }; + typedef ::std::map< ::rtl::OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; // the elements of _rxQueryColumns must have the properties PROPERTY_REALNAME and PROPERTY_TABLENAME void getColumnPositions(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxQueryColumns, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns, const ::rtl::OUString& _rsUpdateTableName, - OColumnNamePos& _rColumnNames /* out */); + SelectColumnsMetaData& _rColumnNames /* out */); typedef ::std::pair<ORowSetRow,sal_Int32> OKeySetValue; typedef ::std::map<sal_Int32,OKeySetValue > OKeySetMatrix; @@ -77,8 +95,8 @@ ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones - OColumnNamePos* m_pKeyColumnNames; // contains all key column names - OColumnNamePos* m_pColumnNames; // contains all column names + SelectColumnsMetaData* m_pKeyColumnNames; // contains all key column names + SelectColumnsMetaData* m_pColumnNames; // contains all column names connectivity::OSQLTable m_xTable; // reference to our table ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
