User: rt Date: 2008-01-30 08:50:36+0000 Modified: dba/dbaccess/source/ui/misc/RtfReader.cxx
Log: INTEGRATION: CWS dba24d (1.23.70); FILE MERGED 2007/12/01 13:41:22 fs 1.23.70.2: RESYNC: (1.23-1.24); FILE MERGED 2007/11/08 14:25:10 fs 1.23.70.1: #i81658# re-factoring of the Copy Table wizard File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: RtfReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/RtfReader.cxx?r1=1.24&r2=1.25 Delta lines: +6 -5 ------------------- --- RtfReader.cxx 2007-11-21 16:06:36+0000 1.24 +++ RtfReader.cxx 2008-01-30 08:50:34+0000 1.25 @@ -138,8 +138,8 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) - : SvRTFParser(rIn) - ,ODatabaseExport(_rxConnection,_rxNumberF,_rM,pList,_pInfoMap) + :SvRTFParser(rIn) + ,ODatabaseExport( _rxConnection, _rxNumberF, _rM, pList, _pInfoMap, rIn ) { DBG_CTOR(ORTFReader,NULL); m_bAppendFirstLine = false; @@ -154,7 +154,7 @@ const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled) :SvRTFParser(rIn) - ,ODatabaseExport(nRows,_rColumnPositions,_rxNumberF,_rM,pList,_pInfoMap,_bAutoIncrementEnabled) + ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rM, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) { DBG_CTOR(ORTFReader,NULL); m_bAppendFirstLine = false; @@ -420,11 +420,12 @@ DBG_CHKTHIS(ORTFReader,NULL); ReleaseRef(); } + // ----------------------------------------------------------------------------- -OWizTypeSelect* ORTFReader::createPage(Window* _pParent) +TypeSelectionPageFactory ORTFReader::getTypeSelectionPageFactory() { DBG_CHKTHIS(ORTFReader,NULL); - return new OWizRTFExtend(_pParent,rInput); + return &OWizRTFExtend::Create; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
