[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/win

[Juergen Funk (via logerrit)]

 vcl/win/gdi/salprn.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5df61843fa1c2360f794ab74e0ac94c12764faa7
Author:     Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Tue Aug 27 09:22:17 2019 +0200
Commit:     Juergen Funk (CIB) <juergen.funk_ml at cib.de>
CommitDate: Thu Aug 29 10:06:37 2019 +0200

    tdf#127192 Printing in main thread
    
    trac29045
    
    the wollmux has change the dialogs form swing to the LO-Dialogs,
    and when printig with MS-PDF then LO hang on this line.
    The reason is wollmux run in it own thread, but this thread has
    no win-message-pump, when the printer-driver would open the
    FileSave-Dialog then it hangs, because the message-pump
    is missing in this thread.
    
    The swing has made it own win-message-pump for this
    thread.
    
    Reviewed-on: https://gerrit.libreoffice.org/78170
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml at cib.de>
    Tested-by: Juergen Funk (CIB) <juergen.funk_ml at cib.de>
    (cherry picked from commit c16bfef0d51ad903defdb2bacb4550de481d3074)
    
    Change-Id: Ia5131464dcc5f166133a3302d29550e945dd1026
    Reviewed-on: https://gerrit.libreoffice.org/78248
    Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml at cib.de>
    Tested-by: Juergen Funk (CIB) <juergen.funk_ml at cib.de>

diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index ddf58fd7e969..aaf96785b0db 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -48,6 +48,8 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/processfactory.hxx>
 
+#include <vcl/threadex.hxx>
+
 #include <malloc.h>
 
 #include <winspool.h>
@@ -1497,8 +1499,8 @@ bool WinSalPrinter::StartJob( const OUString* pFileName,
     else
         aInfo.lpszOutput = nullptr;
 
-    // start Job
-    int nRet = lcl_StartDocW( hDC, &aInfo, this );
+    // start Job, in the main thread
+    int nRet = vcl::solarthread::syncExecute([hDC, this, &aInfo]() -> int { return lcl_StartDocW(hDC, &aInfo, this); });
 
     if ( nRet <= 0 )
     {