diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-29 09:35:54 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-29 09:36:31 +0200 |
| commit | a2a1b55c28d9da58c69fd389af8795f367a64505 (patch) | |
| tree | f83d8b79e21b88bb9664e0d63e03e35b2874e720 | |
| parent | 8730974f3da0ce385cac84b81b8ae3169001399c (diff) | |
Use constants for ST_TabJc values
Change-Id: Idfb554f2ee77e0315b3ed69c4fae8ad4e8e87b3f
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 14 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 14 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 |
3 files changed, 18 insertions, 16 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index fd8f25a0670c..a624e12f5e68 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3322,15 +3322,17 @@ com::sun::star::style::TabAlign DomainMapper::getTabAlignFromValue(const sal_Int { switch (nIntValue) { - case 0: - case 4: // bar not supported - case 5: // num not supported + case NS_ooxml::LN_Value_ST_TabJc_start: + case NS_ooxml::LN_Value_ST_TabJc_left: + case NS_ooxml::LN_Value_ST_TabJc_bar: // bar not supported + case NS_ooxml::LN_Value_ST_TabJc_num: // num not supported return com::sun::star::style::TabAlign_LEFT; - case 1: + case NS_ooxml::LN_Value_ST_TabJc_center: return com::sun::star::style::TabAlign_CENTER; - case 2: + case NS_ooxml::LN_Value_ST_TabJc_end: + case NS_ooxml::LN_Value_ST_TabJc_right: return com::sun::star::style::TabAlign_RIGHT; - case 3: + case NS_ooxml::LN_Value_ST_TabJc_decimal: return com::sun::star::style::TabAlign_DECIMAL; } return com::sun::star::style::TabAlign_LEFT; diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 56b345c11722..b5ec46cacb60 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17068,13 +17068,13 @@ </resource> <resource name="ST_TabJc" resource="List"> <value tokenid="ooxml:Value_ST_TabJc_clear">clear</value> - <value tokenid="0">start</value> - <value tokenid="0">left</value> - <value tokenid="1">center</value> - <value tokenid="2">end</value> - <value tokenid="2">right</value> - <value tokenid="3">decimal</value> - <value tokenid="4">bar</value> + <value tokenid="ooxml:Value_ST_TabJc_start">start</value> + <value tokenid="ooxml:Value_ST_TabJc_left">left</value> + <value tokenid="ooxml:Value_ST_TabJc_center">center</value> + <value tokenid="ooxml:Value_ST_TabJc_end">end</value> + <value tokenid="ooxml:Value_ST_TabJc_right">right</value> + <value tokenid="ooxml:Value_ST_TabJc_decimal">decimal</value> + <value tokenid="ooxml:Value_ST_TabJc_bar">bar</value> <value tokenid="ooxml:Value_ST_TabJc_num">num</value> </resource> <resource name="ST_TabTlc" resource="List"> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 1d1d48354bd8..d61344949f64 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2513,13 +2513,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) switch (nKeyword) { case RTF_TQR: - nParam = 2; + nParam = NS_ooxml::LN_Value_ST_TabJc_right; break; case RTF_TQC: - nParam = 1; + nParam = NS_ooxml::LN_Value_ST_TabJc_center; break; case RTF_TQDEC: - nParam = 3; + nParam = NS_ooxml::LN_Value_ST_TabJc_decimal; break; default: break; |