sw/qa/extras/layout/data/tdf166152.fodt | 118 ++++++++++++++++++++++++++++++++
sw/qa/extras/layout/layout5.cxx | 41 +++++++++++
sw/source/core/text/porlay.cxx | 2
3 files changed, 160 insertions(+), 1 deletion(-)
New commits:
commit d930984b527f63cd105e92d1df9813e5508a82ad
Author: Jonathan Clark <jonat...@libreoffice.org>
AuthorDate: Mon Apr 14 05:27:39 2025 -0600
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Apr 23 12:35:13 2025 +0200
tdf#166152 sw: Fix for SwScriptInfo corruption on incremental update
This change fixes a regression in SwScriptInfo::InitScriptInfo, which
was causing some data structures to be populated with duplicated entries
following an incremental update.
Regression from 537645c0834eab2d277113f1e3fcf039c994832d
"tdf#66791 sw: Treat weak punctuation as Asian in Asian paragraphs"
Change-Id: I364effe5579bff35eb7693684e732eafb284d7e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184151
Reviewed-by: Jonathan Clark <jonat...@libreoffice.org>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184202
diff --git a/sw/qa/extras/layout/data/tdf166152.fodt
b/sw/qa/extras/layout/data/tdf166152.fodt
new file mode 100644
index 000000000000..3aecfc9d303d
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf166152.fodt
@@ -0,0 +1,118 @@
+<?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:creation-date>2025-04-14T05:42:38.031483228</meta:creation-date><dc:date>2025-04-14T05:50:21.171365480</dc:date><meta:editing-duration>PT3M8S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:generator>LibreOfficeDev/25.8.0.0.alpha0$Linux_X86_64
LibreOffice_project/ab8a00db55f1f2f24f11560c64020b7b01137fbd</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="1" meta:word-count="8"
meta:character-count="40"
meta:non-whitespace-character-count="33"/></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 Sans2" svg:font-family="'Noto Sans'"
style:font-adornments="Regular" style:font-family-generic="swiss"
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:writing-mode="lr-tb"
style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0in"
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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties style:font-name="Noto Sans2" fo:font-style="normal"
fo:font-weight="normal" style:font-name-complex="Noto Sans2"
style:font-style-complex="normal" style:font-weight-complex="normal"/>
+ </style:style>
+ <style:style style:name="T1" style:family="text">
+ <style:text-properties/>
+ </style:style>
+ <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:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
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>
+ <style:style style:name="dp1" style:family="drawing-page">
+ <style:drawing-page-properties draw:background-size="full"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"
draw:style-name="dp1"/>
+ </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="P1">कककक <text:span text:style-name="T1">aaaa
</text:span>कककक <text:span text:style-name="T1">aaaa </text:span>कककक
<text:span text:style-name="T1">aaaa </text:span>कककक <text:span
text:style-name="T1">aaaa.</text:span></text:p>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout5.cxx b/sw/qa/extras/layout/layout5.cxx
index 8bed38e930a4..5f008a55b1c0 100644
--- a/sw/qa/extras/layout/layout5.cxx
+++ b/sw/qa/extras/layout/layout5.cxx
@@ -19,6 +19,7 @@
#include <unotools/syslocaleoptions.hxx>
#include <editeng/unolingu.hxx>
+#include <scriptinfo.hxx>
#include <rootfrm.hxx>
#include <wrtsh.hxx>
#include <txtfrm.hxx>
@@ -1541,6 +1542,46 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450)
CPPUNIT_ASSERT_LESS(sal_Int32(5765), nCase11);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152)
+{
+ createSwDoc("tdf166152.fodt");
+
+ auto* pWrtShell = getSwDocShell()->GetWrtShell();
+ auto& rTextFrame
+ =
dynamic_cast<SwTextFrame&>(*pWrtShell->GetLayout()->GetLower()->GetLower()->GetLower());
+ const SwScriptInfo* pSI = rTextFrame.GetScriptInfo();
+
+ // Sanity check script changes before the edit
+ CPPUNIT_ASSERT_EQUAL(size_t(8), pSI->CountScriptChg());
+
+ std::vector<sal_Int32> aExpectedChgBefore{ 5, 10, 15, 20, 25, 30, 35, 40 };
+ std::vector<sal_uInt8> aExpectedTypeBefore{ 3, 1, 3, 1, 3, 1, 3, 1 };
+ for (size_t i = 0; i < 8; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL(aExpectedChgBefore.at(i),
pSI->GetScriptChg(i).get());
+ CPPUNIT_ASSERT_EQUAL(aExpectedTypeBefore.at(i), pSI->GetScriptType(i));
+ }
+
+ // Insert text somewhere in the middle of the document.
+ // This causes an incremental update of the script change vector.
+ pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect*/ false, /*nCount*/ 17,
+ /*bBasicCall*/ false);
+ pWrtShell->Insert(u"A"_ustr);
+
+ // Check script changes after edit
+ //
+ // Without the fix, the count of script changes will be 11
+ CPPUNIT_ASSERT_EQUAL(size_t(8), pSI->CountScriptChg());
+
+ std::vector<sal_Int32> aExpectedChgAfter{ 5, 10, 15, 21, 26, 31, 36, 41 };
+ std::vector<sal_uInt8> aExpectedTypeAfter{ 3, 1, 3, 1, 3, 1, 3, 1 };
+ for (size_t i = 0; i < 8; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL(aExpectedChgAfter.at(i),
pSI->GetScriptChg(i).get());
+ CPPUNIT_ASSERT_EQUAL(aExpectedTypeAfter.at(i), pSI->GetScriptType(i));
+ }
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf149089)
{
createSwDoc("tdf149089.fodt");
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 0bc12786468b..ce7303f85ec7 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1403,7 +1403,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode,
rText,
SvtLanguageOptions::GetI18NScriptTypeOfLanguage(GetAppLanguage()),
*pDirScanner);
while (!pScriptScanner->AtEnd())
{
- if (pScriptScanner->Peek().m_nStartIndex <=
static_cast<sal_Int32>(nChg))
+ if (static_cast<sal_Int32>(nChg) < pScriptScanner->Peek().m_nEndIndex)
{
break;
}
