writerfilter/source/dmapper/DomainMapper.cxx | 83 ----------------------
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 83 ++++++++++++++++++++++
2 files changed, 83 insertions(+), 83 deletions(-)
New commits:
commit 0b937ef63a7bf00de07ce4daf3e3091b5350396f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Sep 11 16:45:27 2014 +0200
Move DomainMapper_Impl::substream() to DomainMapper_Impl.cxx
Change-Id: Ic87ffe60def0346f28065d8c02e6022e237cee4d
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index a709a57..1586d1d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3141,89 +3141,6 @@ void DomainMapper::lcl_substream(Id rName,
::writerfilter::Reference<Stream>::Po
m_pImpl->substream(rName, ref);
}
-void DomainMapper_Impl::substream(Id rName,
- ::writerfilter::Reference<Stream>::Pointer_t const& ref)
-{
-#ifndef NDEBUG
- size_t contextSize(m_aContextStack.size());
- size_t propSize[NUMBER_OF_CONTEXTS];
- for (int i = 0; i < NUMBER_OF_CONTEXTS; ++i) {
- propSize[i] = m_aPropertyStacks[i].size();
- }
-#endif
-
- appendTableManager();
- // Appending a TableManager resets its TableHandler, so we need to append
- // that as well, or tables won't be imported properly in headers/footers.
- appendTableHandler();
- getTableManager().startLevel();
-
- //import of page header/footer
-
- switch( rName )
- {
- case NS_ooxml::LN_headerl:
-
- PushPageHeader(SectionPropertyMap::PAGE_LEFT);
- break;
- case NS_ooxml::LN_headerr:
-
- PushPageHeader(SectionPropertyMap::PAGE_RIGHT);
- break;
- case NS_ooxml::LN_headerf:
-
- PushPageHeader(SectionPropertyMap::PAGE_FIRST);
- break;
- case NS_ooxml::LN_footerl:
-
- PushPageFooter(SectionPropertyMap::PAGE_LEFT);
- break;
- case NS_ooxml::LN_footerr:
-
- PushPageFooter(SectionPropertyMap::PAGE_RIGHT);
- break;
- case NS_ooxml::LN_footerf:
-
- PushPageFooter(SectionPropertyMap::PAGE_FIRST);
- break;
- case NS_ooxml::LN_footnote:
- case NS_ooxml::LN_endnote:
- PushFootOrEndnote( NS_ooxml::LN_footnote == rName );
- break;
- case NS_ooxml::LN_annotation :
- PushAnnotation();
- break;
- }
- ref->resolve(m_rDMapper);
- switch( rName )
- {
- case NS_ooxml::LN_headerl:
- case NS_ooxml::LN_headerr:
- case NS_ooxml::LN_headerf:
- case NS_ooxml::LN_footerl:
- case NS_ooxml::LN_footerr:
- case NS_ooxml::LN_footerf:
- PopPageHeaderFooter();
- break;
- case NS_ooxml::LN_footnote:
- case NS_ooxml::LN_endnote:
- PopFootOrEndnote();
- break;
- case NS_ooxml::LN_annotation :
- PopAnnotation();
- break;
- }
-
- getTableManager().endLevel();
- popTableManager();
-
- // check that stacks are the same as before substream
- assert(m_aContextStack.size() == contextSize);
- for (int i = 0; i < NUMBER_OF_CONTEXTS; ++i) {
- assert(m_aPropertyStacks[i].size() == propSize[i]);
- }
-}
-
void DomainMapper::lcl_info(const std::string & /*info_*/)
{
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a7a3185..60a8932 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4924,6 +4924,89 @@ void
DomainMapper_Impl::appendGrabBag(std::vector<beans::PropertyValue>& rIntero
rInteropGrabBag.push_back(aProperty);
}
+void DomainMapper_Impl::substream(Id rName,
+ ::writerfilter::Reference<Stream>::Pointer_t const& ref)
+{
+#ifndef NDEBUG
+ size_t contextSize(m_aContextStack.size());
+ size_t propSize[NUMBER_OF_CONTEXTS];
+ for (int i = 0; i < NUMBER_OF_CONTEXTS; ++i) {
+ propSize[i] = m_aPropertyStacks[i].size();
+ }
+#endif
+
+ appendTableManager();
+ // Appending a TableManager resets its TableHandler, so we need to append
+ // that as well, or tables won't be imported properly in headers/footers.
+ appendTableHandler();
+ getTableManager().startLevel();
+
+ //import of page header/footer
+
+ switch( rName )
+ {
+ case NS_ooxml::LN_headerl:
+
+ PushPageHeader(SectionPropertyMap::PAGE_LEFT);
+ break;
+ case NS_ooxml::LN_headerr:
+
+ PushPageHeader(SectionPropertyMap::PAGE_RIGHT);
+ break;
+ case NS_ooxml::LN_headerf:
+
+ PushPageHeader(SectionPropertyMap::PAGE_FIRST);
+ break;
+ case NS_ooxml::LN_footerl:
+
+ PushPageFooter(SectionPropertyMap::PAGE_LEFT);
+ break;
+ case NS_ooxml::LN_footerr:
+
+ PushPageFooter(SectionPropertyMap::PAGE_RIGHT);
+ break;
+ case NS_ooxml::LN_footerf:
+
+ PushPageFooter(SectionPropertyMap::PAGE_FIRST);
+ break;
+ case NS_ooxml::LN_footnote:
+ case NS_ooxml::LN_endnote:
+ PushFootOrEndnote( NS_ooxml::LN_footnote == rName );
+ break;
+ case NS_ooxml::LN_annotation :
+ PushAnnotation();
+ break;
+ }
+ ref->resolve(m_rDMapper);
+ switch( rName )
+ {
+ case NS_ooxml::LN_headerl:
+ case NS_ooxml::LN_headerr:
+ case NS_ooxml::LN_headerf:
+ case NS_ooxml::LN_footerl:
+ case NS_ooxml::LN_footerr:
+ case NS_ooxml::LN_footerf:
+ PopPageHeaderFooter();
+ break;
+ case NS_ooxml::LN_footnote:
+ case NS_ooxml::LN_endnote:
+ PopFootOrEndnote();
+ break;
+ case NS_ooxml::LN_annotation :
+ PopAnnotation();
+ break;
+ }
+
+ getTableManager().endLevel();
+ popTableManager();
+
+ // check that stacks are the same as before substream
+ assert(m_aContextStack.size() == contextSize);
+ for (int i = 0; i < NUMBER_OF_CONTEXTS; ++i) {
+ assert(m_aPropertyStacks[i].size() == propSize[i]);
+ }
+}
+
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
