diff options
| -rw-r--r-- | vcl/source/treelist/transfer.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx index 965d820e331e..8ff088d05366 100644 --- a/vcl/source/treelist/transfer.cxx +++ b/vcl/source/treelist/transfer.cxx @@ -1442,9 +1442,12 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& r { if( ( nRequestFormat == format.mnSotId ) && !rFlavor.MimeType.equalsIgnoreAsciiCase( format.MimeType ) ) { +// tdf#133365: only release solar mutex on Windows +#ifdef _WIN32 // Our own thread may handle the nested IDataObject::GetData call, // and try to acquire solar mutex SolarMutexReleaser r; +#endif // _WIN32 if (xTransfer2.is()) aRet = xTransfer2->getTransferData2(format, rDestDoc); @@ -1459,9 +1462,12 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& r if( !aRet.hasValue() ) { +// tdf#133365: only release solar mutex on Windows +#ifdef _WIN32 // Our own thread may handle the nested IDataObject::GetData call, // and try to acquire solar mutex SolarMutexReleaser r; +#endif // _WIN32 if (xTransfer2.is()) aRet = xTransfer2->getTransferData2(rFlavor, rDestDoc); |