incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1360562 - in /incubator/ooo/branches/AOO34: ./ ext_libraries/ main/ main/framework/ main/vcl/aqua/source/gdi/salvd.cxx
Date Thu, 12 Jul 2012 07:42:43 GMT
Author: hdu
Date: Thu Jul 12 07:42:42 2012
New Revision: 1360562

URL: http://svn.apache.org/viewvc?rev=1360562&view=rev
Log:
#i120273# workaround a crash on OSX when a VirtualDevice is reused that was created for a
now dead window

and cache the updated frame reference in the AquaSalGraphics

The regression was introduced by the changes for #i116758#

Patches-By: Herbert Duerr
Suggested-By: Herbert Duerr
Found-By: Herbert Duerr

Merged from https://svn.apache.org/repos/asf/incubator/ooo/trunk r1360181 and r1360216

Modified:
    incubator/ooo/branches/AOO34/   (props changed)
    incubator/ooo/branches/AOO34/ext_libraries/   (props changed)
    incubator/ooo/branches/AOO34/main/   (props changed)
    incubator/ooo/branches/AOO34/main/framework/   (props changed)
    incubator/ooo/branches/AOO34/main/vcl/aqua/source/gdi/salvd.cxx

Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1350553,1351653,1356318,1360181,1360216

Propchange: incubator/ooo/branches/AOO34/ext_libraries/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/ext_libraries:r1350553,1351653,1356318,1360181,1360216

Propchange: incubator/ooo/branches/AOO34/main/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/main:r1350553,1356318,1360181,1360216

Propchange: incubator/ooo/branches/AOO34/main/framework/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/main/framework:r1360181,1360216

Modified: incubator/ooo/branches/AOO34/main/vcl/aqua/source/gdi/salvd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/vcl/aqua/source/gdi/salvd.cxx?rev=1360562&r1=1360561&r2=1360562&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/vcl/aqua/source/gdi/salvd.cxx (original)
+++ incubator/ooo/branches/AOO34/main/vcl/aqua/source/gdi/salvd.cxx Thu Jul 12 07:42:42 2012
@@ -188,10 +188,18 @@ sal_Bool AquaSalVirtualDevice::SetSize( 
 	}
 	else
 	{
-		// default to a NSView target context
+        // default to a NSView target context
         AquaSalFrame* pSalFrame = mpGraphics->getGraphicsFrame();
-        if( !pSalFrame && !GetSalData()->maFrames.empty() )
-            pSalFrame = *GetSalData()->maFrames.begin();
+        if( !pSalFrame || !AquaSalFrame::isAlive( pSalFrame ))
+        {
+            if( !GetSalData()->maFrames.empty() )
+            {
+                // get the first matching frame
+                pSalFrame = *GetSalData()->maFrames.begin();
+                // update the frame reference
+                mpGraphics->setGraphicsFrame( pSalFrame );
+            }
+        }
         if( pSalFrame )
         {
             // #i91990#



Mime
View raw message