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

[matteocam]

 editeng/source/outliner/overflowingtxt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 024ebf6859ceadd9a259b9607bdf1063516b0a29
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Mon Jul 13 16:56:13 2015 -0400

    Fix juxtaposing special case in deep merge
    
    Change-Id: Ica2e7935a4328ba05381ff44a1e5a0292b2860ea

diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 7df78b0..31b3d64 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -79,7 +79,7 @@ OutlinerParaObject *impGetDeeplyMergedParaObject(Outliner *pOutl,
         pOutl->SetText(*pPObj1);
         return impGetJuxtaposedParaObject(
                 pOutl,
-                pOutl->CreateParaObject(0, nParaCount - 1),
+                pOutl->CreateParaObject(0, nParaCount1 - 1),
                 pPObj2);
     }