editeng/source/editeng/editeng.cxx | 2 +- editeng/source/editeng/impedit2.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit f504768a96601622f089dc6ee7620df1d014c6fb Author: Kohei Yoshida <[email protected]> Date: Wed Feb 5 14:34:00 2014 -0500 Get typed text inside cell (in Calc) to display again. This also fixes non-displayed text box contents in Draw / Impress. Change-Id: I49d022ea71df398a70d1dc65eeb122c9a6373b27 diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 9e6807f..ed8c54d 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1290,7 +1290,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie if ( pImpEditEngine->GetStatus().DoAutoComplete() && ( nCharCode != ' ' ) ) { // Only at end of word... - sal_uInt16 nIndex = aCurSel.Max().GetIndex(); + sal_Int32 nIndex = aCurSel.Max().GetIndex(); if ( ( nIndex >= aCurSel.Max().GetNode()->Len() ) || ( pImpEditEngine->aWordDelimiters.indexOf( aCurSel.Max().GetNode()->GetChar( nIndex ) ) != -1 ) ) { diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index d9884c6..eb1e366 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -3578,11 +3578,11 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion ) // Syndicate and more ... aRange.Max() = aRange.Min(); aRange.Max() += pPortion->GetFirstLineOffset(); - if ( nFirstInvalid > 0 ) // Only if the first line is invalid + if (nFirstInvalid >= 0) // Only if the first line is invalid aRange.Min() = aRange.Max(); sal_Int32 nLastInvalid = pPortion->GetLines().Count()-1; - if(nFirstInvalid > 0) + if (nFirstInvalid >= 0) { for ( nLine = nFirstInvalid; nLine < pPortion->GetLines().Count(); nLine++ ) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
