editeng/source/editeng/impedit3.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
New commits: commit 4f1f89591e1e6496394b204dec0ebc8ffa9424b1 Author: matteocam <matteo.campane...@gmail.com> Date: Fri Jun 27 23:28:33 2014 +0200 nDiff=0 and CheckAutoPageSize modified internally Change-Id: If383111e57f97987de3e8b58b31c716d81a04b65 diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 79af980..94a1b67 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -437,8 +437,8 @@ void ImpEditEngine::FormatDoc() sal_uInt32 nNewHeightNTP; sal_uInt32 nNewHeight = CalcTextHeight( &nNewHeightNTP ); // FIXME(matteocam) - //long nDiff = 0; - long nDiff = nNewHeight - nCurTextHeight; + long nDiff = 0; + //long nDiff = nNewHeight - nCurTextHeight; if ( nDiff ) aStatus.GetStatusWord() |= !IsVertical() ? EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED; if ( nNewHeight < nCurTextHeight ) @@ -456,9 +456,7 @@ void ImpEditEngine::FormatDoc() nCurTextHeight = nNewHeight; nCurTextHeightNTP = nNewHeightNTP; - // FIXME(matteocam) - //if ( aStatus.AutoPageSize() ) - if (false) + if ( aStatus.AutoPageSize() ) CheckAutoPageSize(); else if ( nDiff ) { @@ -520,7 +518,13 @@ bool ImpEditEngine::ImpCheckRefMapMode() void ImpEditEngine::CheckAutoPageSize() { + // FIXME(matteocam) + SetValidPaperSize( aPaperSize ); // consider Min, Max + return; + // END FIXME + Size aPrevPaperSize( GetPaperSize() ); + if ( GetStatus().AutoPageWidth() ) aPaperSize.Width() = !IsVertical() ? CalcTextWidth( true ) : GetTextHeight(); if ( GetStatus().AutoPageHeight() ) commit 7577a2d3fd4bb771b789d13267dc4c587da325a5 Author: matteocam <matteo.campane...@gmail.com> Date: Fri Jun 27 23:19:41 2014 +0200 Resumed nDiff only Change-Id: Ia841e76117737b00c4fe774685ee4567bc179781 diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 2494838..79af980 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -437,8 +437,8 @@ void ImpEditEngine::FormatDoc() sal_uInt32 nNewHeightNTP; sal_uInt32 nNewHeight = CalcTextHeight( &nNewHeightNTP ); // FIXME(matteocam) - long nDiff = 0; - //long nDiff = nNewHeight - nCurTextHeight; + //long nDiff = 0; + long nDiff = nNewHeight - nCurTextHeight; if ( nDiff ) aStatus.GetStatusWord() |= !IsVertical() ? EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED; if ( nNewHeight < nCurTextHeight ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits