summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-11 07:20:39 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-11 07:20:39 +0000
commit230b14d352a2903c8c9a53b2da929908ec93ecd8 (patch)
treec5feb1876c415b2635ba4c868f82e179bb2df130 /vcl
parentINTEGRATION: CWS vcl66 (1.19.124); FILE MERGED (diff)
downloadcore-230b14d352a2903c8c9a53b2da929908ec93ecd8.tar.gz
core-230b14d352a2903c8c9a53b2da929908ec93ecd8.zip
INTEGRATION: CWS vcl66 (1.14.124); FILE MERGED
2006/09/08 14:58:23 pl 1.14.124.1: #i68979# remove list handling from DtIntegrator, do not leak DtIntegrator
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/inc/dtint.hxx26
1 files changed, 2 insertions, 24 deletions
diff --git a/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx
index 2fca8a46b2e0..645d83098a82 100644
--- a/vcl/unx/inc/dtint.hxx
+++ b/vcl/unx/inc/dtint.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: dtint.hxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: hr $ $Date: 2006-06-19 19:46:06 $
+ * last change: $Author: obo $ $Date: 2006-10-11 08:20:39 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -35,9 +35,6 @@
#ifndef _SV_DTINT_HXX
#define _SV_DTINT_HXX
-#ifndef _LIST_HXX
-#include <tools/list.hxx>
-#endif
#ifndef _LINK_HXX
#include <tools/link.hxx>
#endif
@@ -61,10 +58,6 @@ struct XEvent;
#define XLIB_Window UINT32
#endif
-class DtIntegrator;
-
-DECLARE_LIST( DtIntegratorList, DtIntegrator* )
-
enum DtType {
DtGeneric,
DtCDE,
@@ -77,13 +70,11 @@ protected:
DtType meType;
Display* mpDisplay;
SalDisplay* mpSalDisplay;
- int mnRefCount;
int mnSystemLookCommandProcess;
DtIntegrator();
- static DtIntegratorList aIntegratorList;
static String aHomeDir;
public:
@@ -97,19 +88,6 @@ public:
DtType GetDtType() { return meType; }
SalDisplay* GetSalDisplay() { return mpSalDisplay; }
Display* GetDisplay() { return mpDisplay; }
-
- void Acquire() { mnRefCount++; }
- inline void Release();
};
-inline void DtIntegrator::Release()
-{
- mnRefCount--;
- if( ! mnRefCount )
- {
- aIntegratorList.Remove( this );
- delete this;
- }
-}
-
#endif