[Libreoffice-commits] .: sw/source

Miklos Vajna vmiklos at kemper.freedesktop.org
Mon Apr 2 07:05:06 PDT 2012


 sw/source/filter/ww8/ww8atr.cxx  |    2 +-
 sw/source/filter/ww8/ww8par6.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 36e176ee2354e62d5e4208fb0ae2a101ba32d7f5
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Apr 2 16:03:22 2012 +0200

    ww8: sprmPFContextualSpacing is a Bool8 value

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 7fcba60..16a5539 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3889,7 +3889,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL )
         if (m_rWW8Export.bWrtWW8 && rUL.GetContext())
         {
             m_rWW8Export.InsUInt16(NS_sprm::LN_PContextualSpacing);
-            m_rWW8Export.InsUInt16(rUL.GetContext());
+            m_rWW8Export.pO->push_back( (sal_uInt8)rUL.GetContext() );
         }
     }
 }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e995640..993020c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4177,7 +4177,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const sal_uInt8* pData, short nLe
         pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
         return;
     }
-    short nPara = SVBT16ToShort( pData );
+    short nPara = nId == 0x246D ? SVBT16ToShort( pData ) : 0 != *pData;
     if( nPara < 0 )
         nPara = -nPara;
 


More information about the Libreoffice-commits mailing list