diff options
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index e8f381ed9b0e..c98432a0b05e 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -246,7 +246,6 @@ DomainMapper_Impl::DomainMapper_Impl( m_vTextFramesForChaining(), m_bParaHadField(false), m_bParaAutoBefore(false) - { m_aBaseUrl = rMediaDesc.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_DOCUMENTBASEURL(), OUString()); @@ -1655,6 +1654,7 @@ void DomainMapper_Impl::PopPageHeaderFooter() //header and footer always have an empty paragraph at the end //this has to be removed RemoveLastParagraph( ); + if (!m_aTextAppendStack.empty()) { if (!m_bDiscardHeaderFooter) @@ -5434,6 +5434,7 @@ void DomainMapper_Impl::substream(Id rName, propSize[i] = m_aPropertyStacks[i].size(); } #endif + // Save "has footnote" state, which is specific to a section in the body // text, so state from substreams is not relevant. bool bHasFtn = m_bHasFtn; @@ -5449,32 +5450,27 @@ void DomainMapper_Impl::substream(Id rName, getTableManager().startLevel(); //import of page header/footer + //Ensure that only one header/footer per section is pushed switch( rName ) { case NS_ooxml::LN_headerl: - - PushPageHeader(SectionPropertyMap::PAGE_LEFT); + PushPageHeader(SectionPropertyMap::PAGE_LEFT); break; case NS_ooxml::LN_headerr: - - PushPageHeader(SectionPropertyMap::PAGE_RIGHT); + PushPageHeader(SectionPropertyMap::PAGE_RIGHT); break; case NS_ooxml::LN_headerf: - - PushPageHeader(SectionPropertyMap::PAGE_FIRST); + PushPageHeader(SectionPropertyMap::PAGE_FIRST); break; case NS_ooxml::LN_footerl: - - PushPageFooter(SectionPropertyMap::PAGE_LEFT); + PushPageFooter(SectionPropertyMap::PAGE_LEFT); break; case NS_ooxml::LN_footerr: - - PushPageFooter(SectionPropertyMap::PAGE_RIGHT); + PushPageFooter(SectionPropertyMap::PAGE_RIGHT); break; case NS_ooxml::LN_footerf: - - PushPageFooter(SectionPropertyMap::PAGE_FIRST); + PushPageFooter(SectionPropertyMap::PAGE_FIRST); break; case NS_ooxml::LN_footnote: case NS_ooxml::LN_endnote: @@ -5485,6 +5481,7 @@ void DomainMapper_Impl::substream(Id rName, break; } ref->resolve(m_rDMapper); + switch( rName ) { case NS_ooxml::LN_headerl: @@ -5523,7 +5520,6 @@ void DomainMapper_Impl::substream(Id rName, assert(m_aPropertyStacks[i].size() == propSize[i]); } } - }} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |