diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-12-21 01:33:49 +0000 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-12-21 01:33:49 +0000 |
| commit | 32b1b00c4e94445610585e9c5b2ca74ec36c3173 (patch) | |
| tree | 43c767a22390b192968172196762a1188a823989 /writerfilter | |
| parent | 4c6904c4e491d4211d06f65b759433c59fe0de6b (diff) | |
tdf#96218: MSO DOCX image incorrectly placed when using Alignment Position
layoutInCell attribute should be ignored when we are not
in a table.
Reviewed-on: https://gerrit.libreoffice.org/32253
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 36750bc977b3210b23b7822abd395b30a78af6f5)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: Ieed29c690f8516f63d0956a4f0495500908a0d27
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.hxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index ab8948fdc0b4..7f2d246cd3aa 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3624,6 +3624,11 @@ bool DomainMapper::IsInHeaderFooter() const return m_pImpl->IsInHeaderFooter(); } +bool DomainMapper::IsInTable() const +{ + return m_pImpl->hasTableManager() && m_pImpl->getTableManager().isInCell(); +} + bool DomainMapper::IsStyleSheetImport() const { return m_pImpl->IsStyleSheetImport(); diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 305ec874f20b..99cbbdf9c6c1 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -114,6 +114,7 @@ public: css::uno::Reference<css::drawing::XShape> PopPendingShape(); bool IsInHeaderFooter() const; + bool IsInTable() const; bool IsStyleSheetImport() const; /** @see DomainMapper_Impl::processDeferredCharacterProperties() diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 947bd725ebe4..944ce4f40d84 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1276,7 +1276,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b } xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND ), uno::makeAny(m_pImpl->nWrap)); - if( m_pImpl->bLayoutInCell && m_pImpl->nWrap != text::WrapTextMode_THROUGHT ) + if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell && m_pImpl->nWrap != text::WrapTextMode_THROUGHT ) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_FOLLOW_TEXT_FLOW ), uno::makeAny(true)); |