sw/qa/extras/uiwriter/data/tdf147938.fodt | 160 ++++++++++++++++++++++++++++++
sw/qa/extras/uiwriter/uiwriter8.cxx | 57 ++++++++++
sw/source/core/docnode/node.cxx | 9 +
3 files changed, 226 insertions(+)
New commits:
commit 5b55ccfd384d3c0c11e05f22bd7e956b4bc7e43a
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Aug 4 13:12:05 2023 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Aug 4 18:14:22 2023 +0200
tdf#147938 sw_redlinehide: fix undo of table to text
The problem is that when the text node is split in
SwNodes::UndoTableToText(), the 2nd one retains the merge flag NonFirst,
not the 1st one, and it ends up in the 2nd table cell, so it's skipped
when creating the layout frames (and an assert in InsertCnt_()
segfaults).
SwContentNode::DelFrames() should probably reset the merge flags of
nodes when it deletes the merged frame.
(regression from commit 32902f66e7749b2d06d13f50416be5323a0c0ea9)
Change-Id: I7b3b1ca873bde831481c676780200a3206ae667c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155345
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/qa/extras/uiwriter/data/tdf147938.fodt
b/sw/qa/extras/uiwriter/data/tdf147938.fodt
new file mode 100644
index 000000000000..6a95cb59c203
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf147938.fodt
@@ -0,0 +1,160 @@
+<?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.3" office:mimetype="application/vnd.oasis.opendocument.text">
+
<office:meta><meta:creation-date>2023-08-04T13:37:50.940533003</meta:creation-date><dc:date>2023-08-04T13:39:42.785634897</dc:date><meta:editing-duration>PT1M27S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:generator>LibreOfficeDev/7.5.5.0.0$Linux_X86_64
LibreOffice_project/c430b30a2ea9a678e44af112a171c86fab519a37</meta:generator><meta:document-statistic
meta:table-count="1" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="4" meta:word-count="3"
meta:character-count="11"
meta:non-whitespace-character-count="11"/></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="Lohit Devanagari1" svg:font-family="'Lohit
Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans CJK SC" svg:font-family="'Noto Sans
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" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" loext:color-lum-mod="100%" loext:color-lum-off="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 Sans
CJK SC" style:font-size-asian="10.5pt" style:language-asian="zh"
style:country-asian="CN" style:font-name-complex="Lohit Devanagari1"
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" 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 Sans CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Lohit Devanagari1" 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"/>
+ <style:style style:name="Table_20_Contents" style:display-name="Table
Contents" style:family="paragraph" style:parent-style-name="Standard"
style:class="extra">
+ <style:paragraph-properties fo:orphans="0" fo:widows="0"
text:number-lines="false" text:line-number="0"/>
+ </style:style>
+ <style:style style:name="Line_20_numbering" style:display-name="Line
numbering" style:family="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:style-name="Line_20_numbering"
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="Table1" style:family="table">
+ <style:table-properties style:width="6.925in" table:align="margins"/>
+ </style:style>
+ <style:style style:name="Table1.A" style:family="table-column">
+ <style:table-column-properties style:column-width="3.4625in"
style:rel-column-width="32767*"/>
+ </style:style>
+ <style:style style:name="Table1.B" style:family="table-column">
+ <style:table-column-properties style:column-width="3.4625in"
style:rel-column-width="32768*"/>
+ </style:style>
+ <style:style style:name="Table1.A1" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.5pt
solid #000000" fo:border-right="none" fo:border-top="0.5pt solid #000000"
fo:border-bottom="0.5pt solid #000000"/>
+ </style:style>
+ <style:style style:name="Table1.B1" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.0382in" fo:border="0.5pt solid
#000000"/>
+ </style:style>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="P2" style:family="paragraph"
style:parent-style-name="Table_20_Contents">
+ <style:text-properties/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in"
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:tracked-changes text:track-changes="false">
+ <text:changed-region xml:id="ct113763168" text:id="ct113763168">
+ <text:deletion>
+ <office:change-info>
+ <dc:creator>Unknown Author</dc:creator>
+ <dc:date>2023-08-04T13:38:41</dc:date>
+ </office:change-info>
+ </text:deletion>
+ </text:changed-region>
+ </text:tracked-changes>
+ <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">Foo</text:p>
+ <table:table table:name="Table1" table:style-name="Table1">
+ <table:table-column table:style-name="Table1.A"/>
+ <table:table-column table:style-name="Table1.B"/>
+ <table:table-row>
+ <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <text:p text:style-name="P2"><text:change-start
text:change-id="ct113763168"/>Bar</text:p>
+ <text:p text:style-name="P2">baz <text:change-end
text:change-id="ct113763168"/>quux</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="Table1.B1" office:value-type="string">
+ <text:p text:style-name="P2">blah</text:p>
+ </table:table-cell>
+ </table:table-row>
+ </table:table>
+ <text:p text:style-name="P1"/>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx
b/sw/qa/extras/uiwriter/uiwriter8.cxx
index 621fecc6fd98..b4dbaa771593 100644
--- a/sw/qa/extras/uiwriter/uiwriter8.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter8.cxx
@@ -36,6 +36,8 @@
#include <IDocumentLinksAdministration.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <rootfrm.hxx>
+#include <redline.hxx>
+#include <itabenum.hxx>
#include <officecfg/Office/Common.hxx>
/// 8th set of tests asserting the behavior of Writer user interface shells.
@@ -1478,6 +1480,61 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146573)
CPPUNIT_ASSERT_EQUAL(OUString("204"), xCellA4->getString());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf147938)
+{
+ createSwDoc("tdf147938.fodt");
+
+ SwDoc* pDoc = getSwDoc();
+ SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+ CPPUNIT_ASSERT_EQUAL(size_t(1),
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
+ CPPUNIT_ASSERT_EQUAL(OUString("Bar\nbaz "),
+
pDoc->getIDocumentRedlineAccess().GetRedlineTable()[0]->GetText());
+
+ pWrtShell->Down(/*bSelect=*/false, /*nCount=*/1);
+ pWrtShell->TableToText('\t');
+
+ CPPUNIT_ASSERT_EQUAL(size_t(1),
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
+ CPPUNIT_ASSERT_EQUAL(OUString("Bar\nbaz "),
+
pDoc->getIDocumentRedlineAccess().GetRedlineTable()[0]->GetText());
+
+ dispatchCommand(mxComponent, ".uno:SelectAll", {});
+ SwInsertTableOptions const opts(SwInsertTableFlags::NONE, 0);
+ pWrtShell->TextToTable(opts, '\t', nullptr);
+
+ pWrtShell->Undo();
+
+ CPPUNIT_ASSERT_EQUAL(size_t(1),
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
+ CPPUNIT_ASSERT_EQUAL(OUString("Bar\nbaz "),
+
pDoc->getIDocumentRedlineAccess().GetRedlineTable()[0]->GetText());
+
+ pWrtShell->Undo();
+
+ CPPUNIT_ASSERT_EQUAL(size_t(1),
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
+ CPPUNIT_ASSERT_EQUAL(OUString("Bar\nbaz "),
+
pDoc->getIDocumentRedlineAccess().GetRedlineTable()[0]->GetText());
+
+ pWrtShell->Redo();
+
+ CPPUNIT_ASSERT_EQUAL(size_t(1),
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
+ CPPUNIT_ASSERT_EQUAL(OUString("Bar\nbaz "),
+
pDoc->getIDocumentRedlineAccess().GetRedlineTable()[0]->GetText());
+
+ pWrtShell->Redo();
+
+ pWrtShell->Undo();
+
+ CPPUNIT_ASSERT_EQUAL(size_t(1),
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
+ CPPUNIT_ASSERT_EQUAL(OUString("Bar\nbaz "),
+
pDoc->getIDocumentRedlineAccess().GetRedlineTable()[0]->GetText());
+
+ pWrtShell->Undo();
+
+ CPPUNIT_ASSERT_EQUAL(size_t(1),
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
+ CPPUNIT_ASSERT_EQUAL(OUString("Bar\nbaz "),
+
pDoc->getIDocumentRedlineAccess().GetRedlineTable()[0]->GetText());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148799)
{
// load a document with table formulas with comma delimiter,
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 64a9e86137c5..06a949609d91 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1506,6 +1506,15 @@ void SwContentNode::DelFrames(SwRootFrame const*const
pLayout)
pMerged->listener.EndListening(this);
continue; // don't delete
}
+ else
+ {
+ for (SwNodeOffset i = pMerged->pLastNode->GetIndex();
+ GetIndex() <= i; --i)
+ { // tdf#147938 reset flag in nodes
+ SwNode *const pNode = GetNodes()[i];
+ pNode->SetRedlineMergeFlag(SwNode::Merge::None);
+ }
+ }
}
// #i27138#
// notify accessibility paragraphs objects about changed
