diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-08 09:17:01 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-08 09:17:22 +0200 |
| commit | 1f486806decc5e8edfe91cda5ef84414113c20b9 (patch) | |
| tree | a0e7ff312a3928a433b40a5104e86358589b30f5 /writerfilter | |
| parent | 86c4762790823c338f018fb2f06c4a5fa4497916 (diff) | |
Use constants for ST_CombineBrackets values
Change-Id: I307d7833fb5556c5509edd698b4b5ecd7b7a5fb3
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 | 23 |
3 files changed, 31 insertions, 12 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 515a1cd4865b..aa0b80effcaf 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3291,27 +3291,27 @@ OUString DomainMapper::getBracketStringFromEnum(const sal_Int32 nIntValue, const { switch(nIntValue) { - case 1: + case NS_ooxml::LN_Value_ST_CombineBrackets_round: if (bIsPrefix) return OUString( "(" ); return OUString( ")" ); - case 2: + case NS_ooxml::LN_Value_ST_CombineBrackets_square: if (bIsPrefix) return OUString( "[" ); return OUString( "]" ); - case 3: + case NS_ooxml::LN_Value_ST_CombineBrackets_angle: if (bIsPrefix) return OUString( "<" ); return OUString( ">" ); - case 4: + case NS_ooxml::LN_Value_ST_CombineBrackets_curly: if (bIsPrefix) return OUString( "{" ); return OUString( "}" ); - case 0: + case NS_ooxml::LN_Value_ST_CombineBrackets_none: default: return OUString(); } diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index b92777b8d036..58136fae8011 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -16993,11 +16993,11 @@ <attribute name="bidi" tokenid="ooxml:CT_Language_bidi"/> </resource> <resource name="ST_CombineBrackets" resource="List"> - <value tokenid="0">none</value> - <value tokenid="1">round</value> - <value tokenid="2">square</value> - <value tokenid="3">angle</value> - <value tokenid="4">curly</value> + <value tokenid="ooxml:Value_ST_CombineBrackets_none">none</value> + <value tokenid="ooxml:Value_ST_CombineBrackets_round">round</value> + <value tokenid="ooxml:Value_ST_CombineBrackets_square">square</value> + <value tokenid="ooxml:Value_ST_CombineBrackets_angle">angle</value> + <value tokenid="ooxml:Value_ST_CombineBrackets_curly">curly</value> </resource> <resource name="CT_EastAsianLayout" resource="Properties"> <attribute name="id" tokenid="ooxml:CT_EastAsianLayout_id"/> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3caef99f3e9b..df8ade0c5cd1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3831,8 +3831,27 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) { RTFValue::Pointer_t pValue(new RTFValue(int(true))); m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combine, pValue); - if (nParam > 0) - m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combineBrackets, pIntValue); + nId = 0; + switch (nParam) + { + case 0: + nId = NS_ooxml::LN_Value_ST_CombineBrackets_none; + break; + case 1: + nId = NS_ooxml::LN_Value_ST_CombineBrackets_round; + break; + case 2: + nId = NS_ooxml::LN_Value_ST_CombineBrackets_square; + break; + case 3: + nId = NS_ooxml::LN_Value_ST_CombineBrackets_angle; + break; + case 4: + nId = NS_ooxml::LN_Value_ST_CombineBrackets_curly; + break; + } + if (nId > 0) + m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combineBrackets, RTFValue::Pointer_t(new RTFValue(nId))); } break; case RTF_SL: |