Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:12:23 Modified: dba/dbaccess/source/ui/misc/RtfReader.cxx
Log: RESYNC: (1.18-1.21); 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.16.4.4&r2=1.16.4.5 Delta lines: +17 -38 --------------------- --- RtfReader.cxx 25 Apr 2006 13:03:14 -0000 1.16.4.4 +++ RtfReader.cxx 4 Jul 2006 08:12:20 -0000 1.16.4.5 @@ -125,8 +125,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; -#define CONTAINER_ENTRY_NOTFOUND ((ULONG)0xFFFFFFFF) -DBG_NAME(ORTFReader); +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); } @@ -220,7 +220,7 @@ { try { - m_xResultSetUpdate->moveToInsertRow(); // sonst neue Zeile anh"angen + m_pUpdateHelper->moveToInsertRow(); // sonst neue Zeile anh"angen } catch(SQLException& e) // UpdateFehlerbehandlung @@ -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: @@ -261,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) ////////////////////////////////////////////////////////////////////// @@ -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; @@ -337,11 +321,6 @@ int nTmpToken2 = nToken; String aColumnName; - sal_Bool bColorSet=sal_False; - sal_Bool bBoldSet=sal_False; - sal_Bool bUnderlineSet=sal_False; - sal_Bool bStrikeoutSet=sal_False; - sal_Bool bItalicSet=sal_False; FontDescriptor aFont = ::dbaui::CreateFontDescriptor(Application::GetSettings().GetStyleSettings().GetAppFont()); do --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
