diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-05 18:31:58 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-05 18:38:16 +0200 |
| commit | 0b4fba549ccf3ab92f2096d7b5e0961e5619158c (patch) | |
| tree | 89115f907f948d8247689fdf40bca2921a79166c | |
| parent | 614b31615e69b527e669635245cf59faf9c9e2fc (diff) | |
Use constants for the remaining ST_Jc values
Change-Id: I144b3d7d99fd5d5028e2a04c17bd81fec7182f09
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 4 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 37f1711b68c1..a709a573275f 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3264,7 +3264,7 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::bo OUString aStringValue = "left"; switch(nIntValue) { - case 1: + case NS_ooxml::LN_Value_ST_Jc_center: nAdjust = style::ParagraphAdjust_CENTER; aStringValue = "center"; break; @@ -3276,7 +3276,7 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::bo case 4: nLastLineAdjust = style::ParagraphAdjust_BLOCK; //no break; - case 3: + case NS_ooxml::LN_Value_ST_Jc_both: nAdjust = style::ParagraphAdjust_BLOCK; aStringValue = "both"; break; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index d8e28a6042c2..2bafbb6c00e9 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -1011,7 +1011,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_Value_ST_Jc_start: nValue = text::HoriOrientation::LEFT; break; - case 1: + case NS_ooxml::LN_Value_ST_Jc_center: nValue = text::HoriOrientation::CENTER; break; case NS_ooxml::LN_Value_ST_Jc_right: diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index bedc01d125f3..61bd8e4281b4 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17133,9 +17133,9 @@ <value tokenid="ooxml:Value_ST_Jc_left">left</value> <value tokenid="ooxml:Value_ST_Jc_right">right</value> <value tokenid="ooxml:Value_ST_Jc_start">start</value> - <value tokenid="1">center</value> + <value tokenid="ooxml:Value_ST_Jc_center">center</value> <value tokenid="ooxml:Value_ST_Jc_end">end</value> - <value tokenid="3">both</value> + <value tokenid="ooxml:Value_ST_Jc_both">both</value> <value tokenid="ooxml:Value_ST_Jc_mediumKashida">mediumKashida</value> <value tokenid="ooxml:Value_ST_Jc_distribute">distribute</value> <value tokenid="ooxml:Value_ST_Jc_numTab">numTab</value> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3e42a42cc50e..c16b59fc47ed 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2420,19 +2420,19 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) switch (nKeyword) { case RTF_QC: - nParam = 1; + nParam = NS_ooxml::LN_Value_ST_Jc_center; break; case RTF_QJ: - nParam = 3; + nParam = NS_ooxml::LN_Value_ST_Jc_both; break; case RTF_QL: nParam = NS_ooxml::LN_Value_ST_Jc_left; break; case RTF_QR: - nParam = 2; + nParam = NS_ooxml::LN_Value_ST_Jc_right; break; case RTF_QD: - nParam = 4; + nParam = NS_ooxml::LN_Value_ST_Jc_both; break; default: break; @@ -3394,7 +3394,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) nValue = NS_ooxml::LN_Value_ST_Jc_left; break; case 1: - nValue = 1; // center + nValue = NS_ooxml::LN_Value_ST_Jc_center; break; case 2: nValue = NS_ooxml::LN_Value_ST_Jc_right; |