[Libreoffice-commits] core.git: sw/source

[Justin Luth]

 sw/source/filter/ww8/wrtw8esh.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 49909dca5856aada5340d44f03a271d38e038039
Author: Justin Luth <justin_luth at sil.org>
Date:   Mon Oct 31 07:52:14 2016 +0300

    fix logic error - still set zero padding if no border set
    
    caused by commit 52b29c60801cf75364fd8275a22e812797cb184d
    
    originally, if there were no visible lines (bFirstLine), then any
    line distance was reset to zero, but with AllowPaddingWithoutBorders
    that should not be done.
    
    However, the case were there is no boxItem at all was missed - padding
    should still be initialized to zero in that case.
    
    Change-Id: I0a95ee1de6781089196a1ba40d2c0365d15926e2
    Reviewed-on: https://gerrit.libreoffice.org/30412
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index b0fc04a..58f0322 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2043,6 +2043,14 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrameFormat& rFormat,
                 // MM If there is no line the distance should be set to 0
                 rPropOpt.AddOpt( aExhperProp[ n ], DrawModelToEmu(0));
     }
+    else
+    {
+        rPropOpt.AddOpt( ESCHER_Prop_dyTextTop, 0 );
+        rPropOpt.AddOpt( ESCHER_Prop_dyTextBottom, 0 );
+        rPropOpt.AddOpt( ESCHER_Prop_dxTextLeft, 0 );
+        rPropOpt.AddOpt( ESCHER_Prop_dxTextRight, 0 );
+    }
+
     if( bFirstLine )                // no valid line found
     {
         rPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x80000 );