diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-17 22:09:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-18 00:36:28 +0200 |
| commit | 1f154e31bf609dc32001a271fa13f9302f18a207 (patch) | |
| tree | ff0593a57f8fa6446b96256a60e9eec4e067461e /sw/source/filter/ww8/wrtw8nds.cxx | |
| parent | sw: dump ruby text in nodes dump (diff) | |
| download | core-1f154e31bf609dc32001a271fa13f9302f18a207.tar.gz core-1f154e31bf609dc32001a271fa13f9302f18a207.zip | |
sw: WW8: except refmark these attributes always have an end position
Change-Id: I33c51176b4497f1fcfe5a05d07741e8b74e7243b
Diffstat (limited to 'sw/source/filter/ww8/wrtw8nds.cxx')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 6d914368c440..03818f79aab1 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1211,7 +1211,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) if ( m_rExport.AttrOutput().StartURL( rINet->GetValue(), rINet->GetTargetFrame() ) ) ++nRet; } - if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd ) + pEnd = pHt->End(); + if (nPos == *pEnd ) { if (m_rExport.AttrOutput().EndURL(nPos == rNd.Len())) --nRet; @@ -1223,7 +1224,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), true ); ++nRet; } - if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd ) + pEnd = pHt->End(); + if (nullptr != pEnd && nPos == *pEnd) { OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), false ); --nRet; @@ -1239,7 +1241,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) m_rExport.AttrOutput().StartRuby( rNd, nPos, *static_cast< const SwFormatRuby* >( pItem ) ); ++nRet; } - if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd ) + pEnd = pHt->End(); + if (nPos == *pEnd) { m_rExport.AttrOutput().EndRuby(); --nRet; |