[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - filter/source

[Eike Rathke]

 filter/source/xsltfilter/LibXSLTTransformer.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8558246af43c01bc437c4884e5ff144d714dc848
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Jan 31 21:44:00 2012 +0100

    don't delete thread while it is still running, fdo#45401
    
    Signed-off-by: Kohei Yoshida <kohei.yoshida at suse.com>
    (cherry picked from commit 3c9bf1c2f9ca970bc6d9c971c5a27a031aca884c)
    
    Signed-off-by: Peter Jentsch <pjotr at guineapics.de>
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 72c31c1..599b80c 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -485,6 +485,7 @@ namespace XSLT
     LibXSLTTransformer::terminate() throw (RuntimeException)
     {
         m_Reader->terminate();
+        m_Reader->join();
         delete(m_Reader);
         m_parameters.clear();
     }