User: ihi Date: 2007-11-21 16:06:38+0000 Modified: dba/dbaccess/source/ui/misc/RtfReader.cxx
Log: INTEGRATION: CWS dba24c (1.23.40); FILE MERGED 2007/11/12 15:48:17 oj 1.23.40.5: #i80917# reverse changes 2007/10/15 10:48:06 oj 1.23.40.4: #i80916# #i80917# special handling for table formats which doesn't have a header definition 2007/10/12 12:54:30 oj 1.23.40.3: #i80917# append first line as first data row 2007/10/12 12:31:12 oj 1.23.40.2: #i80917# append first line as first data row 2007/10/12 12:27:14 oj 1.23.40.1: #i80917# append first line as first data row 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.23&r2=1.24 Delta lines: +34 -16 --------------------- --- RtfReader.cxx 2007-07-06 08:33:29+0000 1.23 +++ RtfReader.cxx 2007-11-21 16:06:36+0000 1.24 @@ -142,6 +142,7 @@ ,ODatabaseExport(_rxConnection,_rxNumberF,_rM,pList,_pInfoMap) { DBG_CTOR(ORTFReader,NULL); + m_bAppendFirstLine = false; } // --------------------------------------------------------------------------- ORTFReader::ORTFReader(SvStream& rIn, @@ -156,6 +157,7 @@ ,ODatabaseExport(nRows,_rColumnPositions,_rxNumberF,_rM,pList,_pInfoMap,_bAutoIncrementEnabled) { DBG_CTOR(ORTFReader,NULL); + m_bAppendFirstLine = false; } // --------------------------------------------------------------------------- ORTFReader::~ORTFReader() @@ -217,9 +219,20 @@ m_nDefToken = (rtl_TextEncoding)nTokenValue; break; case RTF_TROWD: - if(!m_xTable.is()) // erste Zeile als Header verwenden + { + sal_uInt32 nTell = rInput.Tell(); // verändert vielleicht die Position des Streams + bool bInsertRow = true; + if ( !m_xTable.is() ) // erste Zeile als Header verwenden + { m_bError = !CreateTable(nToken); - else + bInsertRow = m_bAppendFirstLine; + if ( m_bAppendFirstLine ) + { + rInput.Seek(nTell); + bInsertRow = true; + } + } + if ( bInsertRow && !m_bError) { try { @@ -231,6 +244,7 @@ showErrorDialog(e); } } + } break; case RTF_INTBL: if(m_bInTbl) @@ -350,7 +364,7 @@ { aColumnName.EraseLeadingChars(); aColumnName.EraseTrailingChars(); - if (!aColumnName.Len()) + if (!aColumnName.Len() || m_bAppendFirstLine ) aColumnName = String(ModuleRes(STR_COLUMN_NAME)); CreateDefaultColumn(aColumnName); @@ -380,8 +394,12 @@ sal_Bool bOk = !m_vDestVector.empty(); if(bOk) { - if(aColumnName.Len()) + if ( aColumnName.Len() ) + { + if ( m_bAppendFirstLine ) + aColumnName = String(ModuleRes(STR_COLUMN_NAME)); CreateDefaultColumn(aColumnName); + } m_bInTbl = sal_False; m_bFoundTable = sal_True; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
