diff options
| author | Stephan Schäfer <ssa@openoffice.org> | 2002-12-03 13:41:05 +0000 |
|---|---|---|
| committer | Stephan Schäfer <ssa@openoffice.org> | 2002-12-03 13:41:05 +0000 |
| commit | 89f49ce53a76ba067b03f16bb3a9dd9c1880958a (patch) | |
| tree | 4727b462d32426cbf4e3359fee687bd1ca22d1f6 /vcl | |
| parent | 9b9d4312b639864f1bfe53ee8aed212138ee58f9 (diff) | |
#105548# release and acquire solarmutex when calling SetWindowText
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 17496d3f02e1..a15f8103ed61 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.86 $ + * $Revision: 1.87 $ * - * last change: $Author: ssa $ $Date: 2002-11-27 17:16:23 $ + * last change: $Author: ssa $ $Date: 2002-12-03 14:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1117,11 +1117,18 @@ void SalFrame::SetTitle( const XubString& rTitle ) { DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ), "SalFrame::SetTitle(): WCHAR != sal_Unicode" ); + // #102847#, #102978# + // release solar mutex if we're calling the main thread + // same as for SetWindowPos + ULONG nCount = 0; + if ( GetSalData()->mnAppThreadId != GetCurrentThreadId() ) + nCount = Application::ReleaseSolarMutex(); if ( !SetWindowTextW( maFrameData.mhWnd, rTitle.GetBuffer() ) ) { ByteString aAnsiTitle = ImplSalGetWinAnsiString( rTitle ); SetWindowTextA( maFrameData.mhWnd, aAnsiTitle.GetBuffer() ); } + Application::AcquireSolarMutex( nCount ); } // ----------------------------------------------------------------------- |