[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - writerfilter/source

[Miklos Vajna (via logerrit)]

 writerfilter/source/dmapper/GraphicImport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cedcdfd42bffdcf956850d21eaa6097840585766
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Oct 15 21:44:42 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Oct 21 22:07:39 2019 +0200

    writerfilter: sync layout-in-cell vs wrap-though behavior with ww8 import
    
    I removed the same check in the WW8 import in commit
    d630f69d90f15bc652a62648b05ea515de78d16a (Related: tdf#124601 DOC
    import: improve fLayoutInCell handling, 2019-09-26). There is no reason
    the DOCX import shouldn't do the same, just for consistency.
    
    Change-Id: I9e56a3fcd0b13ba08e347fbc06b0960ac21b372c
    Reviewed-on: https://gerrit.libreoffice.org/80856
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    (cherry picked from commit e042a83843ed2573dbce9338058b3dc545dd6898)
    Reviewed-on: https://gerrit.libreoffice.org/81242
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 15f2ddb23643..a520cda4ddc4 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1321,7 +1321,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer
                 }
                 xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND ),
                     uno::makeAny(static_cast<sal_Int32>(m_pImpl->nWrap)));
-                if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell && m_pImpl->nWrap != text::WrapTextMode_THROUGH )
+                if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell )
                     xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_FOLLOW_TEXT_FLOW ),
                         uno::makeAny(true));
                 if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell )