diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:50:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:50:34 +0000 |
| commit | ecfc9a616fc0766f62fcfb1adc57f227d8df1f1b (patch) | |
| tree | 58917636989a856008d0ba2b5bab9cdf5cd2894d /dbaccess/source/ui/misc/RtfReader.cxx | |
| parent | a669261641cbfa4cfd146befb74eb73f6793244a (diff) | |
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
Diffstat (limited to 'dbaccess/source/ui/misc/RtfReader.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index bc782d1c5388..c222f390b87b 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -4,9 +4,9 @@ * * $RCSfile: RtfReader.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: ihi $ $Date: 2007-11-21 16:06:36 $ + * last change: $Author: rt $ $Date: 2008-01-30 08:50:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -138,8 +138,8 @@ ORTFReader::ORTFReader( SvStream& rIn, 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 @@ ORTFReader::ORTFReader(SvStream& rIn, 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 @@ void ORTFReader::release() 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; } // ----------------------------------------------------------------------------- |