[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

[Xisco Fauli]

 sw/source/core/text/frmform.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 63399341002c8a88ab58add99707fbef24210576
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Jun 12 18:05:27 2017 +0200

    tdf#104640, tdf#108469: Insert image where the cursor is
    
    Partially revert 72a4987434368bfb0b15f5ebb70a52
    Besides, add bDelta to the condition so the statement is false
    if the image is resized
    
    Change-Id: Ib07d328e040c38c63a30f6230ed9f6b605d76d9f
    Reviewed-on: https://gerrit.libreoffice.org/38705
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 3919d87210ea12ed3166c649ac52730026db01a4)
    Reviewed-on: https://gerrit.libreoffice.org/38771

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 2d1480d1e709..d35ef5bad1b1 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1081,7 +1081,13 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine,
 
     const SwTwips nDocPrtTop = Frame().Top() + Prt().Top();
     const SwTwips nOldHeight = Prt().SSize().Height();
-    const SwTwips nChg = rLine.CalcBottomLine() - nDocPrtTop - nOldHeight;
+    SwTwips nChg = rLine.CalcBottomLine() - nDocPrtTop - nOldHeight;
+
+    //#i84870# - no shrink of text frame, if it only contains one as-character anchored object.
+    if ( nChg < 0 && !bDelta && bOnlyContainsAsCharAnchoredObj )
+    {
+        nChg = 0;
+    }
 
     // Vertical Formatting:
     // The (rotated) repaint rectangle's x coordinate referes to the frame.