Kaydet (Commit) a10dd637 authored tarafından himajin100000's avatar himajin100000 Kaydeden (comit) Noel Grandin

adapt to the change from sal_Int32 to TextFrameIndex

see commit 2136dc24 and commit e721f958

Change-Id: I07ace74f93adc2568003314b5f05c41611d6f77c
Reviewed-on: https://gerrit.libreoffice.org/64671
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4723ea4b
......@@ -202,7 +202,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf,
nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, rInf.GetCachedVclData().get() );
#if OSL_DEBUG_LEVEL > 1
if ( COMPLETE_STRING != nCutPos )
if ( TextFrameIndex(COMPLETE_STRING) != nCutPos )
{
sal_uInt16 nMinSize;
rInf.GetTextSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
......
......@@ -1371,7 +1371,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode,
// Check that ScriptChangeInfos are in increasing order of
// position and that we don't have "empty" changes.
sal_uInt8 nLastTyp = i18n::ScriptType::WEAK;
sal_Int32 nLastPos = 0;
TextFrameIndex nLastPos = TextFrameIndex(0);
for (const auto& rScriptChange : m_ScriptChanges)
{
SAL_WARN_IF( nLastTyp == rScriptChange.type ||
......
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