diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-06-03 14:11:39 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-18 13:07:35 +0200 |
| commit | 0241a464fc5a142f368d1c2eb3da6f8cf420b26a (patch) | |
| tree | a15ee22c73da36f1d43b6203105f729b77b3fbc0 /svx/source/table | |
| parent | 5767cac0c1647908e091724df2de246d9caca3b4 (diff) | |
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 <andras.timar@collabora.com>
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
Diffstat (limited to 'svx/source/table')
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index a2f68bd27742..c03ebbc1e59e 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 ); |