summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-04-02 16:03:22 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-04-02 16:05:37 +0200
commit36e176ee2354e62d5e4208fb0ae2a101ba32d7f5 (patch)
tree287ee4ccc24e5c55268cf447497125a1fbdfa30d
parent791f27683311e487947b0464a0cb132b19fd0e12 (diff)
ww8: sprmPFContextualSpacing is a Bool8 value
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 7fcba6005983..16a5539c9358 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 e995640f9b2d..993020cd8e0f 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;