summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-02-27 08:40:04 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-02-27 20:52:56 +0100
commit110803068b75ffd895a9b1139aee2248d30f085b (patch)
treea7389f1bf1a6c3c473541bab9cf45c86c53865cf /sfx2
parentcfb2e03a683a8d217b00b8abfd9c55bf61059462 (diff)
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@cib.de>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx5
1 files changed, 3 insertions, 2 deletions
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