User: rt Date: 2008-01-30 08:50:22+0000 Modified: dba/dbaccess/source/ui/misc/HtmlReader.cxx
Log: INTEGRATION: CWS dba24d (1.30.86); FILE MERGED 2007/12/01 13:41:20 fs 1.30.86.2: RESYNC: (1.30-1.31); FILE MERGED 2007/11/08 14:25:10 fs 1.30.86.1: #i81658# re-factoring of the Copy Table wizard File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: HtmlReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/HtmlReader.cxx?r1=1.31&r2=1.32 Delta lines: +6 -6 ------------------- --- HtmlReader.cxx 2007-11-21 16:06:18+0000 1.31 +++ HtmlReader.cxx 2008-01-30 08:50:19+0000 1.32 @@ -183,8 +183,8 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) - : HTMLParser(rIn) - ,ODatabaseExport(_rxConnection,_rxNumberF,_rM,pList,_pInfoMap) + :HTMLParser(rIn) + ,ODatabaseExport( _rxConnection, _rxNumberF, _rM, pList, _pInfoMap, rIn ) ,m_nTableCount(0) ,m_nColumnWidth(87) ,m_bMetaOptions(sal_False) @@ -204,8 +204,8 @@ const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled) - : HTMLParser(rIn) - ,ODatabaseExport(nRows,_rColumnPositions,_rxNumberF,_rM,pList,_pInfoMap,_bAutoIncrementEnabled) + :HTMLParser(rIn) + ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rM, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) ,m_nTableCount(0) ,m_nColumnWidth(87) ,m_bMetaOptions(sal_False) @@ -671,10 +671,10 @@ ReleaseRef(); } // ----------------------------------------------------------------------------- -OWizTypeSelect* OHTMLReader::createPage(Window* _pParent) +TypeSelectionPageFactory OHTMLReader::getTypeSelectionPageFactory() { DBG_CHKTHIS(OHTMLReader,NULL); - return new OWizHTMLExtend(_pParent,rInput); + return &OWizHTMLExtend::Create; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
