From df685a3faacd5952ea6dca373c7f304dbfb43e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= Date: Thu, 20 Jun 2013 11:32:04 +0200 Subject: [PATCH] Page border bug: margin edits are enable when no broder To reproduce 1. Format -> Page 2. Set left and ritght borders only (All margins is editable) 4. Set inner margins bigger (using syncronize check box), for example 2 cm 5. Click OK Result Margin appaer just on the right and the left side, so just on those sides where there is a border. Expected: Only the relevant edits must be enable on border tab page just as in case of paragraph borders. Note to fix: Inner margin without border is used only for table, but not for other objects (paragraph, page, frame) Change-Id: Ie611eb29432cb7e75131154d94b4a8db1c3f1bb8 --- cui/source/tabpages/border.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index f43fbaecf686..cf10d122a4b1 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1075,8 +1075,8 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) // for tables everything is allowed sal_uInt16 nValid = VALID_TOP|VALID_BOTTOM|VALID_LEFT|VALID_RIGHT; - // for border and paragraph the edit is disabled, if there's no border set - if(nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_PARA)) + // for other objects (paragraph, page, frame) the edit is disabled, if there's no border set + if(!(nSWMode & SW_BORDER_MODE_TABLE)) { if(bLineSet) {