[Libreoffice-commits] core.git: 7 commits - oox/source writerfilter/CustomTarget_source.mk writerfilter/Library_writerfilter.mk writerfilter/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.com
Thu Feb 20 08:55:35 PST 2014
oox/source/token/namespaces.txt | 2
oox/source/token/tokens.txt | 2
writerfilter/CustomTarget_source.mk | 1
writerfilter/Library_writerfilter.mk | 1
writerfilter/source/dmapper/DomainMapper.cxx | 19 +
writerfilter/source/dmapper/PropertyIds.cxx | 1
writerfilter/source/dmapper/PropertyIds.hxx | 1
writerfilter/source/dmapper/TextEffectsHandler.cxx | 226 ++++++++++++++++++++
writerfilter/source/dmapper/TextEffectsHandler.hxx | 52 ++++
writerfilter/source/ooxml/model.xml | 232 ++++++++++++++++++++-
10 files changed, 534 insertions(+), 3 deletions(-)
New commits:
commit 6e157dc78d495d94948e33822405addb48467e74
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 20 17:46:18 2014 +0100
writerfilter: Write w14:glow and subelements into a CharGrabBag
TextEffectsHandler is responsible to add all subelements
(using nesting of Sequence and Property objects) of text
effects (like w14:glow) into a CharGrabBag.
Change-Id: Ie011a059b905b7cd43528dd7d40be186c4fc4229
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 855f013..592970e 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/TDefTableHandler \
writerfilter/source/dmapper/TablePositionHandler \
writerfilter/source/dmapper/TablePropertiesHandler \
+ writerfilter/source/dmapper/TextEffectsHandler \
writerfilter/source/dmapper/TblStylePrHandler \
writerfilter/source/dmapper/ThemeTable \
writerfilter/source/dmapper/WrapPolygonHandler \
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 3ac0ac3..9d8754a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -62,6 +62,7 @@
#include <comphelper/storagehelper.hxx>
#include <filter/msfilter/util.hxx>
+#include <TextEffectsHandler.hxx>
#include <CellColorHandler.hxx>
#include <SectionColumnHandler.hxx>
#include <GraphicHelpers.hxx>
@@ -2340,6 +2341,24 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_tblEnd:
m_pImpl->m_nTableDepth--;
break;
+ case NS_ooxml::LN_glow_glow:
+ {
+ writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
+ if( pProperties.get())
+ {
+ TextEffectsHandlerPtr pTextEffectsHandlerPtr( new TextEffectsHandler );
+ sal_Bool bEnableTempGrabBag = !pTextEffectsHandlerPtr->isInteropGrabBagEnabled();
+ if( bEnableTempGrabBag )
+ pTextEffectsHandlerPtr->enableInteropGrabBag( "glow" );
+
+ pProperties->resolve(*pTextEffectsHandlerPtr);
+
+ rContext->Insert(PROP_CHAR_GLOW_TEXT_EFFECT, pTextEffectsHandlerPtr->getInteropGrabBag().Value, true, CHAR_GRAB_BAG);
+ if(bEnableTempGrabBag)
+ pTextEffectsHandlerPtr->disableInteropGrabBag();
+ }
+ }
+ break;
default:
{
#ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index 9ae0d50..ce007e2 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -376,6 +376,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const
case PROP_TOC_NEW_LINE: sName = "TOCNewLine"; break;
case PROP_TOC_PARAGRAPH_OUTLINE_LEVEL : sName = "TOCParagraphOutlineLevel"; break;
case PROP_CHAR_THEME_COLOR_TINT : sName = "CharThemeColorTint"; break;
+ case PROP_CHAR_GLOW_TEXT_EFFECT : sName = "CharGlowTextEffect"; break;
}
::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index ce2459c..c8155b1 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -347,6 +347,7 @@ enum PropertyIds
,PROP_TOC_NEW_LINE
,PROP_TOC_PARAGRAPH_OUTLINE_LEVEL
,PROP_CHAR_THEME_COLOR_TINT
+ ,PROP_CHAR_GLOW_TEXT_EFFECT
};
struct PropertyNameSupplier_Impl;
class PropertyNameSupplier
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
new file mode 100644
index 0000000..6596a35
--- /dev/null
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -0,0 +1,226 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <TextEffectsHandler.hxx>
+#include <ooxml/resourceids.hxx>
+#include "dmapperLoggers.hxx"
+
+#include <stack>
+
+
+namespace writerfilter {
+namespace dmapper
+{
+
+using namespace std;
+using namespace css::uno;
+using namespace css::beans;
+
+struct GrabBagStackElement
+{
+ OUString maName;
+ std::vector<beans::PropertyValue> maPropertyList;
+};
+
+class GrabBagStack
+{
+public:
+ GrabBagStack(OUString aName)
+ {
+ mCurrentElement.maName = aName;
+ }
+
+ virtual ~GrabBagStack()
+ {}
+
+ std::stack<GrabBagStackElement> mStack;
+ GrabBagStackElement mCurrentElement;
+
+ PropertyValue getRootProperty()
+ {
+ while(!mStack.empty())
+ pop();
+
+ PropertyValue aProperty;
+ aProperty.Name = mCurrentElement.maName;
+
+ Sequence<PropertyValue> aSequence(mCurrentElement.maPropertyList.size());
+ PropertyValue* pSequence = aSequence.getArray();
+ std::vector<PropertyValue>::iterator i;
+ for (i = mCurrentElement.maPropertyList.begin(); i != mCurrentElement.maPropertyList.end(); ++i)
+ *pSequence++ = *i;
+
+ aProperty.Value = makeAny(aSequence);
+
+ return aProperty;
+ }
+
+ void appendElement(OUString aName, Any aAny)
+ {
+ PropertyValue aValue;
+ aValue.Name = aName;
+ aValue.Value = aAny;
+ mCurrentElement.maPropertyList.push_back(aValue);
+ }
+
+ void push(OUString aKey)
+ {
+ mStack.push(mCurrentElement);
+ mCurrentElement.maName = aKey;
+ mCurrentElement.maPropertyList.clear();
+ }
+
+ void pop()
+ {
+ OUString aName = mCurrentElement.maName;
+ Sequence<PropertyValue> aSequence(mCurrentElement.maPropertyList.size());
+ PropertyValue* pSequence = aSequence.getArray();
+ std::vector<PropertyValue>::iterator i;
+ for (i = mCurrentElement.maPropertyList.begin(); i != mCurrentElement.maPropertyList.end(); ++i)
+ *pSequence++ = *i;
+
+ mCurrentElement = mStack.top();
+ mStack.pop();
+ appendElement(aName, makeAny(aSequence));
+ }
+};
+
+TextEffectsHandler::TextEffectsHandler() :
+ LoggedProperties(dmapper_logger, "TextEffectsHandler"),
+ mpGrabBagStack(NULL)
+{
+}
+
+TextEffectsHandler::~TextEffectsHandler()
+{
+}
+
+void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue)
+{
+ OUString sValue = aValue.getString();
+ sal_Int32 nValue = aValue.getInt();
+ switch(aName)
+ {
+ case NS_ooxml::LN_CT_Percentage_val:
+ mpGrabBagStack->appendElement("val", makeAny(nValue));
+ break;
+ case NS_ooxml::LN_CT_PositiveFixedPercentage_val:
+ mpGrabBagStack->appendElement("val", makeAny(nValue));
+ break;
+ case NS_ooxml::LN_CT_SchemeColor_val:
+ mpGrabBagStack->appendElement("val", makeAny(nValue));
+ break;
+ case NS_ooxml::LN_CT_Glow_rad:
+ mpGrabBagStack->appendElement("rad", makeAny(nValue));
+ break;
+ default:
+ break;
+ }
+}
+
+void TextEffectsHandler::lcl_sprm(Sprm& rSprm)
+{
+ sal_uInt32 nSprmId = rSprm.getId();
+
+ switch(nSprmId)
+ {
+ case NS_ooxml::LN_EG_ColorChoice_srgbClr:
+ mpGrabBagStack->push("srgbClr");
+ break;
+ case NS_ooxml::LN_EG_ColorChoice_schemeClr:
+ mpGrabBagStack->push("schemeClr");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_tint:
+ mpGrabBagStack->push("tint");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_shade:
+ mpGrabBagStack->push("shade");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_alpha:
+ mpGrabBagStack->push("alpha");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_hueMod:
+ mpGrabBagStack->push("hueMod");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_sat:
+ mpGrabBagStack->push("sat");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_satOff:
+ mpGrabBagStack->push("satOff");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_satMod:
+ mpGrabBagStack->push("satMod");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_lum:
+ mpGrabBagStack->push("lum");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_lumOff:
+ mpGrabBagStack->push("lumOff");
+ break;
+ case NS_ooxml::LN_EG_ColorTransform_lumMod:
+ mpGrabBagStack->push("lumMod");
+ break;
+
+ default:
+ break;
+ }
+
+ writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
+ if( !pProperties.get())
+ return;
+
+ pProperties.get()->resolve( *this );
+
+ switch(nSprmId)
+ {
+ case NS_ooxml::LN_EG_ColorChoice_srgbClr:
+ case NS_ooxml::LN_EG_ColorChoice_schemeClr:
+ case NS_ooxml::LN_EG_ColorTransform_tint:
+ case NS_ooxml::LN_EG_ColorTransform_shade:
+ case NS_ooxml::LN_EG_ColorTransform_alpha:
+ case NS_ooxml::LN_EG_ColorTransform_hueMod:
+ case NS_ooxml::LN_EG_ColorTransform_sat:
+ case NS_ooxml::LN_EG_ColorTransform_satOff:
+ case NS_ooxml::LN_EG_ColorTransform_satMod:
+ case NS_ooxml::LN_EG_ColorTransform_lum:
+ case NS_ooxml::LN_EG_ColorTransform_lumOff:
+ case NS_ooxml::LN_EG_ColorTransform_lumMod:
+ mpGrabBagStack->pop();
+ break;
+ }
+}
+
+beans::PropertyValue TextEffectsHandler::getInteropGrabBag()
+{
+ beans::PropertyValue aReturn = mpGrabBagStack->getRootProperty();
+ mpGrabBagStack.reset();
+ return aReturn;
+}
+
+void TextEffectsHandler::enableInteropGrabBag(OUString aName)
+{
+ mpGrabBagStack.reset(new GrabBagStack(aName));
+}
+
+void TextEffectsHandler::disableInteropGrabBag()
+{
+ mpGrabBagStack.reset();
+}
+
+bool TextEffectsHandler::isInteropGrabBagEnabled()
+{
+ return mpGrabBagStack.get() != NULL;
+}
+
+
+}//namespace dmapper
+} //namespace writerfilter
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
new file mode 100644
index 0000000..89c5626
--- /dev/null
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_TEXTEFFECTSHANDLER_HXX
+#define INCLUDED_TEXTEFFECTSHANDLER_HXX
+
+#include <WriterFilterDllApi.hxx>
+#include <resourcemodel/LoggedResources.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <i18nlangtag/languagetag.hxx>
+#include <boost/scoped_ptr.hpp>
+
+namespace writerfilter {
+namespace dmapper
+{
+
+class GrabBagStack;
+
+class TextEffectsHandler : public LoggedProperties
+{
+private:
+ boost::scoped_ptr<GrabBagStack> mpGrabBagStack;
+
+ // LoggedProperties
+ virtual void lcl_attribute(Id aName, Value& aValue);
+ virtual void lcl_sprm(Sprm& sprm);
+
+public:
+ TextEffectsHandler();
+ virtual ~TextEffectsHandler();
+
+ css::beans::PropertyValue getInteropGrabBag();
+ void enableInteropGrabBag(OUString aName);
+ void disableInteropGrabBag();
+ bool isInteropGrabBagEnabled();
+};
+
+typedef boost::shared_ptr<TextEffectsHandler> TextEffectsHandlerPtr;
+
+}}
+
+#endif // INCLUDED_TEXTEFFECTSHANDLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5e923733fba8d341b81ece01fb50bdc204a2a4f3
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Feb 20 17:33:45 2014 +0100
w14:glow: add simple types so attributes are recognised
Change-Id: Id253c442e3c8a79f6ac9f088e6c15d5a9cc323c7
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 5454e6c..52427ee 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5317,8 +5317,36 @@
</namespace>
<namespace name="w14" file="w14.rng">
<start name="glow"/>
- <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
- <include href="dml-baseTypes.rng"/>
+ <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" attributeFormDefault="qualified">
+
+ <define name="ST_PositiveCoordinate">
+ <data type="long">
+ <xs:documentation>Positive Coordinate</xs:documentation>
+ <param name="minInclusive">0</param>
+ <param name="maxInclusive">27273042316900</param>
+ </data>
+ </define>
+
+ <define name="ST_HexColorRGB">
+ <data type="hexBinary">
+ <xs:documentation>Hexadecimal Color Value</xs:documentation>
+ <param name="length">3</param>
+ </data>
+ </define>
+
+ <define name="ST_PositiveFixedPercentage">
+ <empty/>
+ </define>
+
+ <define name="ST_PositivePercentage">
+ <empty/>
+ </define>
+
+ <define name="ST_Percentage">
+ <data type="int">
+ <xs:documentation>Percentage</xs:documentation>
+ </data>
+ </define>
<define name="ST_SchemeColorVal">
<choice>
@@ -5463,8 +5491,14 @@
<value name="accent5" tokenid="ooxml:ST_SchemeColorVal_accent5">accent5</value>
<value name="accent6" tokenid="ooxml:ST_SchemeColorVal_accent6">accent6</value>
</resource>
+ <resource name="ST_PositiveCoordinate" resource="Integer" generated="yes"/>
+ <resource name="ST_HexColorRGB" resource="Hex"/>
+ <resource name="ST_PositivePercentage" resource="Value">
+ <action name="characters" action="positivePercentage"/>
+ </resource>
+ <resource name="ST_Percentage" resource="Integer" generated="yes"/>
- <resource name="EG_ColorTransform" resource="Properties" tag="paragraph">
+ <resource name="EG_ColorTransform" resource="Properties" tag="character">
<element name="tint" tokenid="ooxml:EG_ColorTransform_tint"/>
<element name="shade" tokenid="ooxml:EG_ColorTransform_shade"/>
<element name="alpha" tokenid="ooxml:EG_ColorTransform_alpha"/>
@@ -5476,29 +5510,29 @@
<element name="lumOff" tokenid="ooxml:EG_ColorTransform_lumOff"/>
<element name="lumMod" tokenid="ooxml:EG_ColorTransform_lumMod"/>
</resource>
- <resource name="EG_ColorChoice" resource="Properties" tag="paragraph">
+ <resource name="EG_ColorChoice" resource="Properties" tag="character">
<element name="srgbClr" tokenid="ooxml:EG_ColorChoice_srgbClr"/>
<element name="schemeClr" tokenid="ooxml:EG_ColorChoice_schemeClr"/>
</resource>
- <resource name="CT_Glow" resource="Properties" tag="paragraph">
+ <resource name="CT_Glow" resource="Properties" tag="character">
<attribute name="rad" tokenid="ooxml:CT_Glow_rad"/>
</resource>
- <resource name="CT_SRgbColor" resource="Properties" tag="paragraph">
+ <resource name="CT_SRgbColor" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_SRgbColor_val"/>
</resource>
- <resource name="CT_SchemeColor" resource="Properties" tag="paragraph">
+ <resource name="CT_SchemeColor" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_SchemeColor_val"/>
</resource>
- <resource name="CT_PositiveFixedPercentage" resource="Properties" tag="paragraph">
+ <resource name="CT_PositiveFixedPercentage" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_PositiveFixedPercentage_val"/>
</resource>
- <resource name="CT_PositivePercentage" resource="Properties" tag="paragraph">
+ <resource name="CT_PositivePercentage" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_PositivePercentage_val"/>
</resource>
- <resource name="CT_Percentage" resource="Properties" tag="paragraph">
+ <resource name="CT_Percentage" resource="Properties" tag="character">
<attribute name="val" tokenid="ooxml:CT_Percentage_val"/>
</resource>
- <resource name="glow" resource="Properties" tag="paragraph">
+ <resource name="glow" resource="Properties" tag="character">
<element name="glow" tokenid="ooxml:glow_glow"/>
</resource>
</namespace>
commit 6c92d24b82444d2f5aac95e5e05fdfb368b78f65
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Wed Feb 19 18:13:37 2014 +0100
writerfilter: rework w14 elements to use groups for later reuse
Change-Id: I080f06dc6c7c5d5250bcf5b115841ecf3a1f7ee8
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 889b691..5454e6c 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5315,9 +5315,11 @@
<element name="sizeRelV" tokenid="ooxml:sizeRelV_sizeRelV"/>
</resource>
</namespace>
- <namespace name="w14">
+ <namespace name="w14" file="w14.rng">
<start name="glow"/>
- <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+ <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+ <include href="dml-baseTypes.rng"/>
+
<define name="ST_SchemeColorVal">
<choice>
<value>bg1</value>
@@ -5333,131 +5335,94 @@
</choice>
</define>
+ <define name="EG_ColorChoice">
+ <choice>
+ <optional>
+ <element name="srgbClr">
+ <ref name="CT_SRgbColor"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="schemeClr">
+ <ref name="CT_SchemeColor"/>
+ </element>
+ </optional>
+ </choice>
+ </define>
+
+ <define name="EG_ColorTransform">
+ <choice>
+ <optional>
+ <element name="tint">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="shade">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="alpha">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="hueMod">
+ <ref name="CT_PositivePercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="sat">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="satOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="satMod">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lum">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lumOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lumMod">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ </choice>
+ </define>
+
<define name="CT_Glow">
<optional>
- <element name="srgbClr">
- <ref name="CT_SRgbColor"/>
- </element>
- </optional>
- <optional>
- <element name="schemeClr">
- <ref name="CT_SchemeColor"/>
- </element>
- </optional>
- <optional>
- <attribute name="rad">
- <ref name="ST_PositiveCoordinate"/>
- </attribute>
+ <ref name="EG_ColorChoice"/>
</optional>
+ <attribute name="rad">
+ <ref name="ST_PositiveCoordinate"/>
+ </attribute>
</define>
<define name="CT_SRgbColor">
- <optional>
- <element name="tint">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- </optional>
- <optional>
- <element name="shade">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- </optional>
- <optional>
- <element name="alpha">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- </optional>
- <optional>
- <element name="hueMod">
- <ref name="CT_PositivePercentage"/>
- </element>
- </optional>
- <optional>
- <element name="sat">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="satOff">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="satMod">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="lum">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="lumOff">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="lumMod">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
+ <ref name="EG_ColorTransform"/>
<attribute name="val">
<ref name="ST_HexColorRGB"/>
</attribute>
</define>
<define name="CT_SchemeColor">
- <optional>
- <element name="tint">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- </optional>
- <optional>
- <element name="shade">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- </optional>
- <optional>
- <element name="alpha">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- </optional>
- <optional>
- <element name="hueMod">
- <ref name="CT_PositivePercentage"/>
- </element>
- </optional>
- <optional>
- <element name="sat">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="satOff">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="satMod">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="lum">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="lumOff">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
- <optional>
- <element name="lumMod">
- <ref name="CT_Percentage"/>
- </element>
- </optional>
+ <ref name="EG_ColorTransform"/>
<attribute name="val">
<ref name="ST_SchemeColorVal"/>
</attribute>
@@ -5498,35 +5463,30 @@
<value name="accent5" tokenid="ooxml:ST_SchemeColorVal_accent5">accent5</value>
<value name="accent6" tokenid="ooxml:ST_SchemeColorVal_accent6">accent6</value>
</resource>
+
+ <resource name="EG_ColorTransform" resource="Properties" tag="paragraph">
+ <element name="tint" tokenid="ooxml:EG_ColorTransform_tint"/>
+ <element name="shade" tokenid="ooxml:EG_ColorTransform_shade"/>
+ <element name="alpha" tokenid="ooxml:EG_ColorTransform_alpha"/>
+ <element name="hueMod" tokenid="ooxml:EG_ColorTransform_hueMod"/>
+ <element name="sat" tokenid="ooxml:EG_ColorTransform_sat"/>
+ <element name="satOff" tokenid="ooxml:EG_ColorTransform_satOff"/>
+ <element name="satMod" tokenid="ooxml:EG_ColorTransform_satMod"/>
+ <element name="lum" tokenid="ooxml:EG_ColorTransform_lum"/>
+ <element name="lumOff" tokenid="ooxml:EG_ColorTransform_lumOff"/>
+ <element name="lumMod" tokenid="ooxml:EG_ColorTransform_lumMod"/>
+ </resource>
+ <resource name="EG_ColorChoice" resource="Properties" tag="paragraph">
+ <element name="srgbClr" tokenid="ooxml:EG_ColorChoice_srgbClr"/>
+ <element name="schemeClr" tokenid="ooxml:EG_ColorChoice_schemeClr"/>
+ </resource>
<resource name="CT_Glow" resource="Properties" tag="paragraph">
- <element name="srgbClr" tokenid="ooxml:CT_Glow_srgbClr"/>
- <element name="schemeClr" tokenid="ooxml:CT_Glow_schemeClr"/>
<attribute name="rad" tokenid="ooxml:CT_Glow_rad"/>
</resource>
<resource name="CT_SRgbColor" resource="Properties" tag="paragraph">
- <element name="tint" tokenid="ooxml:CT_SRgbColor_tint"/>
- <element name="shade" tokenid="ooxml:CT_SRgbColor_shade"/>
- <element name="alpha" tokenid="ooxml:CT_SRgbColor_alpha"/>
- <element name="hueMod" tokenid="ooxml:CT_SRgbColor_hueMod"/>
- <element name="sat" tokenid="ooxml:CT_SRgbColor_sat"/>
- <element name="satOff" tokenid="ooxml:CT_SRgbColor_satOff"/>
- <element name="satMod" tokenid="ooxml:CT_SRgbColor_satMod"/>
- <element name="lum" tokenid="ooxml:CT_SRgbColor_lum"/>
- <element name="lumOff" tokenid="ooxml:CT_SRgbColor_lumOff"/>
- <element name="lumMod" tokenid="ooxml:CT_SRgbColor_lumMod"/>
<attribute name="val" tokenid="ooxml:CT_SRgbColor_val"/>
</resource>
<resource name="CT_SchemeColor" resource="Properties" tag="paragraph">
- <element name="tint" tokenid="ooxml:CT_SchemeColor_tint"/>
- <element name="shade" tokenid="ooxml:CT_SchemeColor_shade"/>
- <element name="alpha" tokenid="ooxml:CT_SchemeColor_alpha"/>
- <element name="hueMod" tokenid="ooxml:CT_SchemeColor_hueMod"/>
- <element name="sat" tokenid="ooxml:CT_SchemeColor_sat"/>
- <element name="satOff" tokenid="ooxml:CT_SchemeColor_satOff"/>
- <element name="satMod" tokenid="ooxml:CT_SchemeColor_satMod"/>
- <element name="lum" tokenid="ooxml:CT_SchemeColor_lum"/>
- <element name="lumOff" tokenid="ooxml:CT_SchemeColor_lumOff"/>
- <element name="lumMod" tokenid="ooxml:CT_SchemeColor_lumMod"/>
<attribute name="val" tokenid="ooxml:CT_SchemeColor_val"/>
</resource>
<resource name="CT_PositiveFixedPercentage" resource="Properties" tag="paragraph">
commit d18eea41c01e1b0cc45ff4aed704d2b1cc0d8401
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Tue Feb 18 22:41:39 2014 +0100
writerfilter: forgot to add resource definitions for glow
Change-Id: I12562023152dd7e2e94713b2e0344b576b0437e2
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 7049b3e..889b691 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5318,55 +5318,151 @@
<namespace name="w14">
<start name="glow"/>
<grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+ <define name="ST_SchemeColorVal">
+ <choice>
+ <value>bg1</value>
+ <value>tx1</value>
+ <value>bg2</value>
+ <value>tx2</value>
+ <value>accent1</value>
+ <value>accent2</value>
+ <value>accent3</value>
+ <value>accent4</value>
+ <value>accent5</value>
+ <value>accent6</value>
+ </choice>
+ </define>
+
<define name="CT_Glow">
- <element name="srgbClr">
- <ref name="CT_SRgbColor"/>
- </element>
- <element name="schemeClr">
- <ref name="CT_SchemeColor"/>
- </element>
- <attribute name="rad">
- <ref name="ST_PositiveCoordinate"/>
- </attribute>
+ <optional>
+ <element name="srgbClr">
+ <ref name="CT_SRgbColor"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="schemeClr">
+ <ref name="CT_SchemeColor"/>
+ </element>
+ </optional>
+ <optional>
+ <attribute name="rad">
+ <ref name="ST_PositiveCoordinate"/>
+ </attribute>
+ </optional>
</define>
<define name="CT_SRgbColor">
- <element name="tint">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- <element name="shade">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- <element name="alpha">
- <ref name="CT_PositiveFixedPercentage"/>
- </element>
- <element name="hueMod">
- <ref name="CT_PositivePercentage"/>
- </element>
- <element name="sat">
- <ref name="CT_Percentage"/>
- </element>
- <element name="satOff">
- <ref name="CT_Percentage"/>
- </element>
- <element name="satMod">
- <ref name="CT_Percentage"/>
- </element>
- <element name="lum">
- <ref name="CT_Percentage"/>
- </element>
- <element name="lumOff">
- <ref name="CT_Percentage"/>
- </element>
- <element name="lumMod">
- <ref name="CT_Percentage"/>
- </element>
-
+ <optional>
+ <element name="tint">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="shade">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="alpha">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="hueMod">
+ <ref name="CT_PositivePercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="sat">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="satOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="satMod">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lum">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lumOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lumMod">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
<attribute name="val">
<ref name="ST_HexColorRGB"/>
</attribute>
</define>
+ <define name="CT_SchemeColor">
+ <optional>
+ <element name="tint">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="shade">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="alpha">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="hueMod">
+ <ref name="CT_PositivePercentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="sat">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="satOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="satMod">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lum">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lumOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="lumMod">
+ <ref name="CT_Percentage"/>
+ </element>
+ </optional>
+ <attribute name="val">
+ <ref name="ST_SchemeColorVal"/>
+ </attribute>
+ </define>
+
<define name="CT_PositiveFixedPercentage">
<attribute name="val">
<ref name="ST_PositiveFixedPercentage"/>
@@ -5388,8 +5484,63 @@
<ref name="CT_Glow"/>
</element>
</define>
-
</grammar>
+
+ <resource name="ST_SchemeColorVal" resource="List" generated="yes">
+ <value name="bg1" tokenid="ooxml:ST_SchemeColorVal_bg1">bg1</value>
+ <value name="tx1" tokenid="ooxml:ST_SchemeColorVal_tx1">tx1</value>
+ <value name="bg2" tokenid="ooxml:ST_SchemeColorVal_bg2">bg2</value>
+ <value name="tx2" tokenid="ooxml:ST_SchemeColorVal">tx2</value>
+ <value name="accent1" tokenid="ooxml:ST_SchemeColorVal_accent1">accent1</value>
+ <value name="accent2" tokenid="ooxml:ST_SchemeColorVal_accent2">accent2</value>
+ <value name="accent3" tokenid="ooxml:ST_SchemeColorVal_accent3">accent3</value>
+ <value name="accent4" tokenid="ooxml:ST_SchemeColorVal_accent4">accent4</value>
+ <value name="accent5" tokenid="ooxml:ST_SchemeColorVal_accent5">accent5</value>
+ <value name="accent6" tokenid="ooxml:ST_SchemeColorVal_accent6">accent6</value>
+ </resource>
+ <resource name="CT_Glow" resource="Properties" tag="paragraph">
+ <element name="srgbClr" tokenid="ooxml:CT_Glow_srgbClr"/>
+ <element name="schemeClr" tokenid="ooxml:CT_Glow_schemeClr"/>
+ <attribute name="rad" tokenid="ooxml:CT_Glow_rad"/>
+ </resource>
+ <resource name="CT_SRgbColor" resource="Properties" tag="paragraph">
+ <element name="tint" tokenid="ooxml:CT_SRgbColor_tint"/>
+ <element name="shade" tokenid="ooxml:CT_SRgbColor_shade"/>
+ <element name="alpha" tokenid="ooxml:CT_SRgbColor_alpha"/>
+ <element name="hueMod" tokenid="ooxml:CT_SRgbColor_hueMod"/>
+ <element name="sat" tokenid="ooxml:CT_SRgbColor_sat"/>
+ <element name="satOff" tokenid="ooxml:CT_SRgbColor_satOff"/>
+ <element name="satMod" tokenid="ooxml:CT_SRgbColor_satMod"/>
+ <element name="lum" tokenid="ooxml:CT_SRgbColor_lum"/>
+ <element name="lumOff" tokenid="ooxml:CT_SRgbColor_lumOff"/>
+ <element name="lumMod" tokenid="ooxml:CT_SRgbColor_lumMod"/>
+ <attribute name="val" tokenid="ooxml:CT_SRgbColor_val"/>
+ </resource>
+ <resource name="CT_SchemeColor" resource="Properties" tag="paragraph">
+ <element name="tint" tokenid="ooxml:CT_SchemeColor_tint"/>
+ <element name="shade" tokenid="ooxml:CT_SchemeColor_shade"/>
+ <element name="alpha" tokenid="ooxml:CT_SchemeColor_alpha"/>
+ <element name="hueMod" tokenid="ooxml:CT_SchemeColor_hueMod"/>
+ <element name="sat" tokenid="ooxml:CT_SchemeColor_sat"/>
+ <element name="satOff" tokenid="ooxml:CT_SchemeColor_satOff"/>
+ <element name="satMod" tokenid="ooxml:CT_SchemeColor_satMod"/>
+ <element name="lum" tokenid="ooxml:CT_SchemeColor_lum"/>
+ <element name="lumOff" tokenid="ooxml:CT_SchemeColor_lumOff"/>
+ <element name="lumMod" tokenid="ooxml:CT_SchemeColor_lumMod"/>
+ <attribute name="val" tokenid="ooxml:CT_SchemeColor_val"/>
+ </resource>
+ <resource name="CT_PositiveFixedPercentage" resource="Properties" tag="paragraph">
+ <attribute name="val" tokenid="ooxml:CT_PositiveFixedPercentage_val"/>
+ </resource>
+ <resource name="CT_PositivePercentage" resource="Properties" tag="paragraph">
+ <attribute name="val" tokenid="ooxml:CT_PositivePercentage_val"/>
+ </resource>
+ <resource name="CT_Percentage" resource="Properties" tag="paragraph">
+ <attribute name="val" tokenid="ooxml:CT_Percentage_val"/>
+ </resource>
+ <resource name="glow" resource="Properties" tag="paragraph">
+ <element name="glow" tokenid="ooxml:glow_glow"/>
+ </resource>
</namespace>
<namespace name="dml-shapeGeometry" file="dml-shapeGeometry.rng" todo="ignore">
<grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
commit 18b2074e52e66e8b460b7bea7acafadf58ecf2ac
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Tue Feb 18 13:37:21 2014 +0100
writerfilter: added w14 grammar with glow element
Change-Id: I540ff861ab492a1ad4c2a9d139834a9e36ca54bc
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index 0824258..b3ecff3 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -40,6 +40,7 @@ writerfilter_OOXMLNAMESPACES= \
vml-wordprocessingDrawing \
mce \
wp14 \
+ w14 \
wml
writerfilter_ALL = \
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index c9db259..7049b3e 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5315,6 +5315,82 @@
<element name="sizeRelV" tokenid="ooxml:sizeRelV_sizeRelV"/>
</resource>
</namespace>
+ <namespace name="w14">
+ <start name="glow"/>
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+ <define name="CT_Glow">
+ <element name="srgbClr">
+ <ref name="CT_SRgbColor"/>
+ </element>
+ <element name="schemeClr">
+ <ref name="CT_SchemeColor"/>
+ </element>
+ <attribute name="rad">
+ <ref name="ST_PositiveCoordinate"/>
+ </attribute>
+ </define>
+
+ <define name="CT_SRgbColor">
+ <element name="tint">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ <element name="shade">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ <element name="alpha">
+ <ref name="CT_PositiveFixedPercentage"/>
+ </element>
+ <element name="hueMod">
+ <ref name="CT_PositivePercentage"/>
+ </element>
+ <element name="sat">
+ <ref name="CT_Percentage"/>
+ </element>
+ <element name="satOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ <element name="satMod">
+ <ref name="CT_Percentage"/>
+ </element>
+ <element name="lum">
+ <ref name="CT_Percentage"/>
+ </element>
+ <element name="lumOff">
+ <ref name="CT_Percentage"/>
+ </element>
+ <element name="lumMod">
+ <ref name="CT_Percentage"/>
+ </element>
+
+ <attribute name="val">
+ <ref name="ST_HexColorRGB"/>
+ </attribute>
+ </define>
+
+ <define name="CT_PositiveFixedPercentage">
+ <attribute name="val">
+ <ref name="ST_PositiveFixedPercentage"/>
+ </attribute>
+ </define>
+ <define name="CT_PositivePercentage">
+ <attribute name="val">
+ <ref name="ST_PositivePercentage"/>
+ </attribute>
+ </define>
+ <define name="CT_Percentage">
+ <attribute name="val">
+ <ref name="ST_Percentage"/>
+ </attribute>
+ </define>
+
+ <define name="glow">
+ <element name="glow">
+ <ref name="CT_Glow"/>
+ </element>
+ </define>
+
+ </grammar>
+ </namespace>
<namespace name="dml-shapeGeometry" file="dml-shapeGeometry.rng" todo="ignore">
<grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!-- ISO RELAX NG Schema -->
@@ -12705,7 +12781,7 @@
<start name="styles"/>
<start name="document"/>
<start name="glossaryDocument"/>
- <grammar xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" attributeFormDefault="qualified">
+ <grammar xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" attributeFormDefault="qualified">
<!-- ISO RELAX NG Schema -->
<include href="shared-customXmlSchemaProperties.rng"/>
<include href="shared-math.rng"/>
@@ -16947,6 +17023,11 @@
<ref name="CT_OnOff"/>
</element>
</optional>
+ <optional>
+ <element name="w14:glow">
+ <ref name="BUILT_IN_ANY_TYPE"/>
+ </element>
+ </optional>
</define>
<define name="EG_RPrContent">
<optional>
@@ -22873,7 +22954,7 @@
<attribute name="eastAsiaTheme" tokenid="ooxml:CT_Fonts_eastAsiaTheme"/>
<attribute name="cstheme" tokenid="ooxml:CT_Fonts_cstheme"/>
</resource>
- <resource name="EG_RPrBase" resource="Properties" tag="paragraph">
+ <resource name="EG_RPrBase" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" resource="Properties" tag="paragraph">
<kind name="paragraph"/>
<element name="rStyle" tokenid="ooxml:EG_RPrBase_rStyle"/>
<element name="rFonts" tokenid="ooxml:EG_RPrBase_rFonts"/>
@@ -22914,6 +22995,7 @@
<element name="eastAsianLayout" tokenid="ooxml:EG_RPrBase_eastAsianLayout"/>
<element name="specVanish" tokenid="sprm:CFspecVanish"/>
<element name="oMath" tokenid="ooxml:EG_RPrBase_oMath"/>
+ <element name="w14:glow" tokenid="ooxml:EG_RPrBase_w14_glow"/>
</resource>
<resource name="EG_RPrContent" resource="Properties" tag="character">
<element name="rPrChange" tokenid="ooxml:EG_RPrContent_rPrChange"/>
commit df273f69ee908c23980d4f27b973523ab6fb8f9e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Fri Feb 14 10:29:44 2014 +0100
Add w14 namespace to writerfilter
Change-Id: I2672ec0bd72f8c443634a0a5df59feb4dd1b679c
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 89c6bbc..c9db259 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -36,6 +36,7 @@
<namespace-alias name="http://schemas.openxmlformats.org/schemaLibrary/2006/main" alias="schemaLibrary" id="schema"/>
<namespace-alias name="http://schemas.openxmlformats.org/markup-compatibility/2006" alias="mce" id="mce"/>
<namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" alias="wp14" id="wp14"/>
+ <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordml" alias="w14" id="w14"/>
<namespace-alias name="http://sprm" alias="sprm" id="sprm"/>
<token tokenid="ooxml:shape"/>
<token tokenid="ooxml:token"/>
commit d81936f96bbe692bd5aa955b1f82c97bec040d35
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Fri Feb 14 10:09:04 2014 +0100
Added word 2010 - w14 namespace and w14 elements
Change-Id: I8098cc4bd49c3480bd45875a541d8273b9c7f287
diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt
index 86ee410..6f0bee2 100644
--- a/oox/source/token/namespaces.txt
+++ b/oox/source/token/namespaces.txt
@@ -74,9 +74,9 @@ mceTest http://schemas.openxmlformats.org/spreadsheetml/2006/mai
wps http://schemas.microsoft.com/office/word/2010/wordprocessingShape
wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup
wp14 http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing
+w14 http://schemas.microsoft.com/office/word/2010/wordml
# extlst namespaces
# xlsExtLst for features introduced by excel 2010
xlsExtLst http://schemas.microsoft.com/office/spreadsheetml/2009/9/main
-
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index d8fbb54..6f62edd 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5114,6 +5114,7 @@ textFadeUp
textField
textFields
textFile
+textFill
textFit
textHAlign
textInflate
@@ -5571,6 +5572,7 @@ vstream
vt
w
w10
+w14
wAfter
wArH
wBefore
More information about the Libreoffice-commits
mailing list