diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-05-04 14:48:48 +0200 |
|---|---|---|
| committer | László Németh <laszlo.nemeth@collabora.com> | 2015-05-04 14:59:22 +0200 |
| commit | da0c3b50c79697dd595b00922ede004b9f2960f4 (patch) | |
| tree | 2cebca23d098ab473d01bbec089790ec9afc1cc1 /writerfilter | |
| parent | 10d55afd403c3379ea418c61f2c7e9fb68aad580 (diff) | |
tdf#91077 don't import shapes from discarded DOCX header/footer
Change-Id: I674eadb84fc870031244a61f5c07d2cdf18a8dd1
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5188ca444b2e..337930b5dac5 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2032,7 +2032,8 @@ void DomainMapper_Impl::PopShapeContext() } // Remove the shape if required (most likely replacement shape for OLE object) - if ( m_aAnchoredStack.top().bToRemove ) + // or anchored to a discarded header or footer + if ( m_aAnchoredStack.top().bToRemove || m_bDiscardHeaderFooter ) { try { |