tdf#154543 - Paragraph dialog: reset snap to grid to parent setting
Added the SID_ATTR_PARA_SNAPTOGRID to the alignment ranges in order to
reset the snap to grid option to the corresponding parent setting.
Without this parameter, the main dialog does not have any knowledge
about this option.
Change-Id: Ib090fae0919be54dd41674d129f5355c3566a90c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159565
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 7c8f2dc..132b125 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -66,7 +66,11 @@ const WhichRangesContainer SvxStdParagraphTabPage::pStdRanges(
>);
const WhichRangesContainer SvxParaAlignTabPage::pAlignRanges(
svl::Items<SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_ADJUST>); // 10027
svl::Items<
SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_ADJUST, // 10027
// tdf#154543 - reset snap to grid to parent
SID_ATTR_PARA_SNAPTOGRID, SID_ATTR_PARA_SNAPTOGRID // 10945
>);
const WhichRangesContainer SvxParaAlignTabPage::pSdrAlignRanges(
svl::Items<
diff --git a/sw/qa/uitest/writer_tests5/tdf154543.py b/sw/qa/uitest/writer_tests5/tdf154543.py
new file mode 100755
index 0000000..ab6ab0a
--- /dev/null
+++ b/sw/qa/uitest/writer_tests5/tdf154543.py
@@ -0,0 +1,39 @@
# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
from uitest.framework import UITestCase
from uitest.uihelper.common import select_pos
from uitest.uihelper.common import get_state_as_dict
class tdf154543(UITestCase):
def test_tdf154543_reset_snap_to_grid_parent(self):
with self.ui_test.create_doc_in_start_center("writer"):
# Open the paragraph style dialog and unselect the snap to grid checkbox
with self.ui_test.execute_dialog_through_command(".uno:EditStyle") as xDialog:
xTabs = xDialog.getChild("tabcontrol")
select_pos(xTabs, "2")
xSnapCheckbox = xTabs.getChild("checkCB_SNAP")
xSnapCheckbox.executeAction("CLICK", tuple())
self.assertEqual(get_state_as_dict(xSnapCheckbox)["Selected"], "false")
# Open the paragraph style dialog and reset dialog to parent settings
with self.ui_test.execute_dialog_through_command(".uno:EditStyle") as xDialog:
xTabs = xDialog.getChild("tabcontrol")
select_pos(xTabs, "2")
xSnapCheckbox = xTabs.getChild("checkCB_SNAP")
xStandardButton = xDialog.getChild("standard")
xStandardButton.executeAction("CLICK", tuple())
# Without the fix in place, this test would have failed with
# AssertionError: 'false' != 'true'
self.assertEqual(get_state_as_dict(xSnapCheckbox)["Selected"], "true")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
