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

[matteocam]

 editeng/source/editeng/impedit.hxx  |    1 +
 editeng/source/editeng/impedit3.cxx |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 32d7b1b4f452fbb27bf7722d5e54824d03938023
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 7 18:51:37 2014 +0200

    Check that overflowing para hasn't been updated yet. No reset.
    
    Change-Id: Id1346ff9f203978a08e6af80b408f30033bb88cb

diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index a1ddccc..533b47d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -466,6 +466,7 @@ private:
 
     // For Chaining
     sal_Int32 mnOverflowingPara = -1;
+    void SetOverflowingParaNum();
 
     IdleFormattter      aIdleFormatter;
 
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index a6a21ae..e810501 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -427,8 +427,12 @@ void ImpEditEngine::FormatDoc()
                 pParaPortion->SetMustRepaint( false );
 
                 // FIXME(matteocam)
-                // set possible point for chainging
-                mnOverflowingPara = nPara;
+                // set possible point for chaining
+
+                // XXX: This may not work all the time: imp. edit engine is a shared resource!!
+                        // Can it be that two boxes modify it before it's used?
+                UpdateOverflowingPara( nPara );
+
                 fprintf(stderr, "[CHAINING] Setting first overflowing para: %d\n", nPara);
             }
 
@@ -4602,4 +4606,12 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
     }
 }
 
+void ImpEditEngine::SetOverflowingParaNum(int nPara)
+{
+    // update if not already updated
+    if ( mnOverflowingPara == -1 )
+        mnOverflowingPara = nPara;
+    // XXX: where is this reset?
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */