Kaydet (Commit) 6d81d3f3 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

writerfilter: put w14:numForm elements/attributes into a GrabBag

Change-Id: I34a5791343c1a76055281969c1a666df357c9e03
üst 31cd5fc1
...@@ -475,6 +475,18 @@ OUString TextEffectsHandler::getLigaturesString(sal_Int32 nType) ...@@ -475,6 +475,18 @@ OUString TextEffectsHandler::getLigaturesString(sal_Int32 nType)
return OUString(); 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) void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
{ {
switch(aElementId) switch(aElementId)
...@@ -512,6 +524,9 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId) ...@@ -512,6 +524,9 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId)
maElementName = "ligatures"; maElementName = "ligatures";
break; break;
case NS_ooxml::LN_numForm_numForm: 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_numSpacing_numSpacing:
case NS_ooxml::LN_stylisticSets_stylisticSets: case NS_ooxml::LN_stylisticSets_stylisticSets:
case NS_ooxml::LN_cntxtAlts_cntxtAlts: case NS_ooxml::LN_cntxtAlts_cntxtAlts:
...@@ -734,6 +749,12 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) ...@@ -734,6 +749,12 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
mpGrabBagStack->appendElement("val", aAny); mpGrabBagStack->appendElement("val", aAny);
} }
break; break;
case NS_ooxml::LN_CT_NumForm_val:
{
uno::Any aAny = makeAny(getNumFormString(sal_Int32(aValue.getInt())));
mpGrabBagStack->appendElement("val", aAny);
}
break;
default: default:
break; break;
} }
......
...@@ -65,6 +65,7 @@ public: ...@@ -65,6 +65,7 @@ public:
static OUString getBevelPresetTypeString(sal_Int32 nType); static OUString getBevelPresetTypeString(sal_Int32 nType);
static OUString getPresetMaterialTypeString(sal_Int32 nType); static OUString getPresetMaterialTypeString(sal_Int32 nType);
static OUString getLigaturesString(sal_Int32 nType); static OUString getLigaturesString(sal_Int32 nType);
static OUString getNumFormString(sal_Int32 nType);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment