writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit ee2645558a843cbaa658ed12effc543da7ac335c Author: Miklos Vajna <[email protected]> Date: Wed Oct 3 09:57:12 2012 +0200 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: I4e7aaac4695e25861af1eaebe5a83ba52fd0aa2e Reviewed-on: https://gerrit.libreoffice.org/755 Reviewed-by: Fridrich Strba <[email protected]> Tested-by: Fridrich Strba <[email protected]> diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index d533cad..fbb986a 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()) m_aTableManagers.top()->setHandler(m_pTableHandler); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
