diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-14 09:51:44 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-15 10:30:53 +0200 |
| commit | dd5bf12193471f064bf7f581dd1b21783390e735 (patch) | |
| tree | 08fe1f42c67ef57eea478ac76c94aab519ac2169 /sw/source/uibase | |
| parent | 2bccb7e67b637c6312a0df610f870c8621eb296f (diff) | |
editengine-columns: add sidebar property panel
Change-Id: I90aefc10f9ddddeb64a65799480777bc4287abae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117107
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/shells/drawdlg.cxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx index 47b4064642e0..b18ce9327b68 100644 --- a/sw/source/uibase/shells/drawdlg.cxx +++ b/sw/source/uibase/shells/drawdlg.cxx @@ -368,7 +368,24 @@ void SwDrawShell::GetDrawAttrState(SfxItemSet& rSet) if( !bDisable ) { - pSdrView->GetAttributes( rSet ); + SfxItemSet aSet(rSet); + aSet.MergeRange(SDRATTR_TEXTCOLUMNS_NUMBER, SDRATTR_TEXTCOLUMNS_SPACING); + pSdrView->GetAttributes(aSet); + if (const SfxPoolItem * pItem; + aSet.GetItemState(SDRATTR_TEXTCOLUMNS_NUMBER, false, &pItem) + >= SfxItemState::DEFAULT + && pItem) + { + aSet.Put(pItem->CloneSetWhich(SID_ATTR_TEXTCOLUMNS_NUMBER)); + } + if (const SfxPoolItem * pItem; + aSet.GetItemState(SDRATTR_TEXTCOLUMNS_SPACING, false, &pItem) + >= SfxItemState::DEFAULT + && pItem) + { + aSet.Put(pItem->CloneSetWhich(SID_ATTR_TEXTCOLUMNS_SPACING)); + } + rSet.Put(aSet, false); if (comphelper::LibreOfficeKit::isActive()) lcl_unifyFillTransparencyItems(rSet); } |