diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2010-01-05 17:11:23 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2010-01-05 17:11:23 +0000 |
| commit | f8a276a66211d0fe08e1c9ad5204d5fe0a0fc038 (patch) | |
| tree | 67cb36fd4adc0cfbd4fd47ea3168c90072da63fc /vcl/unx/source | |
| parent | 8765a3bf9f2926a50d0f644e4263782269abe023 (diff) | |
#i108068# always release solar mutex before calling into UNO
Diffstat (limited to 'vcl/unx/source')
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/source/plugadapt/salplug.cxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index cfd568ac9b6c..558ae3714358 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -2304,11 +2304,7 @@ long SalX11Display::Dispatch( XEvent *pEvent ) return 0; SalInstance* pInstance = GetSalData()->m_pInstance; - if( pInstance->GetEventCallback() ) - { - YieldMutexReleaser aReleaser; - pInstance->CallEventCallback( pEvent, sizeof( XEvent ) ); - } + pInstance->CallEventCallback( pEvent, sizeof( XEvent ) ); switch( pEvent->type ) { diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index f1c63b8abee7..08820b2cb7f9 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/source/plugadapt/salplug.cxx @@ -219,8 +219,10 @@ SalInstance *CreateSalInstance() if( !(pUsePlugin && *pUsePlugin) ) pInst = check_headless_plugin(); + else + pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) ); - if( ! pInst && !(pUsePlugin && *pUsePlugin) ) + if( ! pInst ) pInst = autodetect_plugin(); // fallback to gen |