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

[László Németh]

 sw/source/core/objectpositioning/anchoredobjectposition.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 98ef16db0d228ebc0e7bad0290dcc9d3f1d6469b
Author: László Németh <laszlo.nem...@collabora.com>
Date:   Fri Nov 6 14:54:02 2015 +0100

    tdf#92648 fix DOCX import regression (textbox shrinking in footers)
    
    caused by the fix for tdf#91260
    
    (cherry picked from commit 16331514fd10d444bec89f892a106cbbba9e16c0)
    
    Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d
    Reviewed-on: https://gerrit.libreoffice.org/19877
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx 
b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index b4e63e3..ee354ce 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( 
const SwTwips nTopOfAnc
                 SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject());
                 SwFormatFrmSize aSize(pFormat->GetFrmSize());
                 SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - 
nAdjustedRelPosY);
-                aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 );
-                pFrameFormat->SetFormatAttr(aSize);
+                if (nShrinked >= 0) {
+                    aSize.SetHeight( nShrinked );
+                    pFrameFormat->SetFormatAttr(aSize);
+                }
                 nAdjustedRelPosY = nProposedRelPosY;
             } else if ( SwTextBoxHelper::findTextBox(pFormat) )
                 // when the shape has a textbox, use only the proposed 
vertical position

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits