[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 37ff6848c22ea01a621468808263dfdfaac69e17
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 4 13:50:03 2015 +0200

    Use reference for ditLine ImplUpdateOverflowingLineNum
    
    Change-Id: If3926aab7a60ea201d5dd827cf6435642ce68e03

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 865081b..d49e699 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4652,7 +4652,8 @@ void ImpEditEngine::ImplUpdateOverflowingLineNum(sal_uInt32 nPaperHeight,
     // Like UpdateOverflowingParaNum but for each line in the first
     //  overflowing paragraph.
     for ( sal_Int32 nLine = 0; nLine < pPara->GetLines().Count(); nLine++ ) {
-        EditLine aLine = pPara->GetLines()[nLine];
+        // XXX: We must use a reference here because the copy constructor resets the height
+        EditLine &aLine = pPara->GetLines()[nLine];
         nLH = aLine.GetHeight();
         nY += nLH;
         if ( nY > nPaperHeight ) // found first line overflowing
commit 131e804e2f084ae6fc832ad7b4de591bba4b2867
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 4 13:19:43 2015 +0200

    Added assertion in ImplUpdateOverflowingLineNum
    
    Change-Id: I7d264d09246054a0586cdd7ffe5f588e2520b3ae

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ad458b6..865081b 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4070,6 +4070,7 @@ void ImpEditEngine::CallStatusHdl()
 
 void ImpEditEngine::CallChainingEventHdl()
 {
+    // XXX: We don't use this method any more at the moment.
     // only if it's the right ImpEditEngine (with right info on changes in text)
     if ( aChainingHdlLink.IsSet() /* && aStatus.GetStatusWord() */)
     {
@@ -4662,7 +4663,7 @@ void ImpEditEngine::ImplUpdateOverflowingLineNum(sal_uInt32 nPaperHeight,
         }
     }
 
-
+    assert(0); // You should never get here
 
 }