User: rt Date: 06/05/04 01:44:42 Modified: /dba/dbaccess/source/ui/misc/ RtfReader.cxx
Log: INTEGRATION: CWS dba203c (1.18.50); FILE MERGED 2006/04/24 13:45:01 oj 1.18.50.2: RESYNC: (1.18-1.19); FILE MERGED 2006/04/13 13:55:20 oj 1.18.50.1: #i62797# format regconition corrected 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.19&r2=1.20 Delta lines: +10 -26 --------------------- --- RtfReader.cxx 19 Apr 2006 13:23:02 -0000 1.19 +++ RtfReader.cxx 4 May 2006 08:44:40 -0000 1.20 @@ -125,7 +125,6 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; -#define CONTAINER_ENTRY_NOTFOUND ((ULONG)0xFFFFFFFF) DBG_NAME(ORTFReader); // ========================================================================== // ORTFReader @@ -148,9 +147,10 @@ const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, - const OTypeInfoMap* _pInfoMap) + const OTypeInfoMap* _pInfoMap, + sal_Bool _bAutoIncrementEnabled) :SvRTFParser(rIn) - ,ODatabaseExport(nRows,_rColumnPositions,_rxNumberF,_rM,pList,_pInfoMap) + ,ODatabaseExport(nRows,_rColumnPositions,_rxNumberF,_rM,pList,_pInfoMap,_bAutoIncrementEnabled) { DBG_CTOR(ORTFReader,NULL); } @@ -231,7 +231,10 @@ break; case RTF_INTBL: if(m_bInTbl) - m_sTextToken.Erase(); + { + eraseTokens(); + } + m_bInTbl = TRUE; // jetzt befinden wir uns in einer Tabellenbeschreibung break; case RTF_TEXTTOKEN: @@ -251,7 +254,7 @@ showErrorDialog(e); } m_nColumnPos++; - m_sTextToken.Erase(); + eraseTokens(); } break; case RTF_ROW: @@ -297,30 +300,11 @@ m_sTextToken += aToken; break; case RTF_CELL: - if(m_sTextToken.Len()) - { - sal_Int32 nColPos = m_vColumns[m_nColumnPos].first; - if(nColPos != CONTAINER_ENTRY_NOTFOUND) - { - m_vFormatKey[nColPos] = CheckString(m_sTextToken,m_vFormatKey[nColPos]); - m_vColumnSize[nColPos] = ::std::max<sal_Int32>(m_vColumnSize[nColPos],(sal_Int32)m_sTextToken.Len()); - } - - m_sTextToken.Erase(); - } + adjustFormat(); m_nColumnPos++; break; case RTF_ROW: - if(m_sTextToken.Len()) - { - sal_Int32 nColPos = m_vColumns[m_nColumnPos].first; - if(nColPos != CONTAINER_ENTRY_NOTFOUND) - { - m_vFormatKey[nColPos] = CheckString(m_sTextToken,m_vFormatKey[nColPos]); - m_vColumnSize[nColPos] = ::std::max<sal_Int32>(m_vColumnSize[nColPos],(sal_Int32)m_sTextToken.Len()); - } - m_sTextToken.Erase(); - } + adjustFormat(); m_nColumnPos = 0; m_nRows--; break; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
