diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-04 13:46:25 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-04 13:46:50 +0200 |
| commit | ef24a18e362c12bbf79f19396c4916e47b812391 (patch) | |
| tree | 4340e7adc9ac5cf206391b8b27b396151b732a1b /writerfilter | |
| parent | afcb935c935077d9a23a3b140374f8fece7cdf54 (diff) | |
Use constants for ST_TabTlc values
Change-Id: Idd277a770a42d33a9c92f41f0452039eba60b6ce
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 10 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index ea439c339a92..a6f76e7a8626 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3341,16 +3341,16 @@ sal_Unicode DomainMapper::getFillCharFromValue(const sal_Int32 nIntValue) { switch (nIntValue) { - case 1: // dot + case NS_ooxml::LN_Value_ST_TabTlc_dot: return sal_Unicode(0x002e); - case 2: // hyphen + case NS_ooxml::LN_Value_ST_TabTlc_hyphen: return sal_Unicode(0x002d); - case 3: // underscore - case 4: // heavy FIXME ??? + case NS_ooxml::LN_Value_ST_TabTlc_underscore: + case NS_ooxml::LN_Value_ST_TabTlc_heavy: // FIXME ??? return sal_Unicode(0x005f); case NS_ooxml::LN_Value_ST_TabTlc_middleDot: // middleDot return sal_Unicode(0x00b7); - case 0: // none + case NS_ooxml::LN_Value_ST_TabTlc_none: default: return sal_Unicode(0x0020); // blank space } diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index febe5b165285..aaddd5e5e4a7 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17078,11 +17078,11 @@ <value tokenid="ooxml:Value_ST_TabJc_num">num</value> </resource> <resource name="ST_TabTlc" resource="List"> - <value tokenid="0">none</value> - <value tokenid="1">dot</value> - <value tokenid="2">hyphen</value> - <value tokenid="3">underscore</value> - <value tokenid="4">heavy</value> + <value tokenid="ooxml:Value_ST_TabTlc_none">none</value> + <value tokenid="ooxml:Value_ST_TabTlc_dot">dot</value> + <value tokenid="ooxml:Value_ST_TabTlc_hyphen">hyphen</value> + <value tokenid="ooxml:Value_ST_TabTlc_underscore">underscore</value> + <value tokenid="ooxml:Value_ST_TabTlc_heavy">heavy</value> <value tokenid="ooxml:Value_ST_TabTlc_middleDot">middleDot</value> </resource> <resource name="CT_TabStop" resource="Properties"> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9a3e1afb0b77..4ba46b3baf88 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2538,22 +2538,22 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) switch (nKeyword) { case RTF_TLDOT: - nParam = 1; + nParam = NS_ooxml::LN_Value_ST_TabTlc_dot; break; case RTF_TLMDOT: nParam = NS_ooxml::LN_Value_ST_TabTlc_middleDot; break; case RTF_TLHYPH: - nParam = 2; + nParam = NS_ooxml::LN_Value_ST_TabTlc_hyphen; break; case RTF_TLUL: - nParam = 3; + nParam = NS_ooxml::LN_Value_ST_TabTlc_underscore; break; case RTF_TLTH: - nParam = 2; + nParam = NS_ooxml::LN_Value_ST_TabTlc_hyphen; break; // thick line is not supported by dmapper, this is just a hack case RTF_TLEQ: - nParam = 0; + nParam = NS_ooxml::LN_Value_ST_TabTlc_none; break; // equal sign isn't, either default: break; |