summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-03-22 09:22:27 +0000
committerOliver Bolte <obo@openoffice.org>2006-03-22 09:22:27 +0000
commitfdd350d35efae9e76d4adb6d103dc9dbc27c2a8e (patch)
tree8371ca10f6c023e30494b89749fd65b9730fe8da
parentd168a42912846afb96e2b3f044ea1a37437ddcd2 (diff)
INTEGRATION: CWS vcl55 (1.10.192); FILE MERGED
2006/03/14 12:12:23 pl 1.10.192.2: RESYNC: (1.10-1.11); FILE MERGED 2006/03/06 14:09:59 hdu 1.10.192.1: #132892# be more defensive in X11SalVirtualDevice destructor
-rw-r--r--vcl/unx/source/gdi/salvd.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/source/gdi/salvd.cxx
index f3544abf95aa..f0d890d11c04 100644
--- a/vcl/unx/source/gdi/salvd.cxx
+++ b/vcl/unx/source/gdi/salvd.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: salvd.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: kz $ $Date: 2006-02-28 10:47:23 $
+ * last change: $Author: obo $ $Date: 2006-03-22 10:22:27 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -186,6 +186,7 @@ X11SalVirtualDevice::~X11SalVirtualDevice()
{
if( pGraphics_ )
delete pGraphics_;
+ pGraphics_ = NULL;
if( GetDrawable() && !bExternPixmap_ )
XFreePixmap( GetXDisplay(), GetDrawable() );