User: obo Date: 2006/07/10 08:12:12 Modified: dba/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
Log: INTEGRATION: CWS qiq (1.6.20); FILE MERGED 2006/06/30 13:28:50 fs 1.6.20.3: #i51143# getQueryWithSubstitution can throw an SQLException 2006/05/10 12:40:42 fs 1.6.20.2: #i51143# m_xTables -> m_xConnectionTables, to better distinct them from our own tables (which are part of the statement) 2006/05/10 10:57:34 fs 1.6.20.1: #i51443# +getQueryWithSubstitution File Changes: Directory: /dba/dbaccess/source/core/inc/ ========================================= File [changed]: SingleSelectQueryComposer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx?r1=1.6&r2=1.7 Delta lines: +2 -1 ------------------- --- SingleSelectQueryComposer.hxx 7 Apr 2006 14:11:14 -0000 1.6 +++ SingleSelectQueryComposer.hxx 10 Jul 2006 15:12:10 -0000 1.7 @@ -131,7 +131,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTableSupplier; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionTables; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; @@ -275,6 +275,7 @@ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredHavingClause( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getOrder( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getOrderColumns( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getQueryWithSubstitution( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
