[Libreoffice-commits] core.git: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/doc/sfxbasemodel.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 110803068b75ffd895a9b1139aee2248d30f085b
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Feb 27 08:40:04 2019 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Feb 27 20:52:56 2019 +0100

    tdf#123728 Always print on main thread to avoid deadlocks
    
    Change-Id: Ia8c2600aee42c3063e18032d1e485ad417ec4639
    Reviewed-on: https://gerrit.libreoffice.org/68421
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index ebf5ff841a7e..7740b5c1a41a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1450,9 +1450,10 @@ void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& rOptio
     SfxModelGuard aGuard( *this );
 
     impl_getPrintHelper();
-    m_pData->m_xPrintable->print( rOptions );
-}
 
+    // tdf#123728 Always print on main thread to avoid deadlocks
+    vcl::solarthread::syncExecute([this, &rOptions]() { m_pData->m_xPrintable->print(rOptions); });
+}
 
 //  XStorable