diff options
| author | nd101 <Fong@nd.com.cn> | 2020-05-09 11:45:25 +0800 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-29 12:03:34 +0200 |
| commit | 2b19cd84f10552c438dace0a4c52a70ccd440369 (patch) | |
| tree | 8aa6e793074cf336b115f4c06f543aacb92e4cf5 /svx | |
| parent | 5ad17c85dc93973c0cbb1d633b9eed144f0677de (diff) | |
tdf#115753 fix table border missing when there are merged cells
Remove code that ignores merged cells.
Change-Id: I907220e9ffc9d18561171efd7d6b39d14a8341fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93836
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/table/viewcontactoftableobj.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index fe6d03f1d900..d2778e333383 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -254,20 +254,6 @@ namespace sdr::contact aArray.SetCellStyleRight(aCellPos.mnCol, aCellPos.mnRow, impGetLineStyle(rTableLayouter, aCellPos.mnCol + 1, aCellPos.mnRow, false, nColCount, nRowCount, bIsRTL)); aArray.SetCellStyleTop(aCellPos.mnCol, aCellPos.mnRow, impGetLineStyle(rTableLayouter, aCellPos.mnCol, aCellPos.mnRow, true, nColCount, nRowCount, bIsRTL)); aArray.SetCellStyleBottom(aCellPos.mnCol, aCellPos.mnRow, impGetLineStyle(rTableLayouter, aCellPos.mnCol, aCellPos.mnRow + 1, true, nColCount, nRowCount, bIsRTL)); - - // ignore merged cells (all except the top-left of a merged cell) - if(!xCurrentCell->isMerged()) - { - // check if we are the top-left of a merged cell - const sal_Int32 nXSpan(xCurrentCell->getColumnSpan()); - const sal_Int32 nYSpan(xCurrentCell->getRowSpan()); - - if(nXSpan > 1 || nYSpan > 1) - { - // if merged, set so at CellBorderArray for primitive creation - aArray.SetMergedRange(aCellPos.mnCol, aCellPos.mnRow, aCellPos.mnCol + nXSpan - 1, aCellPos.mnRow + nYSpan - 1); - } - } } if(xCurrentCell.is() && !xCurrentCell->isMerged()) |