Skip to content

C
core
Kaydet (Commit) da0c3b50 authored tarafından László Németh's avatar László Németh
Dosyalara gözat
Seçenekler

tdf#91077 don't import shapes from discarded DOCX header/footer 

Change-Id: I674eadb84fc870031244a61f5c07d2cdf18a8dd1
üst 10d55afd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Dosyayı görüntüle @ da0c3b50
...@@ -2032,7 +2032,8 @@ void DomainMapper_Impl::PopShapeContext() ...@@ -2032,7 +2032,8 @@ void DomainMapper_Impl::PopShapeContext()
} }
// Remove the shape if required (most likely replacement shape for OLE object) // 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 try
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment