sw/qa/extras/layout/data/redline_sections.fodt | 110 +++++++++++++++++++++++++
sw/qa/extras/layout/layout.cxx | 88 ++++++++++++++++++++
2 files changed, 198 insertions(+)
New commits:
commit 1a0d9d688609cc2e5c0c0a5910be451119e42c0e
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Thu Oct 4 13:04:32 2018 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Oct 5 10:29:14 2018 +0200
sw_redlinehide_2: add unit test with sections
Change-Id: Ic9957f0a0624da2086e9e1eaded5f3df879e8e9f
Reviewed-on: https://gerrit.libreoffice.org/61367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/qa/extras/layout/data/redline_sections.fodt
b/sw/qa/extras/layout/data/redline_sections.fodt
new file mode 100644
index 000000000000..69fd03dc3a63
--- /dev/null
+++ b/sw/qa/extras/layout/data/redline_sections.fodt
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office: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:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle: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:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+
<office:meta><meta:creation-date>2018-08-13T15:30:43.156551183</meta:creation-date><dc:date>2018-08-13T15:55:10.667743508</dc:date><meta:editing-duration>PT1M51S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:generator>LibreOfficeDev/6.2.0.0.alpha0$Linux_X86_64
LibreOffice_project/3d9809bb6a20c34ef9f5ef0f4a6bc4eab7d8551f</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="3" meta:word-count="3"
meta:character-count="15"/></office:meta>
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="ShowRedlineChanges"
config:type="boolean">false</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+
+ <office:font-face-decls>
+ <style:font-face style:name="Lohit Devanagari1" svg:font-family="'Lohit
Devanagari'"/>
+ <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="Liberation Sans"
svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"
style:font-pitch="variable"/>
+ <style:font-face style:name="Liberation Sans1"
svg:font-family="'Liberation Sans'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Lohit Devanagari" svg:font-family="'Lohit
Devanagari'" style:font-family-generic="system"
style:font-pitch="variable"/>
+ <style:font-face style:name="Source Han Serif CN"
svg:font-family="'Source Han Serif CN'"
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.3cm"
draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm"
draw:start-line-spacing-vertical="0.283cm"
draw:end-line-spacing-horizontal="0.283cm"
draw:end-line-spacing-vertical="0.283cm" 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"
style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="de"
fo:country="DE" style:letter-kerning="true" style:font-name-asian="Source Han
Serif CN" style:font-size-asian="10.5pt" style:language-asian="zh"
style:country-asian="CN" style:font-name-complex="Lohit Devanagari"
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="1.251cm" style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true"
style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="de"
fo:country="DE" style:letter-kerning="true" style:font-name-asian="Source Han
Serif CN" style:font-size-asian="10.5pt" style:language-asian="zh"
style:country-asian="CN" style:font-name-complex="Lohit Devanagari"
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"/>
+ </style:default-style>
+
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
+ <style:style style:name="Frame_20_contents" style:display-name="Frame
contents" style:family="paragraph" style:parent-style-name="Standard"
style:class="extra"/>
+ <style:style style:name="Frame" style:family="graphic">
+ <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm"
svg:y="0cm" fo:margin-left="0.201cm" fo:margin-right="0.201cm"
fo:margin-top="0.201cm" fo:margin-bottom="0.201cm" style:wrap="parallel"
style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false"
style:vertical-pos="top" style:vertical-rel="paragraph-content"
style:horizontal-pos="center" style:horizontal-rel="paragraph-content"
fo:padding="0.15cm" fo:border="0.06pt solid #000000"/>
+ </style:style>
+
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties officeooo:rsid="001b399a"
officeooo:paragraph-rsid="001b399a"/>
+ </style:style>
+ <style:style style:name="P3" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties officeooo:rsid="001dce04"
officeooo:paragraph-rsid="001dce04"/>
+ </style:style>
+ <style:style style:name="P4" style:family="paragraph"
style:parent-style-name="Frame_20_contents">
+ <style:text-properties officeooo:rsid="001b399a"
officeooo:paragraph-rsid="001b399a"/>
+ </style:style>
+ <style:style style:name="fr1" style:family="graphic"
style:parent-style-name="Frame">
+ <style:graphic-properties style:vertical-pos="top"
style:vertical-rel="paragraph-content" style:horizontal-pos="center"
style:horizontal-rel="paragraph"/>
+ </style:style>
+ <style:style style:name="Sect1" style:family="section">
+ <style:section-properties style:editable="false">
+ <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+ </style:section-properties>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="21.001cm"
fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait"
fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm"
fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
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="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
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:tracked-changes text:track-changes="false">
+ <text:changed-region xml:id="ct94921696" text:id="ct94921696">
+ <text:deletion>
+ <office:change-info>
+ <dc:creator>Unknown Author</dc:creator>
+ <dc:date>2018-08-13T15:31:07</dc:date>
+ </office:change-info>
+ <text:p text:style-name="P1">o</text:p>
+ <text:section text:style-name="Sect1" text:name="Section1">
+ <text:p text:style-name="P1"><draw:frame draw:style-name="fr1"
draw:name="Frame1" text:anchor-type="paragraph" svg:width="2cm"
draw:z-index="0">
+ <draw:text-box fo:min-height="0.499cm">
+ <text:p text:style-name="P4">FRAME</text:p>
+ </draw:text-box>
+ </draw:frame>bar</text:p>
+ <text:p text:style-name="P1">baz</text:p>
+ </text:section>
+ <text:p text:style-name="P1">b</text:p>
+ </text:deletion>
+ </text:changed-region>
+ <text:changed-region xml:id="ct94925760" text:id="ct94925760">
+ <text:deletion>
+ <office:change-info>
+ <dc:creator>Unknown Author</dc:creator>
+ <dc:date>2018-08-13T15:55:07</dc:date>
+ </office:change-info>
+ <text:p text:style-name="P3">o</text:p>
+ <text:p text:style-name="P3">bar</text:p>
+ <text:p text:style-name="P3">b</text:p>
+ </text:deletion>
+ </text:changed-region>
+ </text:tracked-changes>
+
+ <text:p text:style-name="P1">fo<text:change
text:change-id="ct94921696"/>lah</text:p>
+ <text:p text:style-name="P1"/>
+ <text:section text:style-name="Sect1" text:name="Section2">
+ <text:p text:style-name="P3">fo<text:change
text:change-id="ct94925760"/>lah</text:p>
+ </text:section>
+
+ </office:text>
+ </office:body>
+</office:document>
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 5a0197a66c8a..af9a1cacb2bf 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -26,6 +26,7 @@ static char const DATA_DIRECTORY[] =
"/sw/qa/extras/layout/data/";
class SwLayoutWriter : public SwModelTestBase
{
void CheckRedlineFootnotesHidden();
+ void CheckRedlineSectionsHidden();
public:
void testRedlineFootnotes();
@@ -34,6 +35,7 @@ public:
void testRedlineFlysInFootnote();
void testRedlineFlysInFlys();
void testRedlineFlysAtFlys();
+ void testRedlineSections();
void testTdf116830();
void testTdf116925();
void testTdf117028();
@@ -61,6 +63,7 @@ public:
CPPUNIT_TEST(testRedlineFlysInFootnote);
CPPUNIT_TEST(testRedlineFlysInFlys);
CPPUNIT_TEST(testRedlineFlysAtFlys);
+ CPPUNIT_TEST(testRedlineSections);
CPPUNIT_TEST(testTdf116830);
CPPUNIT_TEST(testTdf116925);
CPPUNIT_TEST(testTdf117028);
@@ -1920,6 +1923,91 @@ void SwLayoutWriter::testRedlineFlysAtFlys()
assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "Portion", "az");
}
+void SwLayoutWriter::CheckRedlineSectionsHidden()
+{
+ discardDumpedLayout();
+ xmlDocPtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "12");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"folah");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/merged",
"paraPropsNodeIndex", "20");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"Portion", "folah");
+}
+
+void SwLayoutWriter::testRedlineSections()
+{
+ // currently need experimental mode
+ Resetter _([]() {
+ std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
+ comphelper::ConfigurationChanges::create());
+ officecfg::Office::Common::Misc::ExperimentalMode::set(false, pBatch);
+ return pBatch->commit();
+ });
+ std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
+ comphelper::ConfigurationChanges::create());
+ officecfg::Office::Common::Misc::ExperimentalMode::set(true, pBatch);
+ pBatch->commit();
+
+ createDoc("redline_sections.fodt");
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwDoc* pDoc(pTextDoc->GetDocShell()->GetDoc());
+ SwRootFrame* pLayout(pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
+ CPPUNIT_ASSERT(pLayout->IsHideRedlines());
+
+ // verify after load
+ CheckRedlineSectionsHidden();
+
+ lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+ CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
+ // why is this needed explicitly?
+ pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+ discardDumpedLayout();
+ xmlDocPtr pXmlDoc = parseLayoutDump();
+
+ // show: nothing is merged
+ xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "//merged");
+ xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
+ CPPUNIT_ASSERT_EQUAL(0, xmlXPathNodeSetGetLength(pXmlNodes));
+ xmlXPathFreeObject(pXmlObj);
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion", "fo");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "Portion", "o");
+
+ assertXPath(pXmlDoc,
"/root/page[1]/body/section[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
+ "nType", "POR_PARA");
+ assertXPath(pXmlDoc,
"/root/page[1]/body/section[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
+ "Portion", "FRAME");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"Portion", "bar");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[2]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[2]/Text[1]",
"Portion", "baz");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion", "b");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "Portion",
"lah");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[1]",
"Portion", "fo");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[2]",
"Portion", "o");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[2]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[2]/Text[1]",
"Portion", "bar");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[1]",
"Portion", "b");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[2]",
"Portion", "lah");
+
+ // verify after hide
+ lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+ CPPUNIT_ASSERT(pLayout->IsHideRedlines());
+ // why is this needed explicitly?
+ pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+ discardDumpedLayout();
+ CheckRedlineSectionsHidden();
+}
+
void SwLayoutWriter::testTdf116830()
{
SwDoc* pDoc = createDoc("tdf116830.odt");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
