summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK_Karthikeyan <karthikeyan@kacst.edu.sa>2013-02-25 11:01:46 +0300
committerLior Kaplan <kaplanlior@gmail.com>2013-03-14 15:20:02 +0200
commit4c13903e61017b3d7869882aac1ec272a2c4474c (patch)
tree865d837c2bc03fc6c4a5e582c27c760481958b0b
parentcbfcc02027b64f71b2d888e438a2e964d9da0f50 (diff)
Resolves fdo#60554
Resolves fdo#60554 borders disappear while merging cells Change-Id: I3d3464e8b75cc9b72a1592d8ef276243202e68b8 Reviewed-on: https://gerrit.libreoffice.org/2375 Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa> Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa> (cherry picked from commit 45a5dad0460a1a7d1a44716968b8c9ff4a23e04b) Signed-off-by: Lior Kaplan <kaplanlior@gmail.com>
-rw-r--r--svx/source/table/tablelayouter.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 15d85e9a251f..b581d8ff52c4 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -1024,7 +1024,7 @@ void TableLayouter::UpdateBorderLayout()
for( aPos.mnCol = 0; aPos.mnCol < nColCount; aPos.mnCol++ )
{
CellRef xCell( getCell( aPos ) );
- if( !xCell.is() || xCell->isMerged() )
+ if( !xCell.is() )
continue;
const SvxBoxItem* pThisAttr = (const SvxBoxItem*)xCell->GetItemSet().GetItem( SDRATTR_TABLE_BORDER );