diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-06-21 09:31:46 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-06-21 09:31:46 +0000 |
commit | 54ef66106e44e0517243f6d847427101e5c0d307 (patch) | |
tree | fb90c27aaebb0310c57b870516413381c8c283ef /extensions/source/plugin | |
parent | 6e3bd58e802227181148fbfd3d6a6382fae0b783 (diff) |
INTEGRATION: CWS hr16 (1.10.52); FILE MERGED
2005/06/13 16:35:16 hr 1.10.52.1: #i47959#: fix gcc-4.0 warning
Diffstat (limited to 'extensions/source/plugin')
-rw-r--r-- | extensions/source/plugin/unx/npwrap.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index 5c43fefeab88..bc262fb85479 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: npwrap.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-03-29 13:06:21 $ + * last change: $Author: rt $ $Date: 2005-06-21 10:31:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,7 @@ Widget createSubWidget( char* pPluginText, Widget shell, XLIB_Window aParentWind shell, XtNwidth, 200, XtNheight, 200, - NULL ); + (char *)NULL ); XtRealizeWidget( shell ); medDebug( 1, "Reparenting new widget %x to %x\n", XtWindow( newWidget ), aParentWindow ); @@ -176,7 +176,7 @@ void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow ) XtNwidth, 200, XtNheight, 200, XtNoverrideRedirect, True, - NULL ); + (char *)NULL ); *pShellReturn = newShell; char pText[1024]; @@ -319,7 +319,7 @@ int main( int argc, char **argv) NULL, /* for missing app-defaults file */ topLevelShellWidgetClass, XtNoverrideRedirect, True, - NULL); /* terminate varargs list */ + (char *)NULL); /* terminate varargs list */ pAppDisplay = XtDisplay( topLevel ); XtAppAddInput( app_context, |