diff options
| author | Dennis Francis <dennisfrancis.in@gmail.com> | 2015-11-01 03:49:38 +0530 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-12-07 13:49:53 +0000 |
| commit | 2e512174f2116d86682037459fd5ab5164e9f510 (patch) | |
| tree | f28b135f29c1246a7a1f6a766de1214ab49f3bf6 /editeng | |
| parent | 1a032dcfebc2702f0612c470d6b9c3e3cf4fb637 (diff) | |
tdf#34449 : ability of deleting borders of a cell from adjacent cell
Change-Id: Ieb13a9ea88faa220d1ee352b0e47268a7fda5f38
Reviewed-on: https://gerrit.libreoffice.org/19715
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 10211e45db97..69c18f3ea4db 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1611,7 +1611,8 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) : nTopDist ( rCpy.nTopDist ), nBottomDist ( rCpy.nBottomDist ), nLeftDist ( rCpy.nLeftDist ), - nRightDist ( rCpy.nRightDist ) + nRightDist ( rCpy.nRightDist ), + bRemoveAdjCellBorder ( rCpy.bRemoveAdjCellBorder ) { pTop = rCpy.GetTop() ? new SvxBorderLine( *rCpy.GetTop() ) : nullptr; @@ -1632,8 +1633,8 @@ SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : nTopDist ( 0 ), nBottomDist ( 0 ), nLeftDist ( 0 ), - nRightDist ( 0 ) - + nRightDist ( 0 ), + bRemoveAdjCellBorder ( false ) { } @@ -1655,6 +1656,7 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) nBottomDist = rBox.nBottomDist; nLeftDist = rBox.nLeftDist; nRightDist = rBox.nRightDist; + bRemoveAdjCellBorder = rBox.bRemoveAdjCellBorder; SetLine( rBox.GetTop(), SvxBoxItemLine::TOP ); SetLine( rBox.GetBottom(), SvxBoxItemLine::BOTTOM ); SetLine( rBox.GetLeft(), SvxBoxItemLine::LEFT ); @@ -1685,6 +1687,7 @@ bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const ( nBottomDist == rBoxItem.nBottomDist ) && ( nLeftDist == rBoxItem.nLeftDist ) && ( nRightDist == rBoxItem.nRightDist ) && + ( bRemoveAdjCellBorder == rBoxItem.bRemoveAdjCellBorder ) && CmpBrdLn( pTop, rBoxItem.GetTop() ) && CmpBrdLn( pBottom, rBoxItem.GetBottom() ) && CmpBrdLn( pLeft, rBoxItem.GetLeft() ) && |