sw/qa/uitest/data/tdf152006.fodt | 108 ++++++++++++++++++++++++++++++++
sw/qa/uitest/writer_tests8/tdf152006.py | 72 +++++++++++++++++++++
sw/source/ui/misc/pggrid.cxx | 28 ++++----
sw/source/uibase/inc/pggrid.hxx | 1
4 files changed, 197 insertions(+), 12 deletions(-)
New commits:
commit 21c5006f2e973c1d62085de29c3f4240dce1a4ff
Author: Jonathan Clark <jonat...@libreoffice.org>
AuthorDate: Thu May 22 07:11:32 2025 -0600
Commit: Jonathan Clark <jonat...@libreoffice.org>
CommitDate: Fri May 23 15:38:23 2025 +0200
tdf#152006 sw: Fix nonresponsive apply button in Text Grid settings
Previously, there was a situational bug causing the Page Style->Text
Grid settings to fail to update after clicking the Apply button. This
change fixes that bug.
Change-Id: I260ecc9c72d1e9a575597c57e3145dd1952cba0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185676
Tested-by: Jenkins
Reviewed-by: Jonathan Clark <jonat...@libreoffice.org>
diff --git a/sw/qa/uitest/data/tdf152006.fodt b/sw/qa/uitest/data/tdf152006.fodt
new file mode 100644
index 000000000000..2da09e48bf12
--- /dev/null
+++ b/sw/qa/uitest/data/tdf152006.fodt
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.4" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:meta><meta:document-statistic meta:table-count="0"
meta:image-count="0" meta:object-count="0" meta:page-count="1"
meta:paragraph-count="0" meta:word-count="0" meta:character-count="0"
meta:non-whitespace-character-count="0"/><meta:creation-date>2025-05-22T06:36:29.101249778</meta:creation-date><meta:generator>LibreOfficeDev/25.8.0.0.alpha1$Linux_X86_64
LibreOffice_project/29edbf28fc3135ccc6d84f9484df939c5f891746</meta:generator></office:meta>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation
Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans1" svg:font-family="'Noto Sans'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Serif CJK SC" svg:font-family="'Noto Serif
CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap"
draw:shadow-offset-x="0.1181in" draw:shadow-offset-y="0.1181in"
draw:start-line-spacing-horizontal="0.1114in"
draw:start-line-spacing-vertical="0.1114in"
draw:end-line-spacing-horizontal="0.1114in"
draw:end-line-spacing-vertical="0.1114in" style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0in"
style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Noto Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:orphans="2" fo:widows="2"
fo:hyphenation-ladder-count="no-limit" fo:hyphenation-keep="auto"
loext:hyphenation-keep-type="column" loext:hyphenation-keep-line="false"
style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging"
style:line-break="strict" style:tab-stop-distance="0.4925in"
style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Noto Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false"
fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"
loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false"
loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
+ </style:default-style>
+ <style:default-style style:family="table">
+ <style:table-properties table:border-model="collapsing"/>
+ </style:default-style>
+ <style:default-style style:family="table-row">
+ <style:table-row-properties fo:keep-together="auto"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
+ <text:outline-style style:name="Outline">
+ <text:outline-level-style text:level="1" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="2" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="3" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="4" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="5" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="6" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="7" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="8" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="9" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="10" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ </text:outline-style>
+ <text:notes-configuration text:note-class="footnote" style:num-format="1"
text:start-value="0" text:footnotes-position="page"
text:start-numbering-at="document"/>
+ <text:notes-configuration text:note-class="endnote" style:num-format="i"
text:start-value="0"/>
+ <text:linenumbering-configuration text:number-lines="false"
text:offset="0.1965in" style:num-format="1" text:number-position="left"
text:increment="5"/>
+ </office:styles>
+ <office:automatic-styles>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="8.2681in"
fo:page-height="11.6929in" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="0.7874in"
fo:margin-bottom="0.7874in" fo:margin-left="0.7874in"
fo:margin-right="0.7874in" style:writing-mode="lr-tb"
style:footnote-max-height="0in" loext:margin-gutter="0in">
+ <style:footnote-sep style:width="0.0071in"
style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text>
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0"
text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+ </text:sequence-decls>
+ <text:p text:style-name="Standard"/>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/uitest/writer_tests8/tdf152006.py
b/sw/qa/uitest/writer_tests8/tdf152006.py
new file mode 100644
index 000000000000..2a52235a5670
--- /dev/null
+++ b/sw/qa/uitest/writer_tests8/tdf152006.py
@@ -0,0 +1,72 @@
+# -*- 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 get_state_as_dict, get_url_for_data_file
+
+class tdf152006(UITestCase):
+
+ def test_tdf_152006(self):
+ with self.ui_test.load_file(get_url_for_data_file('tdf152006.fodt')):
+ with
self.ui_test.execute_dialog_through_command('.uno:PageDialog') as xDialog:
+ xApply = xDialog.getChild('apply')
+
+ xLinesGridRB = xDialog.getChild('radioRB_LINESGRID')
+ xDisplayCB = xDialog.getChild('checkCB_DISPLAY')
+
+ # Document starts in state with no grid, not displayed
+ self.assertEqual('false',
get_state_as_dict(xDisplayCB)['Selected']);
+
+ xLinesGridRB.executeAction('CLICK', tuple());
+ xDisplayCB.executeAction('CLICK', tuple());
+
+ self.assertEqual('true',
get_state_as_dict(xDisplayCB)['Selected']);
+
+ # First apply: enable grid and display
+ xApply.executeAction('CLICK', tuple());
+
+ with
self.ui_test.execute_dialog_through_command('.uno:PageDialog') as xDialog:
+ xApply = xDialog.getChild('apply')
+
+ xNoGridRB = xDialog.getChild('radioRB_NOGRID')
+ xLinesGridRB = xDialog.getChild('radioRB_LINESGRID')
+ xDisplayCB = xDialog.getChild('checkCB_DISPLAY')
+
+ self.assertEqual('true',
get_state_as_dict(xDisplayCB)['Selected']);
+
+ xNoGridRB.executeAction('CLICK', tuple());
+
+ # Second apply: disable grid only
+ xApply.executeAction('CLICK', tuple());
+
+ xLinesGridRB.executeAction('CLICK', tuple());
+
+ self.assertEqual('true',
get_state_as_dict(xDisplayCB)['Selected']);
+
+ xDisplayCB.executeAction('CLICK', tuple());
+
+ self.assertEqual('false',
get_state_as_dict(xDisplayCB)['Selected']);
+
+ # Third apply: enable grid and disable display
+ xApply.executeAction('CLICK', tuple());
+
+ xDisplayCB.executeAction('CLICK', tuple());
+
+ # Fourth apply: enable display
+ xApply.executeAction('CLICK', tuple());
+
+ with
self.ui_test.execute_dialog_through_command('.uno:PageDialog') as xDialog:
+ xLinesGridRB = xDialog.getChild('radioRB_LINESGRID')
+ xDisplayCB = xDialog.getChild('checkCB_DISPLAY')
+
+ # The above steps should have enabled the grid and enabled
display.
+ # Without the fix, the display will still be disabled.
+ self.assertEqual('true',
get_state_as_dict(xDisplayCB)['Selected']);
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 743a108e1d73..c6677cb56255 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -131,18 +131,18 @@ std::unique_ptr<SfxTabPage>
SwTextGridPage::Create(weld::Container* pPage, weld:
bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
{
bool bRet = false;
- if (m_xNoGridRB->get_state_changed_from_saved() ||
- m_xLinesGridRB->get_state_changed_from_saved() ||
- m_xLinesPerPageNF->get_value_changed_from_saved() ||
- m_xTextSizeMF->get_value_changed_from_saved() ||
- m_xCharsPerLineNF->get_value_changed_from_saved() ||
- m_xSnapToCharsCB->get_state_changed_from_saved() ||
- m_xRubySizeMF->get_value_changed_from_saved() ||
- m_xCharWidthMF->get_value_changed_from_saved() ||
- m_xRubyBelowCB->get_state_changed_from_saved() ||
- m_xDisplayCB->get_state_changed_from_saved() ||
- m_xPrintCB->get_state_changed_from_saved() ||
- m_xColorLB->IsValueChangedFromSaved())
+ if (m_xNoGridRB->get_state_changed_from_saved()
+ || m_xLinesGridRB->get_state_changed_from_saved()
+ || m_xLinesPerPageNF->get_value_changed_from_saved()
+ || m_xTextSizeMF->get_value_changed_from_saved()
+ || m_xCharsPerLineNF->get_value_changed_from_saved()
+ || m_xSnapToCharsCB->get_state_changed_from_saved()
+ || m_xRubySizeMF->get_value_changed_from_saved()
+ || m_xCharWidthMF->get_value_changed_from_saved()
+ || m_xRubyBelowCB->get_state_changed_from_saved()
+ || m_xDisplayCB->get_state_changed_from_saved()
+ || m_xPrintCB->get_state_changed_from_saved() ||
m_xColorLB->IsValueChangedFromSaved()
+ || m_bModified)
{
PutGridItem(*rSet);
bRet = true;
@@ -206,6 +206,8 @@ void SwTextGridPage::Reset(const SfxItemSet *rSet)
m_xDisplayCB->save_state();
m_xPrintCB->save_state();
m_xColorLB->SaveValue();
+
+ m_bModified = false;
}
void SwTextGridPage::ActivatePage( const SfxItemSet& rSet )
@@ -525,6 +527,7 @@ IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl,
weld::Toggleable&, void)
bool bChecked = m_xDisplayCB->get_active();
m_xPrintCB->set_sensitive(bChecked);
m_xPrintCB->set_active(bChecked);
+ GridModifyHdl();
}
IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, weld::Toggleable&, void)
@@ -546,6 +549,7 @@ void SwTextGridPage::GridModifyHdl()
aSet.Put(*pExSet);
PutGridItem(aSet);
m_aExampleWN.UpdateExample(aSet);
+ m_bModified = true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index 52964df5b5cc..dcc9a9389a8d 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -34,6 +34,7 @@ class SwTextGridPage final : public SfxTabPage
bool m_bSquaredMode;
bool m_bHRulerChanged;
bool m_bVRulerChanged;
+ bool m_bModified = false;
SwPageGridExample m_aExampleWN;
std::unique_ptr<weld::RadioButton> m_xNoGridRB;
