embeddedobj/source/msole/oleembed.cxx | 2 ++ embeddedobj/source/msole/olevisual.cxx | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit d32153d3217350b6646227d9239e3fd191e2b4c3 Author: Mike Kaganski <[email protected]> AuthorDate: Fri Jun 21 10:04:33 2024 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Jun 21 08:57:08 2024 +0200 Make sure to clear the guard around OleEmbeddedObject::changeState The method itself clears its own guard; the caller still holding the guard results in hangs seen in some Java code. See also commit e2bfc34d146806a8f96be0cd2323d716f12cba4e (Reimplement OleComponentNative_Impl to use IGlobalInterfaceTablem 2024-03-11). Change-Id: Ib22e71e7500ccceb946f7b1d6606f8f61ae2afe8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169315 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index a1e12ed5e3e8..835ef9cd4885 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -913,6 +913,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) m_bTriedConversion = true; if ( TryToConvertToOOo( m_xObjectStream ) ) { + aGuard.clear(); changeState( embed::EmbedStates::ACTIVE ); return; } @@ -944,6 +945,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) if ( TryToConvertToOOo( xStream ) ) { + aGuard.clear(); changeState( embed::EmbedStates::ACTIVE ); return; } diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 492541b00df2..83dc0903e0bb 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -355,9 +355,6 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres { try { - if ( m_nObjectState == embed::EmbedStates::LOADED ) - changeState( embed::EmbedStates::RUNNING ); - datatransfer::DataFlavor aDataFlavor( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", "Windows Metafile", @@ -366,6 +363,8 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres embed::VisualRepresentation aVisualRepr; { osl::ResettableMutexGuardScopedReleaser clearedMutex(aGuard); + if ( m_nObjectState == embed::EmbedStates::LOADED ) + changeState( embed::EmbedStates::RUNNING ); aVisualRepr.Data = m_pOleComponent->getTransferData(aDataFlavor); } aVisualRepr.Flavor = aDataFlavor;
