[Libreoffice-commits] core.git: 16 commits - oox/source sw/qa sw/source writerfilter/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.com
Thu Feb 27 08:35:36 PST 2014
oox/source/token/tokens.txt | 1
sw/qa/extras/ooxmlexport/data/TextEffects_Props3d_Ligatures_NumForm_NumSpacing.docx |binary
sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 41 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 12
writerfilter/source/dmapper/TextEffectsHandler.cxx | 93 +++++
writerfilter/source/dmapper/TextEffectsHandler.hxx | 3
writerfilter/source/ooxml/model.xml | 157 +++++++++-
8 files changed, 290 insertions(+), 17 deletions(-)
New commits:
commit b731909d3c8bb01a7ab55e6bd2967ad0256b716d
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 17:33:44 2014 +0100
ooxml: extend roundtrip test - stylisticSets, cntxtAlts
Change-Id: I727df93d112e28be31b196c7f861cf1d0133bfe1
diff --git a/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx b/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx
new file mode 100644
index 0000000..7233104
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9799ac4..69311ca 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2863,6 +2863,24 @@ DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_Props3d_Ligatures_NumForm_NumSpacing
assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[4]/w:rPr/w14:numSpacing", "val", "proportional");
}
+DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_StylisticSets_CntxtAlts, "TextEffects_StylisticSets_CntxtAlts.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+ if (!pXmlDoc)
+ return;
+
+ // Paragraph 1 - w14:stylisticSets
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:stylisticSets/w14:styleSet", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:stylisticSets/w14:styleSet", "id", "4");
+
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w14:stylisticSets/w14:styleSet", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w14:stylisticSets/w14:styleSet", "id", "2");
+
+ // Paragraph 1 - w14:cntxtAlts
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:rPr/w14:cntxtAlts", 1);
+
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit 1c0e1b9c64b7c33008966e24a240819ec0b223f6
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 17:33:01 2014 +0100
ooxml export: w14:stylisticSets & w14:cntxtAlts element
Change-Id: I46e838fac213378f95389812b47ce5896f703505
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 65b41a5..c4700b4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1181,6 +1181,8 @@ void DocxAttributeOutput::InitCollectedRunProperties()
FSNS( XML_w14, XML_ligatures ),
FSNS( XML_w14, XML_numForm ),
FSNS( XML_w14, XML_numSpacing ),
+ FSNS( XML_w14, XML_stylisticSets ),
+ FSNS( XML_w14, XML_cntxtAlts ),
};
// postpone the output so that we can later [in EndParagraphProperties()]
@@ -1215,6 +1217,8 @@ const NameToId constNameToIdMapping[] =
{ OUString("ligatures"), FSNS( XML_w14, XML_ligatures ) },
{ OUString("numForm"), FSNS( XML_w14, XML_numForm ) },
{ OUString("numSpacing"), FSNS( XML_w14, XML_numSpacing ) },
+ { OUString("stylisticSets"),FSNS( XML_w14, XML_stylisticSets ) },
+ { OUString("cntxtAlts"), FSNS( XML_w14, XML_cntxtAlts ) },
{ OUString("val"), FSNS( XML_w14, XML_val ) },
{ OUString("rad"), FSNS( XML_w14, XML_rad ) },
@@ -1252,6 +1256,7 @@ const NameToId constNameToIdMapping[] =
{ OUString("extrusionH"), FSNS( XML_w14, XML_extrusionH ) },
{ OUString("contourW"), FSNS( XML_w14, XML_contourW ) },
{ OUString("prstMaterial"), FSNS( XML_w14, XML_prstMaterial ) },
+ { OUString("id"), FSNS( XML_w14, XML_id ) },
{ OUString("schemeClr"), FSNS( XML_w14, XML_schemeClr ) },
{ OUString("srgbClr"), FSNS( XML_w14, XML_srgbClr ) },
@@ -1285,6 +1290,7 @@ const NameToId constNameToIdMapping[] =
{ OUString("bevelB"), FSNS( XML_w14, XML_bevelB ) },
{ OUString("extrusionClr"), FSNS( XML_w14, XML_extrusionClr ) },
{ OUString("contourClr"), FSNS( XML_w14, XML_contourClr ) },
+ { OUString("styleSet"), FSNS( XML_w14, XML_styleSet ) },
};
commit cdd3fb6df0818d94303681392a1b2162097438cc
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 17:31:21 2014 +0100
writerfilter: put w14:stylisticSets & w14:cntxtAlts into GrabBag
Change-Id: Ic5b7bf51a073c4434cd09ae42fecdad25f904d26
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 067502e..d026de2 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -150,6 +150,7 @@ OUString getNameForElementId(sal_uInt32 aId)
aIdMap[NS_ooxml::LN_CT_Props3D_bevelB] = "bevelB";
aIdMap[NS_ooxml::LN_CT_Props3D_extrusionClr] = "extrusionClr";
aIdMap[NS_ooxml::LN_CT_Props3D_contourClr] = "contourClr";
+ aIdMap[NS_ooxml::LN_CT_StylisticSets_styleSet] = "styleSet";
}
return aIdMap[aId];
}
@@ -542,8 +543,15 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
case NS_ooxml::LN_numSpacing_numSpacing:
maPropertyId = PROP_CHAR_NUMSPACING_TEXT_EFFECT;
maElementName = "numSpacing";
+ break;
case NS_ooxml::LN_stylisticSets_stylisticSets:
+ maPropertyId = PROP_CHAR_STYLISTICSETS_TEXT_EFFECT;
+ maElementName = "stylisticSets";
+ break;
case NS_ooxml::LN_cntxtAlts_cntxtAlts:
+ maPropertyId = PROP_CHAR_CNTXTALTS_TEXT_EFFECT;
+ maElementName = "cntxtAlts";
+ break;
default:
break;
}
@@ -775,6 +783,16 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
mpGrabBagStack->appendElement("val", aAny);
}
break;
+ case NS_ooxml::LN_CT_StyleSet_id:
+ mpGrabBagStack->addInt32("id", sal_Int32(aValue.getInt()));
+ break;
+ case NS_ooxml::LN_CT_StyleSet_val:
+ case NS_ooxml::LN_CT_OnOff_val:
+ {
+ uno::Any aAny = makeAny(getOnOffString(sal_Int32(aValue.getInt())));
+ mpGrabBagStack->appendElement("val", aAny);
+ }
+ break;
default:
break;
}
commit 6654106b71f4d38221eb292bef296dbe313afca3
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 17:30:25 2014 +0100
oox: add "styleSet" to token list
Change-Id: Idf9ca432849e9ca53a533ee6d82267aa9d546423
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 20ca75f..133cbd2 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -4917,6 +4917,7 @@ styleLockTheme
styleName
stylePaneFormatFilter
stylePaneSortMethod
+styleSet
styleSheet
styles
stylisticSets
commit c6c7aa50c918f2f2c928ab425b4d3b287457c812
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 17:28:27 2014 +0100
writerfilter: add w14:stylisticSets & w14:cntxtAlts into model.xml
Change-Id: Icab0aad1fbf6634c8a3bdb449eef77c290f2d714
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 7924973..9850e3c 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5660,6 +5660,11 @@
<param name="maxInclusive">20116800</param>
</data>
</define>
+ <define name="ST_UnsignedDecimalNumber">
+ <data type="unsignedLong">
+ <xs:documentation>Unsigned Decimal Number Value</xs:documentation>
+ </data>
+ </define>
<define name="EG_ColorChoice">
<choice>
@@ -5956,6 +5961,24 @@
<define name="CT_Color">
<ref name="EG_ColorChoice"/>
</define>
+ <define name="CT_StyleSet">
+ <attribute name="id">
+ <ref name="ST_UnsignedDecimalNumber"/>
+ </attribute>
+ <optional>
+ <attribute name="val">
+ <ref name="ST_OnOff"/>
+ </attribute>
+ </optional>
+ </define>
+ <define name="CT_OnOff">
+ <optional>
+ <attribute name="val">
+ <ref name="ST_OnOff"/>
+ </attribute>
+ </optional>
+ </define>
+
<!-- Main Elements-->
<define name="CT_Glow">
@@ -6166,6 +6189,13 @@
<ref name="ST_NumSpacing"/>
</attribute>
</define>
+ <define name="CT_StylisticSets">
+ <zeroOrMore>
+ <element name="styleSet">
+ <ref name="CT_StyleSet"/>
+ </element>
+ </zeroOrMore>
+ </define>
<define name="glow">
<element name="glow">
@@ -6219,12 +6249,12 @@
</define>
<define name="stylisticSets">
<element name="stylisticSets">
- <empty/>
+ <ref name="CT_StylisticSets"/>
</element>
</define>
<define name="cntxtAlts">
<element name="cntxtAlts">
- <empty/>
+ <ref name="CT_OnOff"/>
</element>
</define>
</grammar>
@@ -6466,6 +6496,7 @@
<resource name="ST_PositiveFixedAngle" resource="Integer" generated="yes"/>
<resource name="ST_FixedAngle" resource="Integer" generated="yes"/>
<resource name="ST_LineWidth" resource="Integer" generated="yes"/>
+ <resource name="ST_UnsignedDecimalNumber" resource="Integer" generated="yes"/>
<!-- Groups Resource Definitions -->
<resource name="EG_ColorTransform" resource="Properties" tag="character">
@@ -6571,6 +6602,13 @@
<attribute name="prst" tokenid="ooxml:CT_Bevel_prst"/>
</resource>
<resource name="CT_Color" resource="Properties" tag="character"/>
+ <resource name="CT_StyleSet" resource="Properties" tag="character">
+ <attribute name="id" tokenid="ooxml:CT_StyleSet_id"/>
+ <attribute name="val" tokenid="ooxml:CT_StyleSet_val"/>
+ </resource>
+ <resource name="CT_OnOff" resource="Properties" tag="character">
+ <attribute name="val" tokenid="ooxml:CT_OnOff_val"/>
+ </resource>
<!-- Main element content -->
<resource name="CT_Shadow" resource="Properties" tag="character">
@@ -6627,6 +6665,9 @@
<resource name="CT_NumSpacing" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_NumSpacing_val"/>
</resource>
+ <resource name="CT_StylisticSets" resource="Properties" tag="character">
+ <attribute name="styleSet" tokenid="ooxml:CT_StylisticSets_styleSet"/>
+ </resource>
<resource name="glow" resource="Properties" tag="character">
<element name="glow" tokenid="ooxml:glow_glow"/>
@@ -18347,7 +18388,7 @@
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
</optional>
- <!--<optional>
+ <optional>
<element name="w14:stylisticSets">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
@@ -18356,7 +18397,7 @@
<element name="w14:cntxtAlts">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
- </optional>-->
+ </optional>
</define>
<define name="EG_RPrContent">
<optional>
@@ -24334,8 +24375,8 @@
<element name="w14:ligatures" tokenid="ooxml:EG_RPrBase_w14_ligatures"/>
<element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/>
<element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/>
- <!--<element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/>
- <element name="w14:cntxtAlts" tokenid="ooxml:EG_RPrBase_w14_cntxtAlts"/>-->
+ <element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/>
+ <element name="w14:cntxtAlts" tokenid="ooxml:EG_RPrBase_w14_cntxtAlts"/>
</resource>
<resource name="EG_RPrContent" resource="Properties" tag="character">
<element name="rPrChange" tokenid="ooxml:EG_RPrContent_rPrChange"/>
commit 22d5d14d1aed73f36938b49d0ea1e9281e19dafd
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 16:11:51 2014 +0100
ooxml: extend roundtrip test - ligatures, numForm, numSpacing
Change-Id: Ibab36ef0e6352f740d339b12c81385053af84be1
diff --git a/sw/qa/extras/ooxmlexport/data/TextEffects_Props3d_Ligatures_NumForm_NumSpacing.docx b/sw/qa/extras/ooxmlexport/data/TextEffects_Props3d_Ligatures_NumForm_NumSpacing.docx
new file mode 100644
index 0000000..e8636ec
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/TextEffects_Props3d_Ligatures_NumForm_NumSpacing.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9482f14..9799ac4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2816,12 +2816,13 @@ DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_TextFill, "TextEffects_TextFill.docx
assertXPath(pXmlDoc, "/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w14:textFill/w14:gradFill/w14:lin", "scaled", "0");
}
-DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_Props3d, "TextEffects_Props3d.docx")
+DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_Props3d_Ligatures_NumForm_NumSpacing, "TextEffects_Props3d_Ligatures_NumForm_NumSpacing.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
- // Paragraph 1
+
+ // Paragraph 1 - w14:props3d
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:props3d", 1);
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:props3d", "extrusionH", "63500");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:props3d", "contourW", "25400");
@@ -2842,6 +2843,24 @@ DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_Props3d, "TextEffects_Props3d.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:props3d/w14:contourClr", 1);
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w14:props3d/w14:contourClr/w14:srgbClr", "val", "92D050");
+
+ // Paragraph 2 - w14:ligatures
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:rPr/w14:ligatures", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:rPr/w14:ligatures", "val", "standard");
+
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w14:ligatures", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w14:ligatures", "val", "standardContextual");
+
+ // Paragraph 3 - w14:numFurm and w14:numSpacing
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:rPr/w14:numForm", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:rPr/w14:numForm", "val", "lining");
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:rPr/w14:numSpacing", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:rPr/w14:numSpacing", "val", "tabular");
+
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[4]/w:rPr/w14:numForm", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[4]/w:rPr/w14:numForm", "val", "oldStyle");
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[4]/w:rPr/w14:numSpacing", 1);
+ assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[4]/w:rPr/w14:numSpacing", "val", "proportional");
}
#endif
commit 675bdda729640d24d0beb2ac9807fbd2a27fd24d
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 14:51:06 2014 +0100
ooxml export: w14:numSpacing element
Change-Id: I6592b9c5a02d96795411526eff69c3380668a10e
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 98c6d5a..65b41a5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1180,6 +1180,7 @@ void DocxAttributeOutput::InitCollectedRunProperties()
FSNS( XML_w14, XML_props3d ),
FSNS( XML_w14, XML_ligatures ),
FSNS( XML_w14, XML_numForm ),
+ FSNS( XML_w14, XML_numSpacing ),
};
// postpone the output so that we can later [in EndParagraphProperties()]
@@ -1213,6 +1214,7 @@ const NameToId constNameToIdMapping[] =
{ OUString("props3d"), FSNS( XML_w14, XML_props3d ) },
{ OUString("ligatures"), FSNS( XML_w14, XML_ligatures ) },
{ OUString("numForm"), FSNS( XML_w14, XML_numForm ) },
+ { OUString("numSpacing"), FSNS( XML_w14, XML_numSpacing ) },
{ OUString("val"), FSNS( XML_w14, XML_val ) },
{ OUString("rad"), FSNS( XML_w14, XML_rad ) },
commit 237205f66e928ceb27a169957232ea4207ccee0a
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 14:50:19 2014 +0100
writerfilter: put w14:numSpacing elements/attributes into a GrabBag
Change-Id: I242507aaa1a72ea912f043e0d6795279e8e27dcf
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index cf5c5897..067502e 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -487,6 +487,18 @@ OUString TextEffectsHandler::getNumFormString(sal_Int32 nType)
return OUString();
}
+OUString TextEffectsHandler::getNumSpacingString(sal_Int32 nType)
+{
+ switch (nType)
+ {
+ case NS_ooxml::LN_ST_NumSpacing_default: return OUString("default");
+ case NS_ooxml::LN_ST_NumSpacing_proportional: return OUString("proportional");
+ case NS_ooxml::LN_ST_NumSpacing_tabular: return OUString("tabular");
+ default: break;
+ }
+ return OUString();
+}
+
void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
{
switch(aElementId)
@@ -528,6 +540,8 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
maElementName = "numForm";
break;
case NS_ooxml::LN_numSpacing_numSpacing:
+ maPropertyId = PROP_CHAR_NUMSPACING_TEXT_EFFECT;
+ maElementName = "numSpacing";
case NS_ooxml::LN_stylisticSets_stylisticSets:
case NS_ooxml::LN_cntxtAlts_cntxtAlts:
default:
@@ -755,6 +769,12 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
mpGrabBagStack->appendElement("val", aAny);
}
break;
+ case NS_ooxml::LN_CT_NumSpacing_val:
+ {
+ uno::Any aAny = makeAny(getNumSpacingString(sal_Int32(aValue.getInt())));
+ mpGrabBagStack->appendElement("val", aAny);
+ }
+ break;
default:
break;
}
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index a435e95..1406359 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -66,6 +66,7 @@ public:
static OUString getPresetMaterialTypeString(sal_Int32 nType);
static OUString getLigaturesString(sal_Int32 nType);
static OUString getNumFormString(sal_Int32 nType);
+ static OUString getNumSpacingString(sal_Int32 nType);
};
commit 14a15f412276c91fa1a20edacdaf0b77f38f4ecd
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 14:49:26 2014 +0100
writerfilter: add w14:numSpacing into model.xml
Change-Id: I4ddeb415583183ab33d30b9b736977907c184ced
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 92aa07c..7924973 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5595,6 +5595,15 @@
</choice>
</list>
</define>
+ <define name="ST_NumSpacing">
+ <list>
+ <choice>
+ <value>default</value>
+ <value>proportional</value>
+ <value>tabular</value>
+ </choice>
+ </list>
+ </define>
<define name="ST_PositiveCoordinate">
<data type="long">
@@ -6152,6 +6161,11 @@
<ref name="ST_NumForm"/>
</attribute>
</define>
+ <define name="CT_NumSpacing">
+ <attribute name="val">
+ <ref name="ST_NumSpacing"/>
+ </attribute>
+ </define>
<define name="glow">
<element name="glow">
@@ -6200,7 +6214,7 @@
</define>
<define name="numSpacing">
<element name="numSpacing">
- <empty/>
+ <ref name="CT_NumSpacing"/>
</element>
</define>
<define name="stylisticSets">
@@ -6438,6 +6452,11 @@
<value name="lining" tokenid="ooxml:ST_NumForm_lining">lining</value>
<value name="oldStyle" tokenid="ooxml:ST_NumForm_oldStyle">oldStyle</value>
</resource>
+ <resource name="ST_NumSpacing" resource="List" generated="yes">
+ <value name="default" tokenid="ooxml:ST_NumSpacing_default">default</value>
+ <value name="proportional" tokenid="ooxml:ST_NumSpacing_proportional">proportional</value>
+ <value name="tabular" tokenid="ooxml:ST_NumSpacing_tabular">tabular</value>
+ </resource>
<resource name="ST_PositiveCoordinate" resource="Integer" generated="yes"/>
<resource name="ST_HexColorRGB" resource="Hex"/>
@@ -6605,6 +6624,9 @@
<resource name="CT_NumForm" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_NumForm_val"/>
</resource>
+ <resource name="CT_NumSpacing" resource="Properties" tag="character">
+ <attribute name="val" tokenid="ooxml:CT_NumSpacing_val"/>
+ </resource>
<resource name="glow" resource="Properties" tag="character">
<element name="glow" tokenid="ooxml:glow_glow"/>
@@ -18320,12 +18342,12 @@
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
</optional>
- <!--<optional>
+ <optional>
<element name="w14:numSpacing">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
</optional>
- <optional>
+ <!--<optional>
<element name="w14:stylisticSets">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
@@ -24311,8 +24333,8 @@
<element name="w14:props3d" tokenid="ooxml:EG_RPrBase_w14_props3d"/>
<element name="w14:ligatures" tokenid="ooxml:EG_RPrBase_w14_ligatures"/>
<element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/>
- <!--<element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/>
- <element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/>
+ <element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/>
+ <!--<element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/>
<element name="w14:cntxtAlts" tokenid="ooxml:EG_RPrBase_w14_cntxtAlts"/>-->
</resource>
<resource name="EG_RPrContent" resource="Properties" tag="character">
commit 1ed9d3abf3885a8b03d5bfda6d4183347f00cb75
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 14:24:12 2014 +0100
ooxml export: w14:numForm element
Change-Id: I7990d2ef77de855455f49e3f12f4ae117f753774
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ce06572..98c6d5a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1179,6 +1179,7 @@ void DocxAttributeOutput::InitCollectedRunProperties()
FSNS( XML_w14, XML_scene3d ),
FSNS( XML_w14, XML_props3d ),
FSNS( XML_w14, XML_ligatures ),
+ FSNS( XML_w14, XML_numForm ),
};
// postpone the output so that we can later [in EndParagraphProperties()]
@@ -1211,6 +1212,7 @@ const NameToId constNameToIdMapping[] =
{ OUString("scene3d"), FSNS( XML_w14, XML_scene3d ) },
{ OUString("props3d"), FSNS( XML_w14, XML_props3d ) },
{ OUString("ligatures"), FSNS( XML_w14, XML_ligatures ) },
+ { OUString("numForm"), FSNS( XML_w14, XML_numForm ) },
{ OUString("val"), FSNS( XML_w14, XML_val ) },
{ OUString("rad"), FSNS( XML_w14, XML_rad ) },
commit 4fad8bbaea57e362eacbd79f32d91d6fc198383e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 14:23:37 2014 +0100
writerfilter: add w14:numForm into model.xml
Change-Id: I36f74ed35331141ca0d9d91b4af18c5a76a116ff
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index a704517..92aa07c 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5586,6 +5586,15 @@
</choice>
</list>
</define>
+ <define name="ST_NumForm">
+ <list>
+ <choice>
+ <value>default</value>
+ <value>lining</value>
+ <value>oldStyle</value>
+ </choice>
+ </list>
+ </define>
<define name="ST_PositiveCoordinate">
<data type="long">
@@ -5657,7 +5666,6 @@
</optional>
</choice>
</define>
-
<define name="EG_ColorTransform">
<choice>
<optional>
@@ -5712,7 +5720,6 @@
</optional>
</choice>
</define>
-
<define name="EG_FillProperties">
<choice>
<optional>
@@ -5732,7 +5739,6 @@
</optional>
</choice>
</define>
-
<define name="EG_ShadeProperties">
<choice>
<optional>
@@ -5747,7 +5753,6 @@
</optional>
</choice>
</define>
-
<define name="EG_LineDashProperties">
<choice>
<optional>
@@ -5757,7 +5762,6 @@
</optional>
</choice>
</define>
-
<define name="EG_LineJoinProperties">
<choice>
<optional>
@@ -6143,6 +6147,11 @@
<ref name="ST_Ligatures"/>
</attribute>
</define>
+ <define name="CT_NumForm">
+ <attribute name="val">
+ <ref name="ST_NumForm"/>
+ </attribute>
+ </define>
<define name="glow">
<element name="glow">
@@ -6186,14 +6195,14 @@
</define>
<define name="numForm">
<element name="numForm">
- <empty/>
+ <ref name="CT_NumForm"/>
</element>
</define>
<define name="numSpacing">
<element name="numSpacing">
<empty/>
</element>
- </define>CT_Ligatures
+ </define>
<define name="stylisticSets">
<element name="stylisticSets">
<empty/>
@@ -6424,6 +6433,11 @@
<value name="contextualHistoricalDiscretional" tokenid="ooxml:ST_Ligatures_contextualHistoricalDiscretional">contextualHistoricalDiscretional</value>
<value name="all" tokenid="ooxml:ST_Ligatures_all">all</value>
</resource>
+ <resource name="ST_NumForm" resource="List" generated="yes">
+ <value name="default" tokenid="ooxml:ST_NumForm_default">default</value>
+ <value name="lining" tokenid="ooxml:ST_NumForm_lining">lining</value>
+ <value name="oldStyle" tokenid="ooxml:ST_NumForm_oldStyle">oldStyle</value>
+ </resource>
<resource name="ST_PositiveCoordinate" resource="Integer" generated="yes"/>
<resource name="ST_HexColorRGB" resource="Hex"/>
@@ -6588,7 +6602,9 @@
<resource name="CT_Ligatures" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_Ligatures_val"/>
</resource>
-
+ <resource name="CT_NumForm" resource="Properties" tag="character">
+ <attribute name="val" tokenid="ooxml:CT_NumForm_val"/>
+ </resource>
<resource name="glow" resource="Properties" tag="character">
<element name="glow" tokenid="ooxml:glow_glow"/>
@@ -18299,12 +18315,12 @@
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
</optional>
- <!--<optional>
+ <optional>
<element name="w14:numForm">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
</optional>
- <optional>
+ <!--<optional>
<element name="w14:numSpacing">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
@@ -24294,8 +24310,8 @@
<element name="w14:scene3d" tokenid="ooxml:EG_RPrBase_w14_scene3d"/>
<element name="w14:props3d" tokenid="ooxml:EG_RPrBase_w14_props3d"/>
<element name="w14:ligatures" tokenid="ooxml:EG_RPrBase_w14_ligatures"/>
- <!--<element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/>
- <element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/>
+ <element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/>
+ <!--<element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/>
<element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/>
<element name="w14:cntxtAlts" tokenid="ooxml:EG_RPrBase_w14_cntxtAlts"/>-->
</resource>
commit 6d81d3f35e54cd94a427a28233a9118abdb21b1d
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 14:22:31 2014 +0100
writerfilter: put w14:numForm elements/attributes into a GrabBag
Change-Id: I34a5791343c1a76055281969c1a666df357c9e03
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index ceb1b26..cf5c5897 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -475,6 +475,18 @@ OUString TextEffectsHandler::getLigaturesString(sal_Int32 nType)
return OUString();
}
+OUString TextEffectsHandler::getNumFormString(sal_Int32 nType)
+{
+ switch (nType)
+ {
+ case NS_ooxml::LN_ST_NumForm_default: return OUString("default");
+ case NS_ooxml::LN_ST_NumForm_lining: return OUString("lining");
+ case NS_ooxml::LN_ST_NumForm_oldStyle: return OUString("oldStyle");
+ default: break;
+ }
+ return OUString();
+}
+
void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
{
switch(aElementId)
@@ -512,6 +524,9 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
maElementName = "ligatures";
break;
case NS_ooxml::LN_numForm_numForm:
+ maPropertyId = PROP_CHAR_NUMFORM_TEXT_EFFECT;
+ maElementName = "numForm";
+ break;
case NS_ooxml::LN_numSpacing_numSpacing:
case NS_ooxml::LN_stylisticSets_stylisticSets:
case NS_ooxml::LN_cntxtAlts_cntxtAlts:
@@ -734,6 +749,12 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
mpGrabBagStack->appendElement("val", aAny);
}
break;
+ case NS_ooxml::LN_CT_NumForm_val:
+ {
+ uno::Any aAny = makeAny(getNumFormString(sal_Int32(aValue.getInt())));
+ mpGrabBagStack->appendElement("val", aAny);
+ }
+ break;
default:
break;
}
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index a12442c..a435e95 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -65,6 +65,7 @@ public:
static OUString getBevelPresetTypeString(sal_Int32 nType);
static OUString getPresetMaterialTypeString(sal_Int32 nType);
static OUString getLigaturesString(sal_Int32 nType);
+ static OUString getNumFormString(sal_Int32 nType);
};
commit 31cd5fc1fdab61892d7915e04081513197c7f57c
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 13:57:58 2014 +0100
ooxml export: w14:ligatures element
Change-Id: Iad9a96d202487fa71e7110d7f89d94f161e0bb6f
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 664d644..ce06572 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1178,6 +1178,7 @@ void DocxAttributeOutput::InitCollectedRunProperties()
FSNS( XML_w14, XML_textFill ),
FSNS( XML_w14, XML_scene3d ),
FSNS( XML_w14, XML_props3d ),
+ FSNS( XML_w14, XML_ligatures ),
};
// postpone the output so that we can later [in EndParagraphProperties()]
@@ -1209,6 +1210,7 @@ const NameToId constNameToIdMapping[] =
{ OUString("textFill"), FSNS( XML_w14, XML_textFill ) },
{ OUString("scene3d"), FSNS( XML_w14, XML_scene3d ) },
{ OUString("props3d"), FSNS( XML_w14, XML_props3d ) },
+ { OUString("ligatures"), FSNS( XML_w14, XML_ligatures ) },
{ OUString("val"), FSNS( XML_w14, XML_val ) },
{ OUString("rad"), FSNS( XML_w14, XML_rad ) },
commit 7f172fa098276c54c7428a9d14c65c8fe3048f8e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 13:56:09 2014 +0100
writerfilter: put w14:ligatures elements/attributes into a GrabBag
Change-Id: I8c3ac3698210e6e3a6bdd01c2a9ce7f6248a3c5b
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 9536576..ceb1b26 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -450,6 +450,31 @@ OUString TextEffectsHandler::getPresetMaterialTypeString(sal_Int32 nType)
return OUString();
}
+OUString TextEffectsHandler::getLigaturesString(sal_Int32 nType)
+{
+ switch (nType)
+ {
+ case NS_ooxml::LN_ST_Ligatures_none: return OUString("none");
+ case NS_ooxml::LN_ST_Ligatures_standard: return OUString("standard");
+ case NS_ooxml::LN_ST_Ligatures_contextual: return OUString("contextual");
+ case NS_ooxml::LN_ST_Ligatures_historical: return OUString("historical");
+ case NS_ooxml::LN_ST_Ligatures_discretional: return OUString("discretional");
+ case NS_ooxml::LN_ST_Ligatures_standardContextual: return OUString("standardContextual");
+ case NS_ooxml::LN_ST_Ligatures_standardHistorical: return OUString("standardHistorical");
+ case NS_ooxml::LN_ST_Ligatures_contextualHistorical: return OUString("contextualHistorical");
+ case NS_ooxml::LN_ST_Ligatures_standardDiscretional: return OUString("standardDiscretional");
+ case NS_ooxml::LN_ST_Ligatures_contextualDiscretional: return OUString("contextualDiscretional");
+ case NS_ooxml::LN_ST_Ligatures_historicalDiscretional: return OUString("historicalDiscretional");
+ case NS_ooxml::LN_ST_Ligatures_standardContextualHistorical: return OUString("standardContextualHistorical");
+ case NS_ooxml::LN_ST_Ligatures_standardContextualDiscretional: return OUString("standardContextualDiscretional");
+ case NS_ooxml::LN_ST_Ligatures_standardHistoricalDiscretional: return OUString("standardHistoricalDiscretional");
+ case NS_ooxml::LN_ST_Ligatures_contextualHistoricalDiscretional: return OUString("contextualHistoricalDiscretional");
+ case NS_ooxml::LN_ST_Ligatures_all: return OUString("all");
+ default: break;
+ }
+ return OUString();
+}
+
void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
{
switch(aElementId)
@@ -483,6 +508,9 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
maElementName = "props3d";
break;
case NS_ooxml::LN_ligatures_ligatures:
+ maPropertyId = PROP_CHAR_LIGATURES_TEXT_EFFECT;
+ maElementName = "ligatures";
+ break;
case NS_ooxml::LN_numForm_numForm:
case NS_ooxml::LN_numSpacing_numSpacing:
case NS_ooxml::LN_stylisticSets_stylisticSets:
@@ -700,6 +728,12 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
mpGrabBagStack->appendElement("prst", aAny);
}
break;
+ case NS_ooxml::LN_CT_Ligatures_val:
+ {
+ uno::Any aAny = makeAny(getLigaturesString(sal_Int32(aValue.getInt())));
+ mpGrabBagStack->appendElement("val", aAny);
+ }
+ break;
default:
break;
}
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 31c2daa..a12442c 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -64,6 +64,7 @@ public:
static OUString getLightRigDirectionString(sal_Int32 nType);
static OUString getBevelPresetTypeString(sal_Int32 nType);
static OUString getPresetMaterialTypeString(sal_Int32 nType);
+ static OUString getLigaturesString(sal_Int32 nType);
};
commit 023b0af6a94199dedc8814f856a18f4c909cbd91
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 13:45:19 2014 +0100
writerfilter: reference CT_Ligatures for w14:ligatures
Change-Id: Ie4a4735a0ba165b0864ae0c8d5caf94c2273eb1e
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 9266abb..a704517 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -6181,7 +6181,7 @@
</define>
<define name="ligatures">
<element name="ligatures">
- <empty/>
+ <ref name="CT_Ligatures"/>
</element>
</define>
<define name="numForm">
commit 08f02e9a1b68584ca905ff008976c432640e2e5e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 27 13:43:13 2014 +0100
writerfilter: add w14:ligatures into model.xml
Change-Id: Ied68f150169197f3919ba98ee230f778e2c40da3
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 8010d4e..9266abb 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5564,6 +5564,28 @@
</choice>
</list>
</define>
+ <define name="ST_Ligatures">
+ <list>
+ <choice>
+ <value>none</value>
+ <value>standard</value>
+ <value>contextual</value>
+ <value>historical</value>
+ <value>discretional</value>
+ <value>standardContextual</value>
+ <value>standardHistorical</value>
+ <value>contextualHistorical</value>
+ <value>standardDiscretional</value>
+ <value>contextualDiscretional</value>
+ <value>historicalDiscretional</value>
+ <value>standardContextualHistorical</value>
+ <value>standardContextualDiscretional</value>
+ <value>standardHistoricalDiscretional</value>
+ <value>contextualHistoricalDiscretional</value>
+ <value>all</value>
+ </choice>
+ </list>
+ </define>
<define name="ST_PositiveCoordinate">
<data type="long">
@@ -6116,6 +6138,11 @@
</attribute>
</optional>
</define>
+ <define name="CT_Ligatures">
+ <attribute name="val">
+ <ref name="ST_Ligatures"/>
+ </attribute>
+ </define>
<define name="glow">
<element name="glow">
@@ -6166,7 +6193,7 @@
<element name="numSpacing">
<empty/>
</element>
- </define>
+ </define>CT_Ligatures
<define name="stylisticSets">
<element name="stylisticSets">
<empty/>
@@ -6177,7 +6204,6 @@
<empty/>
</element>
</define>
-
</grammar>
<!-- Simple Types Resource Definitions -->
@@ -6380,6 +6406,24 @@
<value name="softmetal" tokenid="ooxml:ST_PresetMaterialType_softmetal">softmetal</value>
<value name="none" tokenid="ooxml:ST_PresetMaterialType_none">none</value>
</resource>
+ <resource name="ST_Ligatures" resource="List" generated="yes">
+ <value name="none" tokenid="ooxml:ST_Ligatures_none">none</value>
+ <value name="standard" tokenid="ooxml:ST_Ligatures_standard">standard</value>
+ <value name="contextual" tokenid="ooxml:ST_Ligatures_contextual">contextual</value>
+ <value name="historical" tokenid="ooxml:ST_Ligatures_historical">historical</value>
+ <value name="discretional" tokenid="ooxml:ST_Ligatures_discretional">discretional</value>
+ <value name="standardContextual" tokenid="ooxml:ST_Ligatures_standardContextual">standardContextual</value>
+ <value name="standardHistorical" tokenid="ooxml:ST_Ligatures_standardHistorical">standardHistorical</value>
+ <value name="contextualHistorical" tokenid="ooxml:ST_Ligatures_contextualHistorical">contextualHistorical</value>
+ <value name="standardDiscretional" tokenid="ooxml:ST_Ligatures_standardDiscretional">standardDiscretional</value>
+ <value name="contextualDiscretional" tokenid="ooxml:ST_Ligatures_contextualDiscretional">contextualDiscretional</value>
+ <value name="historicalDiscretional" tokenid="ooxml:ST_Ligatures_historicalDiscretional">historicalDiscretional</value>
+ <value name="standardContextualHistorical" tokenid="ooxml:ST_Ligatures_standardContextualHistorical">standardContextualHistorical</value>
+ <value name="standardContextualDiscretional" tokenid="ooxml:ST_Ligatures_standardContextualDiscretional">standardContextualDiscretional</value>
+ <value name="standardHistoricalDiscretional" tokenid="ooxml:ST_Ligatures_standardHistoricalDiscretional">standardHistoricalDiscretional</value>
+ <value name="contextualHistoricalDiscretional" tokenid="ooxml:ST_Ligatures_contextualHistoricalDiscretional">contextualHistoricalDiscretional</value>
+ <value name="all" tokenid="ooxml:ST_Ligatures_all">all</value>
+ </resource>
<resource name="ST_PositiveCoordinate" resource="Integer" generated="yes"/>
<resource name="ST_HexColorRGB" resource="Hex"/>
@@ -6541,6 +6585,10 @@
<attribute name="contourW" tokenid="ooxml:CT_Props3D_contourW"/>
<attribute name="prstMaterial" tokenid="ooxml:CT_Props3D_prstMaterial"/>
</resource>
+ <resource name="CT_Ligatures" resource="Properties" tag="character">
+ <attribute name="val" tokenid="ooxml:CT_Ligatures_val"/>
+ </resource>
+
<resource name="glow" resource="Properties" tag="character">
<element name="glow" tokenid="ooxml:glow_glow"/>
@@ -18246,12 +18294,12 @@
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
</optional>
- <!--<optional>
+ <optional>
<element name="w14:ligatures">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
</optional>
- <optional>
+ <!--<optional>
<element name="w14:numForm">
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
@@ -24245,8 +24293,8 @@
<element name="w14:textFill" tokenid="ooxml:EG_RPrBase_w14_textFill"/>
<element name="w14:scene3d" tokenid="ooxml:EG_RPrBase_w14_scene3d"/>
<element name="w14:props3d" tokenid="ooxml:EG_RPrBase_w14_props3d"/>
- <!--<element name="w14:ligatures" tokenid="ooxml:EG_RPrBase_w14_ligatures"/>
- <element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/>
+ <element name="w14:ligatures" tokenid="ooxml:EG_RPrBase_w14_ligatures"/>
+ <!--<element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/>
<element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/>
<element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/>
<element name="w14:cntxtAlts" tokenid="ooxml:EG_RPrBase_w14_cntxtAlts"/>-->
More information about the Libreoffice-commits
mailing list