svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 27ca06cbca5a483695009089a1107dbf55b3b9f5 Author: Caolán McNamara <[email protected]> Date: Mon Jul 11 20:21:19 2016 +0100 Fix a SolarMutex assert take the document of https://bugs.documentfoundation.org/attachment.cgi?id=125819 select the text shape and use file->edit and the solarmutex assert happens inside SetTextToSelected_Impl so move the mutex up a little Change-Id: I972c4886a200a87ed10f49e36937defdbf5d9525 diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 77c7474..dfce497 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -1166,10 +1166,10 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css vcl::Window* pItemWin = pToolBox->GetItemWindow( i ); if ( pItemWin ) { + SolarMutexGuard aSolarMutexGuard; FindTextFieldControl* pFindTextFieldControl = dynamic_cast<FindTextFieldControl*>(pItemWin); if ( pFindTextFieldControl ) pFindTextFieldControl->SetTextToSelected_Impl(); - SolarMutexGuard aSolarMutexGuard; pItemWin->GrabFocus(); return; }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
