User: hr Date: 05/09/23 05:32:50 Modified: /dba/dbaccess/source/ui/inc/ DExport.hxx
Log: INTEGRATION: CWS dba201b (1.11.146); FILE MERGED 2005/09/21 08:56:06 oj 1.11.146.2: RESYNC: (1.11-1.12); FILE MERGED 2005/07/20 09:56:39 fs 1.11.146.1: #i51255# XConnection replaced with SharedConnection, and DataSourceHolder replaced with SharedModel File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: DExport.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/DExport.hxx?r1=1.12&r2=1.13 Delta lines: +5 -5 ------------------- --- DExport.hxx 8 Sep 2005 15:16:32 -0000 1.12 +++ DExport.hxx 23 Sep 2005 12:32:45 -0000 1.13 @@ -35,9 +35,6 @@ #ifndef DBAUI_DATABASEEXPORT_HXX #define DBAUI_DATABASEEXPORT_HXX -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ -#include <com/sun/star/sdbc/XConnection.hpp> -#endif #ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include <com/sun/star/sdbc/XResultSet.hpp> #endif @@ -78,6 +75,9 @@ #ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" #endif +#ifndef _DBAUI_COMMON_TYPES_HXX_ +#include "commontypes.hxx" +#endif namespace com { namespace sun { namespace star { namespace awt { @@ -109,7 +109,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; // container ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // dest table ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; // container - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; // dest conn + SharedConnection m_xConnection; // dest conn ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xResultSetUpdate; // @@ -156,7 +156,7 @@ virtual ~ODatabaseExport(); public: - ODatabaseExport(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + ODatabaseExport(const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* rList = 0, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
