User: hr Date: 05/09/23 05:37:36 Modified: /dba/dbaccess/source/ui/misc/ TableCopyHelper.cxx
Log: INTEGRATION: CWS dba201b (1.2.84); FILE MERGED 2005/09/21 09:51:40 oj 1.2.84.4: RESYNC: (1.2-1.3); FILE MERGED 2005/07/20 09:56:52 fs 1.2.84.3: #i51255# XConnection replaced with SharedConnection, and DataSourceHolder replaced with SharedModel 2005/07/11 13:37:23 fs 1.2.84.2: merging CWS dba201 into CWS dba201b 2005/07/06 08:20:48 oj 1.2.84.1: #i48851# store default for bool as string File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: TableCopyHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TableCopyHelper.cxx?r1=1.3&r2=1.4 Delta lines: +7 -9 ------------------- --- TableCopyHelper.cxx 8 Sep 2005 16:08:06 -0000 1.3 +++ TableCopyHelper.cxx 23 Sep 2005 12:37:33 -0000 1.4 @@ -109,9 +109,6 @@ #ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ -#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #endif @@ -343,6 +340,7 @@ FILL_PARAM( ::com::sun::star::util::DateTime, etTimestamp) break; case DataType::BIT: + case DataType::BOOLEAN: FILL_PARAM( sal_Bool, etBoolean) break; case DataType::TINYINT: @@ -487,7 +485,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId ,const TransferableDataHelper& _rTransData ,const ::rtl::OUString& _sDestDataSourceName - ,const Reference<XConnection>& _xConnection) + ,const SharedConnection& _xConnection) { if ( _nFormatId == SOT_FORMATSTR_ID_DBACCESS_TABLE || _nFormatId == SOT_FORMATSTR_ID_DBACCESS_QUERY ) { @@ -526,7 +524,7 @@ // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData ,const ::rtl::OUString& _sDestDataSourceName - ,const Reference<XConnection>& _xConnection) + ,const SharedConnection& _xConnection) { if ( _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) || _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) ) pasteTable( SOT_FORMATSTR_ID_DBACCESS_TABLE,_rTransData,_sDestDataSourceName,_xConnection); @@ -540,7 +538,7 @@ // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( ::svx::ODataAccessDescriptor& _rPasteData ,const ::rtl::OUString& _sDestDataSourceName - ,const Reference<XConnection>& _xDestConnection) + ,const SharedConnection& _xDestConnection) { Reference<XConnection> xSrcConnection; Reference<XResultSet> xSrcRs; // the source resultset may be empty @@ -774,7 +772,7 @@ } } // ----------------------------------------------------------------------------- -sal_Bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, sal_Bool _bCheck,const Reference<XConnection>& _xConnection) +sal_Bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, sal_Bool _bCheck,const SharedConnection& _xConnection) { Reference<XEventListener> xEvt; ODatabaseImportExport* pImport = NULL; @@ -805,7 +803,7 @@ // ----------------------------------------------------------------------------- sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedData ,DropDescriptor& _rAsyncDrop - ,const Reference<XConnection>& _xConnection) + ,const SharedConnection& _xConnection) { sal_Bool bRet = sal_False; sal_Bool bHtml = _aDroppedData.HasFormat(SOT_FORMATSTR_ID_HTML) || _aDroppedData.HasFormat(SOT_FORMATSTR_ID_HTML_SIMPLE); @@ -839,7 +837,7 @@ // ----------------------------------------------------------------------------- void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc ,const ::rtl::OUString& _sDestDataSourceName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection) + ,const SharedConnection& _xConnection) { if ( _rDesc.aHtmlRtfStorage.Is() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
