From da0c3b50c79697dd595b00922ede004b9f2960f4 Mon Sep 17 00:00:00 2001
From: László Németh <laszlo.nemeth@collabora.com>
Date: Mon, 4 May 2015 14:48:48 +0200
Subject: tdf#91077 don't import shapes from discarded DOCX header/footer

Change-Id: I674eadb84fc870031244a61f5c07d2cdf18a8dd1
---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'writerfilter')

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
             {
-- 
cgit