Tag: cws_src680_dba201b User: fs Date: 05/07/20 02:56:44 Modified: /dba/dbaccess/source/ui/inc/ DExport.hxx, HtmlReader.hxx, RtfReader.hxx, TokenWriter.hxx, TableCopyHelper.hxx
Log: #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.11&r2=1.11.146.1 Delta lines: +8 -8 ------------------- --- DExport.hxx 2 Aug 2004 15:52:14 -0000 1.11 +++ DExport.hxx 20 Jul 2005 09:56:39 -0000 1.11.146.1 @@ -2,9 +2,9 @@ * * $RCSfile: DExport.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.146.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 15:52:14 $ + * last change: $Author: fs $ $Date: 2005/07/20 09:56:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,9 +61,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 @@ -104,6 +101,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 { @@ -135,7 +135,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; // @@ -182,7 +182,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, File [changed]: HtmlReader.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/HtmlReader.hxx?r1=1.7&r2=1.7.420.1 Delta lines: +3 -3 ------------------- --- HtmlReader.hxx 9 Jul 2002 12:31:32 -0000 1.7 +++ HtmlReader.hxx 20 Jul 2005 09:56:40 -0000 1.7.420.1 @@ -2,9 +2,9 @@ * * $RCSfile: HtmlReader.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.420.1 $ * - * last change: $Author: oj $ $Date: 2002/07/09 12:31:32 $ + * last change: $Author: fs $ $Date: 2005/07/20 09:56:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,7 +108,7 @@ ~OHTMLReader(); public: OHTMLReader(SvStream& rIn, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + 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, File [changed]: RtfReader.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/RtfReader.hxx?r1=1.6&r2=1.6.420.1 Delta lines: +3 -3 ------------------- --- RtfReader.hxx 23 May 2002 11:09:30 -0000 1.6 +++ RtfReader.hxx 20 Jul 2005 09:56:40 -0000 1.6.420.1 @@ -2,9 +2,9 @@ * * $RCSfile: RtfReader.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.420.1 $ * - * last change: $Author: oj $ $Date: 2002/05/23 11:09:30 $ + * last change: $Author: fs $ $Date: 2005/07/20 09:56:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ ~ORTFReader(); public: ORTFReader( SvStream& rIn, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + 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, File [changed]: TokenWriter.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/TokenWriter.hxx?r1=1.13&r2=1.13.146.1 Delta lines: +27 -14 --------------------- --- TokenWriter.hxx 2 Aug 2004 15:54:25 -0000 1.13 +++ TokenWriter.hxx 20 Jul 2005 09:56:41 -0000 1.13.146.1 @@ -2,9 +2,9 @@ * * $RCSfile: TokenWriter.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.146.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 15:54:25 $ + * last change: $Author: fs $ $Date: 2005/07/20 09:56:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,6 +85,9 @@ #ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_ #include <com/sun/star/lang/XEventListener.hpp> #endif +#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ +#include <com/sun/star/frame/XModel.hpp> +#endif #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> #endif @@ -100,8 +103,8 @@ #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" #endif -#ifndef CONNECTIVITY_DATASOURCEHOLDER_HXX -#include <connectivity/DataSourceHolder.hxx> +#ifndef _DBAUI_COMMON_TYPES_HXX_ +#include "commontypes.hxx" #endif #include <memory> @@ -114,24 +117,30 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> ODatabaseImportExport_BASE; class ODatabaseImportExport : public ODatabaseImportExport_BASE { + private: void disposing(); + + protected: + typedef ::utl::SharedUNOComponent < ::com::sun::star::frame::XModel + , ::utl::CloseableComponent + > SharedModel; + protected: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; SvStream* m_pStream; ::com::sun::star::awt::FontDescriptor m_aFont; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xObject; // table/query - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; // + SharedConnection m_xConnection; // ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xRow; // ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xResultSetMetaData; // ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; - ::std::auto_ptr< ::dbtools::ODataSourceHolder> m_aDataSourceHolder; + SharedModel m_aKeepModelAlive; ::rtl::OUString m_sName; ::rtl::OUString m_sDataSourceName; sal_Int32 m_nCommandType; - sal_Bool m_bDisposeConnection; #if defined UNX || defined MAC static const char __FAR_DATA sNewLine; @@ -151,7 +160,7 @@ const String& rExchange = String()); // import data - ODatabaseImportExport( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + ODatabaseImportExport( 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); @@ -170,6 +179,9 @@ void enableCheckOnly() { m_bCheckOnly = sal_True; } sal_Bool isCheckEnabled() const { return m_bCheckOnly; } + + private: + void impl_initFromDescriptor( const ::svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; // ========================================================================= @@ -188,7 +200,7 @@ : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange) {}; // import data - ORTFImportExport( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + ORTFImportExport( 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) : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) @@ -232,7 +244,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const String& rExchange = String()); // import data - OHTMLImportExport( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + OHTMLImportExport( 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) : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) @@ -270,11 +282,12 @@ const String& rExchange = String()); // import data - ORowSetImportExport( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + ORowSetImportExport(const SharedConnection& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const String& rExchange = String()) : ODatabaseImportExport(_rxConnection,NULL,_rM) - {} + { +} virtual BOOL Write(); File [changed]: TableCopyHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/TableCopyHelper.hxx?r1=1.2&r2=1.2.84.1 Delta lines: +15 -12 --------------------- --- TableCopyHelper.hxx 21 Jan 2005 17:17:17 -0000 1.2 +++ TableCopyHelper.hxx 20 Jul 2005 09:56:41 -0000 1.2.84.1 @@ -2,9 +2,9 @@ * * $RCSfile: TableCopyHelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.84.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:17:17 $ + * last change: $Author: fs $ $Date: 2005/07/20 09:56:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,6 +64,9 @@ #ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" #endif +#ifndef _DBAUI_COMMON_TYPES_HXX_ +#include "commontypes.hxx" +#endif #ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include <svx/dataaccessdescriptor.hxx> #endif @@ -146,7 +149,7 @@ */ void pasteTable( const TransferableDataHelper& _rTransData ,const ::rtl::OUString& _sDestDataSourceName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + ,const SharedConnection& _xConnection); /** pastes a table into the data source @param _nFormatId @@ -159,7 +162,7 @@ void pasteTable( SotFormatStringId _nFormatId ,const TransferableDataHelper& _rTransData ,const ::rtl::OUString& _sDestDataSourceName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + ,const SharedConnection& _xConnection); /** pastes a table into the data source @param _rPasteData @@ -169,7 +172,7 @@ */ void pasteTable( ::svx::ODataAccessDescriptor& _rPasteData ,const ::rtl::OUString& _sDestDataSourceName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xDestConnection); + ,const SharedConnection& _xDestConnection); /** insert a table into the data source. The source can eihter be a table or a query @param _nCommandType @@ -207,9 +210,9 @@ @param _xConnection The connection */ - sal_Bool copyTagTable( DropDescriptor& _rDesc - , sal_Bool _bCheck - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + sal_Bool copyTagTable( DropDescriptor& _rDesc, + sal_Bool _bCheck, + const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF @param _rDesc @@ -221,7 +224,7 @@ */ void asyncCopyTagTable( DropDescriptor& _rDesc ,const ::rtl::OUString& _sDestDataSourceName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + ,const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF @param _aDroppedData @@ -231,9 +234,9 @@ @param _xConnection The connection */ - sal_Bool copyTagTable(const TransferableDataHelper& _aDroppedData - ,DropDescriptor& _rAsyncDrop - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + sal_Bool copyTagTable(const TransferableDataHelper& _aDroppedData, + DropDescriptor& _rAsyncDrop, + const SharedConnection& _xConnection); /// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>. sal_Bool isTableFormat(const TransferableDataHelper& _rClipboard) const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
