diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2024-04-27 10:52:29 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2024-04-28 13:38:02 +0200 |
| commit | 83236587bfca52513515b0b7a7dbfa18eed11503 (patch) | |
| tree | 9688384bf9bccf2f62a8e16956d7e893f2873d32 | |
| parent | 5158104b9294ab85ab7a675b5b627469e303c345 (diff) | |
tdf#159625: fix "allow to split paragraph"
2 pbs here:
1) bug described in the bugtracker, the uncheck isn't kept
=> just remove all the buggy GetOldItem stuff
2) after unchecked the option then saving the file and reloading the file, the option is still checked
=> change the buggy
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
to
rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) );
In fact, I just mimicked the code used for "keep paragraphs" which works well.
Also change the QA test since "allow to split paragraph" is checked by default
so if the QA simulates a click on it, we expect the value to be false when dialog is opened again
Change-Id: I947feb02e0c282304621a252ad5e4c168c1d295a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166774
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 10 | ||||
| -rw-r--r-- | sw/qa/uitest/writer_tests2/formatParagraph.py | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 11fefa11ed07..98ee3558f0dd 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1799,14 +1799,8 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) if (m_xAllowSplitBox->get_state_changed_from_saved()) { - pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT ); - - if ( !pOld || static_cast<const SvxFormatSplitItem*>(pOld)->GetValue() != - ( eState == TRISTATE_FALSE ) ) - { - rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) ); - bModified = true; - } + rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_TRUE, _nWhich ) ); + bModified = true; } // keep paragraphs diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py index e90d0fd7f980..bfa6eff48dc9 100644 --- a/sw/qa/uitest/writer_tests2/formatParagraph.py +++ b/sw/qa/uitest/writer_tests2/formatParagraph.py @@ -177,7 +177,7 @@ class formatParagraph(UITestCase): self.assertEqual(get_state_as_dict(xspinWidow)["Text"], "2") self.assertEqual(get_state_as_dict(xcheckWidow)["Selected"], "false") self.assertEqual(get_state_as_dict(xcheckOrphan)["Selected"], "false") - self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "true") + self.assertEqual(get_state_as_dict(xcheckSplitPara)["Selected"], "false") self.assertEqual(get_state_as_dict(xcheckKeepPara)["Selected"], "true") |