diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-07-11 11:28:59 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2020-07-16 19:07:59 +0200 |
| commit | 5087a64842b3e4c96905cc8a9304ec0154ea0d11 (patch) | |
| tree | 5f26b7553709fdb2196c935a1c508e13ef0653d7 /writerfilter | |
| parent | fafc6c0fc3c6d62f982b0deb9bc1d874c51dd6fe (diff) | |
NFC tdf#116194 writerfilter: cleanup unused gridBefore pieces
These had mostly been been cleaned up in
commit b2c6d2d961a6113d0f111fab45ae12a40d389a23
but that was reverted.
Change-Id: Ia259c60ac3e2ca471defe2369c80e84b353bf894
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98691
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_ns.py | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py index a17335f12646..c36e0a896d32 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.py +++ b/writerfilter/source/ooxml/factoryimpl_ns.py @@ -439,7 +439,7 @@ def factoryChooseAction(actionNode): elif actionNode.getAttribute("action") in ("startRow", "endRow"): ret.append(" %sif (OOXMLFastContextHandlerTextTableRow* pTextTableRow = dynamic_cast<OOXMLFastContextHandlerTextTableRow*>(pHandler))" % extra_space) ret.append(" %s pTextTableRow->%s();" % (extra_space, actionNode.getAttribute("action"))) - elif actionNode.getAttribute("action") == "handleGridBefore" or actionNode.getAttribute("action") == "handleGridAfter": + elif actionNode.getAttribute("action") == "handleGridAfter": ret.append(" %sif (OOXMLFastContextHandlerTextTableRow* pTextTableRow = dynamic_cast<OOXMLFastContextHandlerTextTableRow*>(pHandler))" % extra_space) ret.append(" %s pTextTableRow->%s();" % (extra_space, actionNode.getAttribute("action"))) # tdf#111550 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 380fc3f01086..4ae5870386b6 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -14485,11 +14485,6 @@ </element> </choice> </define> - <define name="CT_TrPrBaseGridBefore"> - <attribute name="val"> - <ref name="ST_DecimalNumber"/> - </attribute> - </define> <define name="CT_TrPrBaseGridAfter"> <attribute name="val"> <ref name="ST_DecimalNumber"/> @@ -18430,9 +18425,6 @@ <element name="jc" tokenid="ooxml:CT_TrPrBase_jc"/> <element name="hidden" tokenid="ooxml:CT_TrPrBase_hidden"/> </resource> - <resource name="CT_TrPrBaseGridBefore" resource="TextTableRow"> - <attribute name="val" tokenid="ooxml:CT_TrPrBase_gridBefore"/> - </resource> <resource name="CT_TrPrBaseGridAfter" resource="TextTableRow"> <attribute name="val" tokenid="ooxml:CT_TrPrBase_gridAfter" action="handleGridAfter"/> </resource> |