sw/source/uibase/docvw/HeaderFooterWin.cxx | 14 ++++++++++++++
1 file changed, 14 insertions(+)
New commits:
commit f0da825749968d22a05c7257b812378c6b2f0ecf
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Wed Oct 30 20:38:35 2019 -0800
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 4 13:52:28 2019 +0100
tdf#128431 Box info item is needed by the Border Background dialog
...so put it back
Change-Id: Ie2883410514496c247f840fb2d6755bec362a8b2
Reviewed-on: https://gerrit.libreoffice.org/81815
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <rayk...@gmail.com>
(cherry picked from commit cec27978b869309dcaf84faf000106fefe0ab166)
Reviewed-on: https://gerrit.libreoffice.org/81991
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx
b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 45d84a630281..4e3fba727957 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -439,6 +439,20 @@ void SwHeaderFooterWin::ExecuteCommand(const OString&
rIdent)
// the Area TabPage can access them
rSh.GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->PutAreaListItems(
aSet );
+ aSet.MergeRange(SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER);
+ // Create a box info item... needed by the dialog
+ std::shared_ptr<SvxBoxInfoItem>
aBoxInfo(std::make_shared<SvxBoxInfoItem>(SID_ATTR_BORDER_INNER));
+ const SfxPoolItem *pBoxInfo;
+ if (SfxItemState::SET ==
pHFFormat->GetAttrSet().GetItemState(SID_ATTR_BORDER_INNER, true, &pBoxInfo))
+ aBoxInfo.reset(static_cast<SvxBoxInfoItem*>(pBoxInfo->Clone()));
+
+ aBoxInfo->SetTable(false);
+ aBoxInfo->SetDist(true);
+ aBoxInfo->SetMinDist(false);
+ aBoxInfo->SetDefDist(MIN_BORDER_DIST);
+ aBoxInfo->SetValid(SvxBoxInfoItemValidFlags::DISABLE);
+ aSet.Put(*aBoxInfo);
+
if (svx::ShowBorderBackgroundDlg( GetFrameWeld(), &aSet ) )
{
pHFFormat->SetFormatAttr( aSet );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
