commit 3919d87210ea12ed3166c649ac52730026db01a4
author Xisco Fauli <anistenis@gmail.com> Mon Jun 12 18:05:27 2017 +0200
committer Xisco Faulí <xiscofauli@libreoffice.org> Wed Jun 14 10:41:03 2017 +0200
tree 552866f9e5f369e404ec2b2a04a112ae55fc1c8f
parent e07492e14790262abc24d44c280bd71e5ebeddf4

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@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

sw/source/core/text/frmform.cxx

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 2d1480d..d35ef5b 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1081,7 +1081,13 @@

    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.