summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-07-02 09:14:35 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-07-02 09:14:35 +0000
commit258039fd04c6707ce553216b0e9b55d889be607c (patch)
tree6e9848ef342ae973d1ac8f6afdd4b2b9ae7eec22 /vcl
parentd5f9d43b477736966e250ccde1418b76ccc4970c (diff)
INTEGRATION: CWS vcl90 (1.97.28); FILE MERGED
2008/06/24 09:01:04 pl 1.97.28.1: #i90809# Xrandr link modifications (thanks thb)
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/source/app/saldisp.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index f0a9cd0b36d4..040fa2f5b97a 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: saldisp.cxx,v $
- * $Revision: 1.99 $
+ * $Revision: 1.100 $
*
* This file is part of OpenOffice.org.
*
@@ -551,6 +551,9 @@ SalDisplay::~SalDisplay( )
#endif
pDisp_ = NULL;
}
+ // don't do this in doDestruct since RandR extension adds hooks into Display
+ // that is XCloseDisplay still needs the RandR library if it was used
+ DeInitRandR();
}
void SalDisplay::doDestruct()
@@ -677,9 +680,6 @@ SalX11Display::~SalX11Display()
XCloseDisplay( pDisp_ );
pDisp_ = NULL;
}
- // don't do this in doDestruct since RandR extension adds hooks into Display
- // that is XCloseDisplay still needs the RandR library if it was used
- DeInitRandR();
}
void SalDisplay::initScreen( int nScreen ) const