diff options
| author | Bakos Attila <bakos.attilakaroly@nisz.hu> | 2020-01-16 13:45:47 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-01-17 12:51:52 +0100 |
| commit | 14ad64270e4fbca3c24da6f55f260b1fb229556a (patch) | |
| tree | dd783e9a7c290cd0bcc437ab33c265c63ef547c5 /writerfilter/source/dmapper/GraphicImport.cxx | |
| parent | f7e071a00542c414a7e9d7bcf4434d908f225e59 (diff) | |
tdf#129888 DOCX shape import: handle o:allowincell
(VML) and layoutInCell (DrawingML) attributes to fix
regressions caused by commit 10f29d8bf05d44ca8bc11d34d1294ec17f8ac0f1
(tdf#87569 tdf#109411 DOCX import: fix shape anchor in tables).
Position of shapes anchored to tables is calculated from
the cell margin only if the previous attributes allow that.
Change-Id: Ifcfcb7f4959aea522dd45dff00cefd1bb9f4edda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86922
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter/source/dmapper/GraphicImport.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 6c2b7ba81511..b730d5eff1bd 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -875,7 +875,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) //tdf#109411 If anchored object is in table, Word calculates its position from cell border //instead of page (what is set in the sample document) - if (m_pImpl->rDomainMapper.IsInTable() && + if (m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell && m_pImpl->nHoriRelation == text::RelOrientation::PAGE_FRAME && IsGraphic()) { m_pImpl->nHoriRelation = text::RelOrientation::FRAME; |