diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 22:07:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 22:07:05 +0000 |
| commit | d583a88451437251648ae7aa5de4779566cc427b (patch) | |
| tree | b1398ddab52397a089757fb9e19a374d2c627a3d /vcl | |
| parent | da4d070d9d2d563f6e1401496957b22b51c81ff9 (diff) | |
INTEGRATION: CWS aquavcl08 (1.18.4); FILE MERGED
2008/06/24 15:01:34 pl 1.18.4.3: #i86434# update resolution on screen change
2008/06/19 09:48:34 pl 1.18.4.2: join aquabmpfix03
2008/06/03 10:13:49 pl 1.18.4.1: #i90296# fix an assertion
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/aqua/source/gdi/salgdiutils.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index 4b29e77129f2..f4c943e131cd 100755 --- a/vcl/aqua/source/gdi/salgdiutils.cxx +++ b/vcl/aqua/source/gdi/salgdiutils.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdiutils.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.20 $ * * This file is part of OpenOffice.org. * @@ -157,7 +157,7 @@ void AquaSalGraphics::SetState() bool AquaSalGraphics::CheckContext() { - if( mpFrame != NULL ) + if( mbWindow && mpFrame != NULL ) { const unsigned int nWidth = mpFrame->maGeometry.nWidth; const unsigned int nHeight = mpFrame->maGeometry.nHeight; |