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 14:31:48 +0200 |
| commit | bc472d12dbbbd187cb05e49cfde1ba434d7c7367 (patch) | |
| tree | 11f9541cb7ab882ad59573c3330076513ccfe244 /cui | |
| parent | 99de5eedf3f88d8928e1f7753f2497c9f34853d8 (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 'cui')
| -rw-r--r-- | cui/source/dialogs/sdrcelldlg.cxx | 7 | ||||
| -rw-r--r-- | cui/source/inc/border.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/border.cxx | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 2a2a982d6c47..547f7b12dbba 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -62,9 +62,10 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetPos( 0 ); ( (SvxAreaTabPage&) rPage ).Construct(); ( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs ); - - break; - + break; + case RID_SVXPAGE_BORDER: + ( (SvxBorderTabPage&) rPage ).SetTableMode(); + break; default: SfxTabDialog::PageCreated( nId, rPage ); break; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 8f66e5d97784..f4a4c2ad1d0f 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -50,6 +50,7 @@ public: void HideShadowControls(); virtual void PageCreated (SfxAllItemSet aSet); + void SetTableMode(); protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 8c436233f3c1..a8d868695acb 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1194,6 +1194,9 @@ void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) HideShadowControls(); } -// ============================================================================ +void SvxBorderTabPage::SetTableMode() +{ + nSWMode = SW_BORDER_MODE_TABLE; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |