From 8a34ff14f18da0df261ae8f1ca3f23de157706a1 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 23 Nov 2016 08:16:17 +0300 Subject: tdf#41542 globally allow padding without borders: UI This is the final fix for tdf#41542 - enabling the UI to adjust the padding without requiring an enabled border line. Because almost every document edited by LO5.3 will gain the setting ALLOW_PADDING_WITHOUT_BORDERS = false, it cannot be kept as a preventative compatibility setting. Otherwise any document edited in 5.3 would act differently from any other document - not being allowed to modify borderless padding for frames, even in 5.4+. That would be a very confusing corner-case that is best avoided, so removing all compatibility code (which currently has no use). So, if an AllowPaddingWithoutBorders=false compatibility situation is ever required in the future, do not resurrect the name ALLOW_PADDING_WITHOUT_BORDRES. Additionally, code will also be needed to send the compatibility setting for each type of border (page, paragraph, character, header, frames, image). See commit f013d4a1f4073cda735befd6e446bee35f3db65c as an example of how to implement that for frames. This commit means there is a lot of dead code now (m_bBorderDist and mbAllowPaddingWithoutBorders are always true). LO5.7 seems like a good target to clean that up - to allow time to easily fix any regressions. Change-Id: I2d2091fa34f8b178a59347b35a81c944c9b24ed7 Reviewed-on: https://gerrit.libreoffice.org/31105 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: Miklos Vajna --- cui/source/tabpages/border.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'cui') diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index f989a7ce7af6..d67df7f7c588 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -102,7 +102,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore mbTLBREnabled( false ), mbBLTREnabled( false ), mbUseMarginItem( false ), - mbAllowPaddingWithoutBorders( false ), + mbAllowPaddingWithoutBorders( true ), mbSync(true), mbRemoveAdjacentCellBorders( false ), bIsCalcDoc( false ) @@ -181,11 +181,6 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore m_pLineWidthMF->SetValue(p->GetValue()); } - if (rCoreAttrs.HasItem(SID_ALLOW_PADDING_WITHOUT_BORDERS, &pItem)) - { - mbAllowPaddingWithoutBorders = static_cast(pItem)->GetValue(); - } - // set metric FieldUnit eFUnit = GetModuleFieldUnit( rCoreAttrs ); -- cgit v1.2.3