diff options
| author | Release Engineers <releng@openoffice.org> | 2008-12-01 15:44:36 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2008-12-01 15:44:36 +0000 |
| commit | 5559afee02fc2be18cded35a17a03aa8191b08f5 (patch) | |
| tree | 30480a8027f9e85f3c76aa7de2799bdb7cad235e /sw/source/filter/html/htmltab.cxx | |
| parent | a32d78a5175178eba6d6c93f2441b4698bf05974 (diff) | |
CWS-TOOLING: integrate CWS sw301bf03_DEV300
Diffstat (limited to 'sw/source/filter/html/htmltab.cxx')
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index d04ae9d3d523..7ff16864141a 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: htmltab.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.186.1 $ * * This file is part of OpenOffice.org. * @@ -1820,8 +1820,10 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper, pCnts->CreateLayoutInfo(); pCell2->SetContents( pCnts ); - pLayoutInfo->GetCell( nTopRow, nStartCol ) - ->SetContents( pCntsLayoutInfo ); + SwHTMLTableLayoutCell *pCurrCell = pLayoutInfo->GetCell( nTopRow, nStartCol ); + pCurrCell->SetContents( pCntsLayoutInfo ); + if( nBoxRowSpan < 0 ) + pCurrCell->SetRowSpan( 0 ); // ggf. COLSPAN beachten for( sal_uInt16 j=nStartCol+1; j<nSplitCol; j++ ) |