diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-19 10:42:34 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-19 12:26:44 +0200 |
| commit | 7238177ba30d51f68d7f43dc3f87283af17f382b (patch) | |
| tree | fbcef09d99afefee6b1c400757f732bf047a4200 | |
| parent | f36b2f43208b343189952ca70a922e7759dae3b2 (diff) | |
Drop ILLEGAL_POINTER sillyness
Change-Id: I19316f0fd04f75d980719676c928c3455e0f07b7
| -rw-r--r-- | tools/inc/tools/solar.h | 6 | ||||
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index b1f3dacdbfbd..5818e8f91fa9 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -50,12 +50,6 @@ typedef sal_uIntPtr sal_uLong; /* Replaces type ULONG */ #define __LOADONCALLAPI #endif -#if defined UNX -#define ILLEGAL_POINTER ((void*)1) -#else -#define ILLEGAL_POINTER NULL -#endif - // solar binary types /* Solar (portable) Binary (exchange) Type; OSI 6 subset diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 0522d6158a6e..b01035971d8b 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -343,8 +343,8 @@ void SalDisplay::doDestruct() if( IsDisplay() ) { - delete mpInputMethod, mpInputMethod = (SalI18N_InputMethod*)ILLEGAL_POINTER; - delete mpKbdExtension, mpKbdExtension = (SalI18N_KeyboardExtension*)ILLEGAL_POINTER; + delete mpInputMethod, mpInputMethod = NULL; + delete mpKbdExtension, mpKbdExtension = NULL; for( unsigned int i = 0; i < m_aScreens.size(); i++ ) { @@ -2687,8 +2687,8 @@ SalColormap::SalColormap( sal_uInt16 nDepth ) SalColormap::~SalColormap() { #ifdef DBG_UTIL - m_hColormap = (Colormap)ILLEGAL_POINTER; - m_pDisplay = (SalDisplay*)ILLEGAL_POINTER; + m_hColormap = NULL; + m_pDisplay = NULL; #endif } diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index f93f915bfab7..f24104970001 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -177,7 +177,7 @@ sal_Bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, X11SalVirtualDevice::X11SalVirtualDevice() : m_nXScreen( 0 ) { - pDisplay_ = (SalDisplay*)ILLEGAL_POINTER; + pDisplay_ = NULL; pGraphics_ = NULL; hDrawable_ = None; nDX_ = 0; |