vcl/aqua/source/window/salframeview.mm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit e18603e6a723b2cfc5baa30c076423a89214acb4
Author: Herbert Dürr <h...@apache.org>
Date: Thu Mar 21 15:01:35 2013 +0000
protect SalFrameView's isOpaque() method by an isAlive() check
(cherry picked from commit feb1be19817d10e0ed1a18bada9c917f2a4532db)
Change-Id: I9e6ddcf04047bdc905f00b709db84459112122db
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index d477b85..d8ccd17 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -429,7 +429,13 @@ static AquaSalFrame* getMouseContainerFrame()
-(BOOL)isOpaque
{
- return mpFrame ? (mpFrame->getClipPath() != 0 ? NO : YES) : YES;
+ if( !mpFrame)
+ return YES;
+ if( !AquaSalFrame::isAlive( mpFrame))
+ return YES;
+ if( !mpFrame->getClipPath())
+ return YES;
+ return NO;
}
// helper class similar to a osl::SolarGuard for the SalYieldMutex
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
