[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx     |    3 ++-
 writerfilter/source/dmapper/NumberingManager.cxx |    3 ++-
 writerfilter/source/ooxml/model.xml              |    4 ++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 614b31615e69b527e669635245cf59faf9c9e2fc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Sep 5 18:21:05 2014 +0200

    Use NS_ooxml::LN_Value_ST_Jc_{right,end} constants
    
    Change-Id: Ifee3d97fb9a3037baeb838a676ff753006b7c861

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 07d87f5..37f1711 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3268,7 +3268,8 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::bo
         nAdjust = style::ParagraphAdjust_CENTER;
         aStringValue = "center";
         break;
-    case 2:
+    case NS_ooxml::LN_Value_ST_Jc_right:
+    case NS_ooxml::LN_Value_ST_Jc_end:
         nAdjust = static_cast< sal_Int16 > (bExchangeLeftRight ? style::ParagraphAdjust_LEFT : style::ParagraphAdjust_RIGHT);
         aStringValue = "right";
         break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 014af87..d8e28a6 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -1014,7 +1014,8 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
                 case 1:
                     nValue = text::HoriOrientation::CENTER;
                     break;
-                case 2:
+                case NS_ooxml::LN_Value_ST_Jc_right:
+                case NS_ooxml::LN_Value_ST_Jc_end:
                     nValue = text::HoriOrientation::RIGHT;
                     break;
                 }
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index b977f28..bedc01d 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17131,10 +17131,10 @@
     </resource>
     <resource name="ST_Jc" resource="List">
       <value tokenid="ooxml:Value_ST_Jc_left">left</value>
-      <value tokenid="2">right</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="2">end</value>
+      <value tokenid="ooxml:Value_ST_Jc_end">end</value>
       <value tokenid="3">both</value>
       <value tokenid="ooxml:Value_ST_Jc_mediumKashida">mediumKashida</value>
       <value tokenid="ooxml:Value_ST_Jc_distribute">distribute</value>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 66019b1..3e42a42 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3397,7 +3397,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
             nValue = 1; // center
             break;
         case 2:
-            nValue = 2; // right
+            nValue = NS_ooxml::LN_Value_ST_Jc_right;
             break;
         }
         pIntValue.reset(new RTFValue(nValue));