Kaydet (Commit) 1f154e31 authored tarafından Michael Stahl's avatar Michael Stahl

sw: WW8: except refmark these attributes always have an end position

Change-Id: I33c51176b4497f1fcfe5a05d07741e8b74e7243b
üst ca6667f8
...@@ -1211,7 +1211,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) ...@@ -1211,7 +1211,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
if ( m_rExport.AttrOutput().StartURL( rINet->GetValue(), rINet->GetTargetFrame() ) ) if ( m_rExport.AttrOutput().StartURL( rINet->GetValue(), rINet->GetTargetFrame() ) )
++nRet; ++nRet;
} }
if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd ) pEnd = pHt->End();
if (nPos == *pEnd )
{ {
if (m_rExport.AttrOutput().EndURL(nPos == rNd.Len())) if (m_rExport.AttrOutput().EndURL(nPos == rNd.Len()))
--nRet; --nRet;
...@@ -1223,7 +1224,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) ...@@ -1223,7 +1224,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), true ); OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), true );
++nRet; ++nRet;
} }
if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd ) pEnd = pHt->End();
if (nullptr != pEnd && nPos == *pEnd)
{ {
OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), false ); OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), false );
--nRet; --nRet;
...@@ -1239,7 +1241,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) ...@@ -1239,7 +1241,8 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
m_rExport.AttrOutput().StartRuby( rNd, nPos, *static_cast< const SwFormatRuby* >( pItem ) ); m_rExport.AttrOutput().StartRuby( rNd, nPos, *static_cast< const SwFormatRuby* >( pItem ) );
++nRet; ++nRet;
} }
if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd ) pEnd = pHt->End();
if (nPos == *pEnd)
{ {
m_rExport.AttrOutput().EndRuby(); m_rExport.AttrOutput().EndRuby();
--nRet; --nRet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment