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

[matteocam]

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

New commits:
commit 67955d33fff575224ee4895025108203cb3e00f7
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 12 19:01:03 2014 +0200

    Using CalcTextHeight for overflowing paragraphs
    
    Change-Id: I7ad162c8287c7d9b335758c261e4289fa41ef4bc

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 3472780..8751d05 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -549,7 +549,7 @@ void ImpEditEngine::CheckAutoPageSize()
     // setting overflow status
     sal_uInt32 nBoxHeight = 1783; // XXX: hard coded for testing
     //if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
-    if (CalcTextHeight() > nBoxHeight) // XXX: CalcTextHeight here??
+    if (CalcTextHeight(NULL) > nBoxHeight) // XXX: CalcTextHeight here??
     {
         // which paragraph is the first to cause higher size of the box?
         UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // XXX: currently only for horizontal text
commit e4ee3e2a6e177c3bd192eb967d34e4f6f136ff02
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 12 19:00:34 2014 +0200

    Using CalcTextHeight for overflowing paragraphs
    
    Change-Id: I807107fdcbc53fdf5aa71fecc2ea1089eddbe1d9

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 736e594..3472780 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -549,7 +549,7 @@ void ImpEditEngine::CheckAutoPageSize()
     // setting overflow status
     sal_uInt32 nBoxHeight = 1783; // XXX: hard coded for testing
     //if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) ) {
-    if (GetTextHeight() > nBoxHeight) // XXX: CalcTextHeight here??
+    if (CalcTextHeight() > nBoxHeight) // XXX: CalcTextHeight here??
     {
         // which paragraph is the first to cause higher size of the box?
         UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // XXX: currently only for horizontal text