User: hr Date: 2006/08/15 03:44:19 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: INTEGRATION: CWS dba30 (1.3.2); FILE MERGED 2006/07/20 10:38:09 fs 1.3.2.9: #i10000# 2006/07/19 12:15:31 fs 1.3.2.8: RESYNC: (1.11-1.12); FILE MERGED 2006/05/19 10:45:40 fs 1.3.2.7: #i10000# Linux compiler bug 2006/04/20 06:45:08 oj 1.3.2.6: RESYNC: (1.10-1.11); FILE MERGED 2006/03/21 18:23:49 fs 1.3.2.5: RESYNC: (1.8-1.10); FILE MERGED 2005/09/30 06:10:03 fs 1.3.2.4: RESYNC: (1.6-1.8); FILE MERGED 2005/07/01 07:07:04 fs 1.3.2.3: RESYNC: (1.4-1.6); FILE MERGED 2005/05/25 15:01:44 fs 1.3.2.2: RESYNC: (1.3-1.4); FILE MERGED 2005/04/06 07:17:36 fs 1.3.2.1: #i46768# introduce Settings propetry for the data source, wrapping the Info property sequence in a convinient way File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.12&r2=1.13 Delta lines: +25 -4 -------------------- --- ModelImpl.hxx 10 Jul 2006 15:08:41 -0000 1.12 +++ ModelImpl.hxx 15 Aug 2006 10:44:17 -0000 1.13 @@ -156,6 +156,9 @@ #ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include <com/sun/star/util/XRefreshable.hpp> #endif +#ifndef _COM_SUN_STAR_BEANS_XPROPERTYACCESS_HPP_ +#include <com/sun/star/beans/XPropertyAccess.hpp> +#endif #include <memory> //........................................................................ @@ -166,6 +169,21 @@ typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > OWeakConnection; typedef std::vector< OWeakConnection > OWeakConnectionArray; +struct AsciiPropertyValue +{ + // note: the canonic member order would be AsciiName / DefaultValue, but + // this crashes on unxlngi6.pro, since there's a bug which somehow results in + // getDefaultDataSourceSettings returning corrupted Any instances then. + ::com::sun::star::uno::Any DefaultValue; + const sal_Char* AsciiName; + + AsciiPropertyValue( const sal_Char* _pAsciiName, const ::com::sun::star::uno::Any& _rDefaultValue ) + :DefaultValue( _rDefaultValue ) + ,AsciiName( _pAsciiName ) + { + } +}; + class ODatabaseContext; class OSharedConnectionManager; @@ -255,8 +273,8 @@ sal_Bool m_bModified : 1; sal_Bool m_bDocumentReadOnly : 1; sal_Bool m_bDisposingSubStorages; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - m_aInfo; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > + m_xSettings; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > @@ -445,6 +463,9 @@ /** @see osl_decrementInterlockedCount. */ virtual oslInterlockedCount SAL_CALL release(); + + /// returns a all known data source settings, including their default values + static const AsciiPropertyValue* getDefaultDataSourceSettings(); }; /** a small base class for UNO components whose functionality depends on a ODatabaseModelImpl --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
