diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:37:33 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:37:33 +0000 |
| commit | b86e29b3a72739b39ead4b0363ff91608bba48a8 (patch) | |
| tree | e7166f16952d779703063f7363a249b5c515a862 /dbaccess/source/ui | |
| parent | 2baa4fd7afc9324f399c8d285704ad036140f884 (diff) | |
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
Diffstat (limited to 'dbaccess/source/ui')
| -rw-r--r-- | dbaccess/source/ui/misc/TableCopyHelper.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 387661e6cb69..4f4ee0ae1dec 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TableCopyHelper.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:08:06 $ + * last change: $Author: hr $ $Date: 2005-09-23 12:37:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ void insertRows(const Reference<XResultSet>& xSrcRs, 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 @@ OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler) : m_pCont 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( SotFormatStringId _nFormatId // ----------------------------------------------------------------------------- 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( const TransferableDataHelper& _rTransData // ----------------------------------------------------------------------------- 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 @@ void OTableCopyHelper::insertTable(sal_Int32 _nCommandType } } // ----------------------------------------------------------------------------- -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::isTableFormat(const TransferableDataHelper& _rClipboa // ----------------------------------------------------------------------------- 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 @@ sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedD // ----------------------------------------------------------------------------- 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() ) { |