From bc472d12dbbbd187cb05e49cfde1ba434d7c7367 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 3 Jun 2014 14:11:39 +0200 Subject: bnc#882627: Allow to edit spacing to contents even with no borders visible. SfxItemSet::MergeValue changes some items from SFX_ITEM_DEFAULT state to SFX_ITEM_SET which I think is a bug but this patch avoids the problem too. The issue was: visible changes in some tables, after changing e.g. borders spacing, because the cells had wrong SfxItemSet after the process. (cherry picked from commit b1d8df61b47e84bf0de64342556049673dd9c543) Signed-off-by: Andras Timar Conflicts: cui/source/dialogs/sdrcelldlg.cxx cui/source/inc/border.hxx cui/source/inc/sdrcelldlg.hxx cui/source/tabpages/border.cxx svx/source/table/tablecontroller.cxx Change-Id: I676b211e1a4a1d7341c385d63503aa740718ed5d --- svx/source/table/tablecontroller.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svx') diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index a1bf2a921bd3..a926891f4e7d 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -735,7 +735,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) SvxBoxInfoItem aBoxInfoItem( static_cast< const SvxBoxInfoItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) ); - MergeAttrFromSelectedCells(aNewAttr, sal_False); + MergeAttrFromSelectedCells(aNewAttr, sal_True); FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem ); aNewAttr.Put( aBoxItem ); aNewAttr.Put( aBoxInfoItem ); -- cgit