[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source writerfilter/source

[Caolán McNamara]

 sw/source/core/unocore/unosett.cxx               |    2 +-
 writerfilter/source/dmapper/NumberingManager.cxx |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 696f11078c3bf236f5d455fded6463f85763a6e6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 6 14:49:31 2016 +0100

    if we throw in sw on HoriOrientation::NONE then don't pass it in from rtf
    
    Change-Id: Ie01cca9b7cc432fc1fe14bb600af5083d6ca6a0d
    Reviewed-on: https://gerrit.libreoffice.org/28688
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>

diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index cd84531..81fd65d 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1674,7 +1674,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
             {
                 case 0: //"Adjust"
                 {
-                    sal_Int16 nValue = 0;
+                    sal_Int16 nValue = text::HoriOrientation::NONE;
                     pProp->Value >>= nValue;
                     if(nValue > 0 &&
                         nValue <= text::HoriOrientation::LEFT &&
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 0cbd6db..aa4fc93 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -987,7 +987,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
             break;
             case NS_ooxml::LN_CT_Lvl_lvlJc:
             {
-                sal_Int16 nValue = 0;
+                sal_Int16 nValue = text::HoriOrientation::NONE;
                 switch (nIntValue)
                 {
                 case NS_ooxml::LN_Value_ST_Jc_left:
@@ -1002,9 +1002,12 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
                     nValue = text::HoriOrientation::RIGHT;
                     break;
                 }
-                m_pCurrentDefinition->GetCurrentLevel( )->Insert(
-                    PROP_ADJUST, uno::makeAny( nValue ) );
-                    writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
+                if (nValue != text::HoriOrientation::NONE)
+                {
+                    m_pCurrentDefinition->GetCurrentLevel( )->Insert(
+                        PROP_ADJUST, uno::makeAny( nValue ) );
+                        writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
+                }
             }
             break;
             case NS_ooxml::LN_CT_Lvl_pPr: