Kaydet (Commit) 7238177b authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Drop ILLEGAL_POINTER sillyness

Change-Id: I19316f0fd04f75d980719676c928c3455e0f07b7
üst f36b2f43
......@@ -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
......
......@@ -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
}
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment