sw/source/core/text/guess.cxx | 2 +-
sw/source/core/text/porlay.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a10dd637dc842e0b0221b8ec10965c8f130b4059
Author: himajin100000 <himajin100...@gmail.com>
AuthorDate: Thu Dec 6 16:42:04 2018 +0900
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Dec 7 08:22:27 2018 +0100
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: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index e966dfa6a9d7..76fb43c1eb9e 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -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(),
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 781c8aef5302..ef435fc6f133 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -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 ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
