Kaydet (Commit) e757bccf authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Björn Michaelsen

simplify after expand

Change-Id: Ibcb863b32e5dfb6a2cba9db418c8e8d489e9577f
Reviewed-on: https://gerrit.libreoffice.org/13003Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst 2d782886
...@@ -3419,16 +3419,14 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen, ...@@ -3419,16 +3419,14 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
if( pHt->DontExpand() ? nBegin >= *pEndIdx : nBegin > *pEndIdx) if( pHt->DontExpand() ? nBegin >= *pEndIdx : nBegin > *pEndIdx)
continue; continue;
} }
{ const SfxPoolItem* pItem = CharFmt::GetItem( *pHt, nWhichId );
const SfxPoolItem* pItem = CharFmt::GetItem( *pHt, nWhichId ); const sal_uInt16 nLng = ((SvxLanguageItem*)pItem)->GetLanguage();
const sal_uInt16 nLng = ((SvxLanguageItem*)pItem)->GetLanguage();
// Umfasst das Attribut den Bereich komplett?
// Umfasst das Attribut den Bereich komplett? if( nAttrStart <= nBegin && nEnd <= *pEndIdx )
if( nAttrStart <= nBegin && nEnd <= *pEndIdx ) nRet = nLng;
nRet = nLng; else if( LANGUAGE_DONTKNOW == nRet )
else if( LANGUAGE_DONTKNOW == nRet ) nRet = nLng; // partielle Ueberlappung, der 1. gewinnt
nRet = nLng; // partielle Ueberlappung, der 1. gewinnt
}
} }
} }
} }
......
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