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

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmlbrsh.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 65d727548740afae7175fb04a12f50e119514497
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 18 12:50:33 2018 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Oct 29 17:08:00 2018 +0100

    tdf#118820 untested speculative fix
    
    Change-Id: I50a65d56251f978785fa446515cb374167c604e8
    Reviewed-on: https://gerrit.libreoffice.org/60682
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index c9ed33c53dc7..aebefd159b8f 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -135,10 +135,14 @@ void SwXMLBrushItemImportContext::EndElement()
         m_xGraphic = GetImport().loadGraphicFromBase64(m_xBase64Stream);
         m_xBase64Stream = nullptr;
     }
+
     if (m_xGraphic.is())
     {
         Graphic aGraphic(m_xGraphic);
+        SvxGraphicPosition eOldGraphicPos = pItem->GetGraphicPos();
         pItem->SetGraphic(aGraphic);
+        if (GPOS_NONE == eOldGraphicPos && GPOS_NONE != pItem->GetGraphicPos())
+            pItem->SetGraphicPos(GPOS_TILED);
     }
 
     if (!(pItem->GetGraphic()))