Tag: cws_src680_warnings01 User: sb Date: 06/05/23 16:58:04 Modified: /dba/dbaccess/source/ui/misc/ RtfReader.cxx
Log: RESYNC: (1.18-1.20); FILE MERGED 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.18.4.1&r2=1.18.4.2 Delta lines: +16 -31 --------------------- --- RtfReader.cxx 24 Mar 2006 15:36:21 -0000 1.18.4.1 +++ RtfReader.cxx 23 May 2006 23:58:01 -0000 1.18.4.2 @@ -147,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); } @@ -219,7 +220,7 @@ { try { - m_xResultSetUpdate->moveToInsertRow(); // sonst neue Zeile anh"angen + m_pUpdateHelper->moveToInsertRow(); // sonst neue Zeile anh"angen } catch(SQLException& e) // UpdateFehlerbehandlung @@ -230,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: @@ -250,7 +254,7 @@ showErrorDialog(e); } m_nColumnPos++; - m_sTextToken.Erase(); + eraseTokens(); } break; case RTF_ROW: @@ -260,8 +264,8 @@ insertValueIntoColumn(); m_nRowCount++; if(m_bIsAutoIncrement) // if bSetAutoIncrement then I have to set the autoincrement - m_xRowUpdate->updateInt(1,m_nRowCount); - m_xResultSetUpdate->insertRow(); + m_pUpdateHelper->updateInt(1,m_nRowCount); + m_pUpdateHelper->insertRow(); } catch(SQLException& e) ////////////////////////////////////////////////////////////////////// @@ -296,30 +300,11 @@ m_sTextToken += aToken; break; case RTF_CELL: - if(m_sTextToken.Len()) - { - sal_Int32 nColPos = m_vColumns[m_nColumnPos].first; - if ( nColPos != COLUMN_POSITION_NOT_FOUND ) - { - 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 != COLUMN_POSITION_NOT_FOUND ) - { - 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]
