Re: joehe - r33304 - abiword/branches/gsoc2013tables/src/text/fmt/xp

Joe,

This revision is not right. fp_TableContainer::wantVBreakAt is called
at the beginning of fb_ColumnBreaker::_checkVBreakableContainer.
fp_TableContainer::VBreakAt is then called by function
fb_ColumnBreaker::_checkVBreakableContainer with the return value of
fp_TableContainer::wantVBreakAt after verifying that there is a need
to rebreak the table. fp_TableContainer::wantVBreakAt should not be
called by fp_TableContainer::VBreakAt.

With the new fp_TableContainer::VBreakAt function, there is no need to
modify the table boundary at the end of VBreakAt because it is
correctly taken care of in wantVBreakAt. Variable iTweak should just
not be there. You seem to have lazily copy/paste the code from Kousik
branch. Note that the VBreakAt function in Trunk has 111 lines while
it has 347 lines in your branch.

Simon


On Thu, Jul 25, 2013 at 11:09 AM,  <[email protected]> wrote:
>
> Author: joehe
> Date: 2013-07-25 17:09:01 +0200 (Thu, 25 Jul 2013)
> New Revision: 33304
>
> Modified:
>    abiword/branches/gsoc2013tables/src/text/fmt/xp/fp_TableContainer.cpp
>    abiword/branches/gsoc2013tables/src/text/fmt/xp/fp_TableContainer.h
> Log:
> 1. remove unneeded function: tweakBrokenTable
> 2. replace it with new function wantVBreakAt
>

> @@ -4365,7 +4281,7 @@
>                 // Now deal with issues from a container overlapping the top of the
>                 // of the new broken table.
>                 //
> -               UT_sint32 iTweak = tweakBrokenTable(pBroke);
> +               UT_sint32 iTweak = wantVBreakAt(iHeaderHeight);
>                 xxx_UT_DEBUGMSG(("BrakeTable: Tweak Result is %d !!!!!!!!!!!\n",iTweak));
>                 if(iTweak > 0)
>                 {
> @@ -4467,7 +4383,7 @@
>                 // Now deal with issues from a container overlapping the top of the
>                 // of the new broken table.
>                 //
> -               UT_sint32 iTweak = tweakBrokenTable(pBroke);
> +               UT_sint32 iTweak = wantVBreakAt(vpos);
>                 xxx_UT_DEBUGMSG(("BrakeTable: Tweak Result is %d !!!!!!!!!!!\n",iTweak));
>                 if(iTweak > 0)
>                 {
> @@ -4556,29 +4472,6 @@
>         return pBroke;
>  }
>