summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-02-27 13:56:09 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-02-27 17:34:59 +0100
commit7f172fa098276c54c7428a9d14c65c8fe3048f8e (patch)
treefe3cea5e9d543757429b1aa1a3f10033cc2f56c8
parent023b0af6a94199dedc8814f856a18f4c909cbd91 (diff)
writerfilter: put w14:ligatures elements/attributes into a GrabBag
Change-Id: I8c3ac3698210e6e3a6bdd01c2a9ce7f6248a3c5b
-rw-r--r--writerfilter/source/dmapper/TextEffectsHandler.cxx34
-rw-r--r--writerfilter/source/dmapper/TextEffectsHandler.hxx1
2 files changed, 35 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 953657624984..ceb1b260e8b9 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 31c2daa96e09..a12442ccbb83 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);
};