diff options
authorMiklos Vajna <>2012-10-03 09:57:12 +0200
committerNorbert Thiebaud <>2012-10-03 08:49:49 +0000
commit414599ada2fa2288f98495000069b75fba39ed83 (patch)
parent6ee9fc56bfdf0a749dbabe03bd85ca2e471b4da2 (diff)
rhbz#861680 fix crash on tables in substreams
Background: the old RTF filter in 3.4 supported tables in substreams (headers, footers, etc), while 3.5.5 did not, so even if this is technically a new feature, it got backported to -3-5. As the bugreport states, this caused problems in the docx import. Instead of trying to find out where was the problem (it's already fixed in -3-6 and master, and I forgot how it happened), just disable this feature for DOCX, where this never worked, so doing so does not cause any regression. Change-Id: I39d486e3c69546519e232943f50675402b7bb595 Reviewed-by: Fridrich Strba <> Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <> Reviewed-by: Norbert Thiebaud <>
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index d533cad2ce90..fbb986a6f5dd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -554,7 +554,8 @@ public:
void appendTableHandler( )
- if (m_pTableHandler.get())
+ // For -3-5, support tables in substreams only for RTF
+ if (m_pTableHandler.get() && IsRTFImport())>setHandler(m_pTableHandler);