schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng | 8
sw/qa/extras/layout/data/fomargin.fodt | 114 ++++++++++++
sw/qa/extras/layout/layout5.cxx | 26 ++
sw/qa/extras/odfexport/data/tdf163913.fodt | 4
xmloff/source/text/txtprmap.cxx | 23 +-
5 files changed, 153 insertions(+), 22 deletions(-)
New commits:
commit 1b15a2aba966d4577bc019247b8b3ca297a07e57
Author: Jonathan Clark <jonat...@libreoffice.org>
AuthorDate: Wed Dec 11 06:14:32 2024 -0700
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 16 09:55:14 2024 +0100
crashtesting: fix assert while parsing tdf94588-1.odt
Some ODF parsing code uses relative indices into XMLPropertyMapEntry
arrays to enumerate related attributes. This change moves some
recently-added paragraph property entries to the end of the respective
array, fixing an assertion caused by accessing unexpected attributes via
these hard-coded relative indices.
Problem since:
commit 7e4f4a0ccd3c56093dec44c7dcdd14c8b34623c3
tdf#163913 Implement font-relative margins
Change-Id: Ia2671372f0152e4efb98bd25b390638e4458a1b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178318
Tested-by: Jenkins
Reviewed-by: Jonathan Clark <jonat...@libreoffice.org>
(cherry picked from commit c697c36d4ef330b4cbf8c6bbeb4f893a3ea4c666)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178335
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
b/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
index e8e2c5be98e1..79bb67d7da17 100644
--- a/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.4+libreoffice-schema.rng
@@ -3125,14 +3125,6 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:choice>
</rng:attribute>
</rng:optional>
- <rng:optional>
- <rng:attribute name="loext:margin">
- <rng:choice>
- <rng:ref name="cssLength"/>
- <rng:ref name="percent"/>
- </rng:choice>
- </rng:attribute>
- </rng:optional>
<rng:optional>
<rng:attribute name="loext:margin-left">
<rng:choice>
diff --git a/sw/qa/extras/layout/data/fomargin.fodt
b/sw/qa/extras/layout/data/fomargin.fodt
new file mode 100644
index 000000000000..1c051a6f487f
--- /dev/null
+++ b/sw/qa/extras/layout/data/fomargin.fodt
@@ -0,0 +1,114 @@
+<?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>2024-12-11T07:03:00.500708679</meta:creation-date><meta:generator>LibreOfficeDev/25.8.0.0.alpha0$Linux_X86_64
LibreOffice_project/5a9171d8f0e90485b76a33f057ddc8edc329571e</meta:generator><dc:date>2024-12-11T07:06:14.721290230</dc:date><meta:editing-duration>PT3M15S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="2" meta:paragraph-count="1" meta:word-count="88"
meta:character-count="176"
meta:non-whitespace-character-count="88"/></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 Serif CJK JP" svg:font-family="'Noto Serif
CJK JP'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Tahoma1" svg:font-family="Tahoma"
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 JP" style:font-size-asian="10.5pt"
style:language-asian="ja" style:country-asian="JP"
style:font-name-complex="Tahoma1" style:font-size-complex="12pt"
style:language-complex="ar" style:country-complex="SA"/>
+ </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" 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 JP" style:font-size-asian="10.5pt"
style:language-asian="ja" style:country-asian="JP"
style:font-name-complex="Tahoma1" style:font-size-complex="12pt"
style:language-complex="ar" style:country-complex="SA" 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:paragraph-properties fo:margin="2in"/>
+ <style:text-properties fo:font-size="48pt"/>
+ </style:style>
+ <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:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <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: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:use-soft-page-breaks="true">
+ <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">A A A A A A A A A A A A A A A A A A A A A A A
A A A A A A A A A A A A A A A A A A A A A A A A A A A A A
<text:soft-page-break/>A A A A A A A A A A A A A A A A A A A A A A A A A A A A
A A A A A A A A </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 35dc2fe89638..1ad056f4b2a7 100644
--- a/sw/qa/extras/layout/layout5.cxx
+++ b/sw/qa/extras/layout/layout5.cxx
@@ -1371,6 +1371,32 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf153136)
// CPPUNIT_ASSERT_GREATER(large, height);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testFoMargin)
+{
+ createSwDoc("fomargin.fodt");
+ auto pXmlDoc = parseLayoutDump();
+
+ auto nPage1Width
+ = getXPath(pXmlDoc, "/root/page[1]/body/txt[1]/infos/bounds",
"width").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(9600), nPage1Width);
+ CPPUNIT_ASSERT_LESS(sal_Int32(9700), nPage1Width);
+
+ auto nPage1Height
+ = getXPath(pXmlDoc, "/root/page[1]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(13800), nPage1Height);
+ CPPUNIT_ASSERT_LESS(sal_Int32(14000), nPage1Height);
+
+ auto nPage2Width
+ = getXPath(pXmlDoc, "/root/page[2]/body/txt[1]/infos/bounds",
"width").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(9600), nPage2Width);
+ CPPUNIT_ASSERT_LESS(sal_Int32(9700), nPage2Width);
+
+ auto nPage2Height
+ = getXPath(pXmlDoc, "/root/page[2]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(13100), nPage2Height);
+ CPPUNIT_ASSERT_LESS(sal_Int32(13400), nPage2Height);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/odfexport/data/tdf163913.fodt
b/sw/qa/extras/odfexport/data/tdf163913.fodt
index a0e88fe0379d..a84af1dcb1a2 100644
--- a/sw/qa/extras/odfexport/data/tdf163913.fodt
+++ b/sw/qa/extras/odfexport/data/tdf163913.fodt
@@ -86,7 +86,7 @@
<style:paragraph-properties fo:margin-left="3in" fo:margin-right="0in"
fo:text-indent="0in" style:auto-text-indent="false"/>
</style:style>
<style:style style:name="P2" style:family="paragraph"
style:parent-style-name="Standard">
- <style:paragraph-properties loext:margin="6em" loext:margin-left="6em"
fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
+ <style:paragraph-properties loext:margin-left="6em" fo:margin-right="0in"
fo:text-indent="0in" style:auto-text-indent="false"/>
</style:style>
<style:style style:name="P3" style:family="paragraph"
style:parent-style-name="Standard">
<style:paragraph-properties fo:margin-left="0in" fo:margin-right="3in"
fo:text-indent="0in" style:auto-text-indent="false"/>
@@ -128,4 +128,4 @@
<text:p text:style-name="P4">6em loext:<text:span
text:style-name="T1">margin-right</text:span></text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index cd362b98ede6..0d4435025f46 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -117,21 +117,13 @@ XMLPropertyMapEntry constexpr aXMLParaPropMap[] =
// RES_LR_SPACE
// !!! DO NOT REORDER THE MARGINS !!!
+ // - The all margin implementation enumerates the margin properties by
relative index.
MP_E( PROP_ParaLeftMargin, XML_NAMESPACE_FO, XML_MARGIN,
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARAMARGINALL ),
MP_E( PROP_ParaLeftMarginRelative, XML_NAMESPACE_FO, XML_MARGIN,
XML_TYPE_PERCENT16, CTF_PARAMARGINALL_REL ),
- MAP_EXT( PROP_ParaLeftMarginUnit, XML_NAMESPACE_LO_EXT, XML_MARGIN,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_UNIT_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_EXT_I( PROP_ParaLeftMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARAMARGINALL ),
- MAP_EXT_I( PROP_ParaLeftMarginRelative, XML_NAMESPACE_LO_EXT, XML_MARGIN,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_PERCENT16, CTF_PARAMARGINALL_REL ),
MP_E( PROP_ParaLeftMargin, XML_NAMESPACE_FO, XML_MARGIN_LEFT,
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARALEFTMARGIN ),
MP_E( PROP_ParaLeftMarginRelative, XML_NAMESPACE_FO, XML_MARGIN_LEFT,
XML_TYPE_PERCENT16, CTF_PARALEFTMARGIN_REL ),
- MAP_EXT( PROP_ParaLeftMarginUnit, XML_NAMESPACE_LO_EXT, XML_MARGIN_LEFT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_UNIT_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_EXT_I( PROP_ParaLeftMargin, XML_NAMESPACE_FO, XML_MARGIN_LEFT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARALEFTMARGIN ),
- MAP_EXT_I( PROP_ParaLeftMarginRelative, XML_NAMESPACE_FO, XML_MARGIN_LEFT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_PERCENT16, CTF_PARALEFTMARGIN_REL ),
MP_E( PROP_ParaRightMargin, XML_NAMESPACE_FO, XML_MARGIN_RIGHT,
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARARIGHTMARGIN ),
MP_E( PROP_ParaRightMarginRelative, XML_NAMESPACE_FO, XML_MARGIN_RIGHT,
XML_TYPE_PERCENT16, CTF_PARARIGHTMARGIN_REL ),
- MAP_EXT( PROP_ParaRightMarginUnit, XML_NAMESPACE_LO_EXT, XML_MARGIN_RIGHT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_UNIT_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_EXT_I( PROP_ParaRightMargin, XML_NAMESPACE_FO, XML_MARGIN_RIGHT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARARIGHTMARGIN ),
- MAP_EXT_I( PROP_ParaRightMarginRelative, XML_NAMESPACE_FO,
XML_MARGIN_RIGHT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_PERCENT16,
CTF_PARARIGHTMARGIN_REL ),
// RES_UL_SPACE
MP_E( PROP_ParaTopMargin, XML_NAMESPACE_FO, XML_MARGIN_TOP,
XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARATOPMARGIN ),
MP_E( PROP_ParaTopMarginRelative, XML_NAMESPACE_FO, XML_MARGIN_TOP,
XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
@@ -375,9 +367,6 @@ XMLPropertyMapEntry constexpr aXMLParaPropMap[] =
MP_E( PROP_ParaFirstLineIndent, XML_NAMESPACE_FO,
XML_TEXT_INDENT, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARAFIRSTLINE ),
MP_E( PROP_ParaFirstLineIndentRelative, XML_NAMESPACE_FO,
XML_TEXT_INDENT, XML_TYPE_PERCENT,
CTF_PARAFIRSTLINE_REL ),
- MAP_EXT( PROP_ParaFirstLineIndentUnit, XML_NAMESPACE_LO_EXT,
XML_TEXT_INDENT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_UNIT_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_EXT_I( PROP_ParaFirstLineIndent, XML_NAMESPACE_LO_EXT,
XML_TEXT_INDENT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARAFIRSTLINE ),
- MAP_EXT_I( PROP_ParaFirstLineIndentRelative, XML_NAMESPACE_LO_EXT,
XML_TEXT_INDENT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_PERCENT,
CTF_PARAFIRSTLINE_REL ),
MP_E( PROP_ParaIsAutoFirstLineIndent, XML_NAMESPACE_STYLE,
XML_AUTO_TEXT_INDENT, XML_TYPE_BOOL, 0 ),
// RES_PAGEDESC
MP_E( PROP_PageDescName, XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME,
MID_FLAG_SPECIAL_ITEM|XML_TYPE_STYLENAME, CTF_PAGEDESCNAME ),
@@ -479,6 +468,16 @@ XMLPropertyMapEntry constexpr aXMLParaPropMap[] =
MAP_EXT( PROP_ListAutoFormat, XML_NAMESPACE_LO_EXT, XML_MARKER_STYLE_NAME,
XML_TYPE_STYLENAME|XML_TYPE_PROP_PARAGRAPH, 0 ),
+ MAP_EXT( PROP_ParaLeftMarginUnit, XML_NAMESPACE_LO_EXT, XML_MARGIN_LEFT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_UNIT_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 ),
+ MAP_EXT_I( PROP_ParaLeftMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_LEFT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARALEFTMARGIN ),
+ MAP_EXT_I( PROP_ParaLeftMarginRelative, XML_NAMESPACE_LO_EXT,
XML_MARGIN_LEFT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_PERCENT16,
CTF_PARALEFTMARGIN_REL ),
+ MAP_EXT( PROP_ParaRightMarginUnit, XML_NAMESPACE_LO_EXT, XML_MARGIN_RIGHT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_UNIT_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 ),
+ MAP_EXT_I( PROP_ParaRightMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_RIGHT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARARIGHTMARGIN ),
+ MAP_EXT_I( PROP_ParaRightMarginRelative, XML_NAMESPACE_LO_EXT,
XML_MARGIN_RIGHT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_PERCENT16,
CTF_PARARIGHTMARGIN_REL ),
+ MAP_EXT( PROP_ParaFirstLineIndentUnit, XML_NAMESPACE_LO_EXT,
XML_TEXT_INDENT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_UNIT_MEASURE|MID_FLAG_MULTI_PROPERTY, 0 ),
+ MAP_EXT_I( PROP_ParaFirstLineIndent, XML_NAMESPACE_LO_EXT,
XML_TEXT_INDENT,
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY,
CTF_PARAFIRSTLINE ),
+ MAP_EXT_I( PROP_ParaFirstLineIndentRelative, XML_NAMESPACE_LO_EXT,
XML_TEXT_INDENT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_PERCENT,
CTF_PARAFIRSTLINE_REL ),
+
M_END()
};
