You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/07/11 16:13:25 UTC
svn commit: r1360181 -
/incubator/ooo/trunk/main/vcl/aqua/source/gdi/salvd.cxx
Author: hdu
Date: Wed Jul 11 14:13:24 2012
New Revision: 1360181
URL: http://svn.apache.org/viewvc?rev=1360181&view=rev
Log:
#i120273# workaround a crash on OSX when an VirtualDevice is reused that was created for a now dead window
regression was introduced by the changes for #i116758#
Patch-By: Herbert Duerr
Suggested-By: Herbert Duerr
Found-By: Herbert Duerr
Modified:
incubator/ooo/trunk/main/vcl/aqua/source/gdi/salvd.cxx
Modified: incubator/ooo/trunk/main/vcl/aqua/source/gdi/salvd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/aqua/source/gdi/salvd.cxx?rev=1360181&r1=1360180&r2=1360181&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/aqua/source/gdi/salvd.cxx (original)
+++ incubator/ooo/trunk/main/vcl/aqua/source/gdi/salvd.cxx Wed Jul 11 14:13:24 2012
@@ -188,10 +188,11 @@ sal_Bool AquaSalVirtualDevice::SetSize(
}
else
{
- // default to a NSView target context
+ // default to a NSView target context, any will do
AquaSalFrame* pSalFrame = mpGraphics->getGraphicsFrame();
- if( !pSalFrame && !GetSalData()->maFrames.empty() )
- pSalFrame = *GetSalData()->maFrames.begin();
+ if( !pSalFrame || !AquaSalFrame::isAlive( pSalFrame ))
+ if( !GetSalData()->maFrames.empty() )
+ pSalFrame = *GetSalData()->maFrames.begin();
if( pSalFrame )
{
// #i91990#