Update to 2.0.3rc6.

also applied i66666 amd64 fix, i66667 general fixes [1]

Submitted by:	jkim [1]

24 files changed, 3600 insertions, 42 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index de0de65c256a..c794c2d84395 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -15,19 +15,19 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${OOOVERSION}_src_060601.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOVERSION}_src_060601.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-OOOVERSION=	2.0.3rc5
+OOOVERSION=	2.0.3rc6
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -71,7 +71,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOC680_m5
+OOOTAG?=		OOC680_m6
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 3a5518feaa83..75dcc4fc9e8a 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = caef8f901a69a990b8747c92581078ac
-SHA256 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 00bd7716b7abf74001ccfdf94022cb8e87a13bd96e44205ebba967c1fc200b14
-SIZE (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 307315179
+MD5 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 6e77a24432359a1cfa860c827b2d1832
+SHA256 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 95bb5fe24f2e1df7a5c6209d0f52e92297abf4d1c3553fd3e47fda75b764d03e
+SIZE (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 307311939
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice-3/files/patch-i66666 b/editors/openoffice-3/files/patch-i66666
new file mode 100644
index 000000000000..8c288b9c3875
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i66666
@@ -0,0 +1,537 @@
+it also includes the following patch
+http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
+from i66686 (dupe of i66666)
+Index: tools/inc/solar.h
+===================================================================
+RCS file: /cvs/util/tools/inc/solar.h,v
+retrieving revision 1.44
+diff -u -r1.44 solar.h
+--- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
++++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
+@@ -55,9 +55,6 @@
+ #define FALSE		0
+ #endif
+ 
+-#undef NULL
+-#define NULL		0
+-
+ #ifdef _SOLAR__PRIVATE
+ #undef _SOLAR__PRIVATE
+ #endif
+
+Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx	29 Mar 2006 07:41:24 -0000	1.11
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -208,7 +208,7 @@
+ 			GTK_FILE_CHOOSER_ACTION_OPEN,
+ 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ 			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+-			NULL );
++			(void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 
+@@ -347,7 +347,7 @@
+         cell = gtk_cell_renderer_text_new ();
+         gtk_tree_view_column_set_expand (column, TRUE);
+         gtk_tree_view_column_pack_start (column, cell, FALSE);
+-        gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
++        gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
+         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
+     }
+ 
+@@ -377,7 +377,7 @@
+     PangoRectangle row_height;
+     pango_layout_set_markup (layout, "All Files", -1);
+     pango_layout_get_pixel_extents (layout, NULL, &row_height);
+-    g_object_get (cell, "ypad", &ypad, NULL);
++    g_object_get (cell, "ypad", &ypad, (void *)NULL);
+     guint height = (row_height.height + 2*ypad) * 5;
+     gtk_widget_set_size_request (m_pFilterView, -1, height);
+     gtk_widget_set_size_request (m_pPreview, 1, height);
+@@ -1414,7 +1414,7 @@
+ 	}
+ 	if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
+ 		g_object_set( pWidget, "label", aTxt.getStr(),
+-					  "use_underline", TRUE, NULL );
++					  "use_underline", TRUE, (void *)NULL );
+ 	else
+ 		OSL_TRACE("Can't set label on list\n");
+ }
+Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 SalGtkFolderPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	8 Sep 2005 23:35:19 -0000	1.6
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -125,7 +125,7 @@
+     m_pDialog = gtk_file_chooser_dialog_new(
+     	OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
+ 		NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
++		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 	gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.27
+diff -u -r1.27 salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	11 May 2006 10:00:59 -0000	1.27
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2006 00:59:16 -0000
+@@ -550,7 +550,7 @@
+ 	    gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									    "has-secondary-forward-stepper", &has_forward2,
+ 									    "has-backward-stepper", &has_backward,
+-	   								    "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								    "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+         Rectangle aForward;
+         Rectangle aBackward;
+ 
+@@ -910,7 +910,7 @@
+                                  gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
+             gtk_widget_style_get( pWidget,
+                                   "indicator_size", &indicator_size,
+-                                  NULL );
++                                  (void *)NULL );
+             rNativeBoundingRegion = rControlRegion;
+             Rectangle aIndicatorRect( Point( 0,
+                                              (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+@@ -928,7 +928,7 @@
+         gtk_widget_style_get( widget,
+                               "indicator_size", &indicator_size,
+                               "indicator_spacing", &indicator_spacing,
+-                              NULL);
++                              (void *)NULL);
+         indicator_size += 2*indicator_spacing; // guess overpaint of theme
+         rNativeBoundingRegion = rControlRegion;
+         Rectangle aIndicatorRect( Point( 0,
+@@ -978,7 +978,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1081,7 +1081,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1134,7 +1134,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1192,7 +1192,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1291,7 +1291,7 @@
+ 									  "stepper_size", &stepper_size,
+ 									  "trough_border", &trough_border,
+ 									  "stepper_spacing", &stepper_spacing,
+-									  "min_slider_length", &min_slider_length, NULL );
++									  "min_slider_length", &min_slider_length, (void *)NULL );
+     gboolean has_forward;
+     gboolean has_forward2;
+     gboolean has_backward;
+@@ -1300,7 +1300,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint magic = trough_border ? 1 : 0;
+     gint nFirst = 0;
+ 
+@@ -1570,7 +1570,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
+ 									  "stepper-size", &stepper_size,
+ 									  "trough-border", &trough_border,
+-	   								  "stepper-spacing", &stepper_spacing, NULL );
++	   								  "stepper-spacing", &stepper_spacing, (void *)NULL );
+ 
+     gboolean has_forward;
+     gboolean has_forward2;
+@@ -1580,7 +1580,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint       buttonWidth;
+ 	gint       buttonHeight;
+ 	Rectangle  buttonRect;
+@@ -1687,7 +1687,7 @@
+ 
+ 	// Grab some entry style attributes
+ 	gtk_widget_style_get( gEditBoxWidget,	"focus-line-width",	&focusWidth,
+-					 				"interior-focus",	&interiorFocus, NULL );
++					 				"interior-focus",	&interiorFocus, (void *)NULL );
+ 
+ 	if ( !interiorFocus )
+ 	{
+@@ -1838,7 +1838,7 @@
+ 	}
+ 
+ 	NWSetWidgetState( gSpinButtonWidget, nState, stateType );
+-	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
++	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
+ 
+ 	if ( shadowType != GTK_SHADOW_NONE )
+ 	{
+@@ -2048,7 +2048,7 @@
+ 
+ 	// Grab some button style attributes
+ 	gtk_widget_style_get( gDropdownWidget,	"focus-line-width",	&nFocusWidth,
+-									"focus-padding", 	&nFocusPad, NULL );
++									"focus-padding", 	&nFocusPad, (void *)NULL );
+ 
+ 	nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
+     nButtonWidth = nArrowWidth +
+@@ -2272,7 +2272,7 @@
+ 			"interior_focus",	&bInteriorFocus,
+ 			"focus_line_width",	&nFocusLineWidth,
+ 			"focus_padding",	&nFocusPadding,
+-			NULL);
++			(void *)NULL);
+     }
+     
+     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+@@ -2482,7 +2482,7 @@
+         {
+             gtk_widget_style_get( gMenuItemMenubarWidget,
+                                   "selected_shadow_type", &selected_shadow_type,
+-                                  NULL);
++                                  (void *)NULL);
+         }
+     }
+     
+@@ -2571,7 +2571,7 @@
+     {
+         gtk_widget_style_get( gMenuItemMenuWidget,
+                               "selected_shadow_type", &selected_shadow_type,
+-                              NULL);
++                              (void *)NULL);
+     }
+ 
+     NWSetWidgetState( gMenuWidget, nState, stateType );
+@@ -2730,7 +2730,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+ 		width = pIndicatorSize->width;
+@@ -2791,7 +2791,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+     {
+@@ -3074,11 +3074,11 @@
+     GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
+     gboolean blink = false;
+ 
+-    g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
++    g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
+     if( blink )
+     {
+         gint blink_time = STYLE_CURSOR_NOBLINKTIME;
+-        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
++        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
+         // set the blink_time if there is a setting and it is reasonable
+         // else leave the default value
+         if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
+@@ -3097,7 +3097,7 @@
+                           "slider-width", &slider_width,
+                           "trough-border", &trough_border,
+                           "min-slider-length", &min_slider_length,
+-                          NULL );
++                          (void *)NULL );
+     gint magic = trough_border ? 1 : 0;
+     aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
+     aStyleSet.SetMinThumbSize( min_slider_length - magic );
+@@ -3439,7 +3439,7 @@
+         gtk_widget_ensure_style( gToolbarWidget );
+         gtk_widget_style_get( gToolbarWidget,
+ 			                  "button_relief", &aRelief,
+-                              NULL);
++                              (void *)NULL);
+                               
+         gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
+         GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
+Index: vcl/unx/source/app/i18n_cb.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
+retrieving revision 1.28
+diff -u -r1.28 i18n_cb.cxx
+--- vcl/unx/source/app/i18n_cb.cxx	19 Apr 2006 13:56:47 -0000	1.28
++++ vcl/unx/source/app/i18n_cb.cxx	16 Jun 2006 00:59:17 -0000
+@@ -463,8 +463,8 @@
+   	point.y = mPosEvent.mnY + mPosEvent.mnHeight;
+ 
+   	XVaNestedList preedit_attr;
+-  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
+-  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
++  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
++  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
+   	XFree(preedit_attr);
+ 
+ 	return;
+@@ -600,7 +600,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( ic,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             ::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
+Index: vcl/unx/source/app/i18n_ic.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_ic.cxx
+--- vcl/unx/source/app/i18n_ic.cxx	16 Jan 2006 13:07:29 -0000	1.35
++++ vcl/unx/source/app/i18n_ic.cxx	16 Jun 2006 00:59:17 -0000
+@@ -137,7 +137,7 @@
+         a_dstlist = XVaCreateNestedList(
+                                         0,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+     else
+     {
+@@ -145,7 +145,7 @@
+                                         0,
+                                         XNVaNestedList, a_srclist,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+ 
+     return a_dstlist != NULL ? a_dstlist : a_srclist ;
+@@ -263,7 +263,7 @@
+                                                           XNStatusStartCallback, &aStatusStartCallback,
+                                                           XNStatusDoneCallback,  &aStatusDoneCallback,
+                                                           XNStatusDrawCallback,  &aStatusDrawCallback,
+-                                                          NULL );
++                                                          (void *)NULL );
+ 
+                 break;
+             }
+@@ -302,7 +302,7 @@
+                                                            XNPreeditDoneCallback,  &maPreeditDoneCallback,
+                                                            XNPreeditDrawCallback,   &maPreeditDrawCallback,
+                                                            XNPreeditCaretCallback, &maPreeditCaretCallback,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 break;
+ 
+@@ -324,7 +324,7 @@
+                 mpPreeditAttributes = XVaCreateNestedList (
+                                                            0,
+                                                            XNSpotLocation, &aSpot,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 // XCreateIC() fails on Redflag Linux 2.0 if there is no
+                 // fontset though the data itself is not evaluated nor is
+@@ -357,7 +357,7 @@
+                                            XNFocusWindow,       aFocusWindow,
+                                            XNClientWindow,      aClientWindow,
+                                            XNInputStyle,        mnPreeditStyle | mnStatusStyle,
+-                                           NULL );
++                                           (void *)NULL );
+ 
+         if ( mnPreeditStyle != XIMPreeditNone )
+         {
+@@ -377,7 +377,7 @@
+         }
+         maContext = XCreateIC( pInputMethod->GetMethod(),
+                                XNVaNestedList, mpAttributes,
+-                               NULL );
++                               (void *)NULL );
+     }
+ 
+     if ( maContext == NULL )
+@@ -416,7 +416,7 @@
+         XSetICValues( maContext,
+                       XNCommitStringCallback, &maCommitStringCallback,
+                       XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+     if ( maContext != NULL)
+     {
+@@ -424,7 +424,7 @@
+         maDestroyCallback.client_data = (XPointer)this;
+         XSetICValues( maContext,
+                       XNDestroyCallback,      &maDestroyCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+ 
+     if( mbMultiLingual )
+@@ -433,7 +433,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( maContext,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
+@@ -481,12 +481,12 @@
+ 
+                 maContext = XCreateIC( pInputMethod->GetMethod(),
+                                        XNVaNestedList, mpAttributes,
+-                                       NULL );
++                                       (void *)NULL );
+                 if ( maContext != NULL && mbMultiLingual )
+                     XSetICValues( maContext,
+                                   XNCommitStringCallback, &maCommitStringCallback,
+                                   XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                                  NULL );
++                                  (void *)NULL );
+             }
+             if( maClientData.pFrame != pFrame )
+                 SetICFocus( pFrame );
+@@ -529,7 +529,7 @@
+                               &aWindowAttributes );
+         XGetICValues ( maContext,
+                        XNFilterEvents, &nIMEventMask,
+-                       NULL);
++                       (void *)NULL);
+         nIMEventMask |= aWindowAttributes.your_event_mask;
+         XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
+     }
+@@ -685,8 +685,8 @@
+     aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
+     aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
+ 
+-    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
+-    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
++    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     XFree(preedit_attr);
+ 
+     I18NStatus::get().show( true, I18NStatus::contextmap );
+@@ -717,7 +717,7 @@
+         XSetICValues( maContext,
+                       XNFocusWindow,       aFocusWindow,
+                       XNClientWindow,      aClientWindow,
+-                      NULL );
++                      (void *)NULL );
+ 
+         if( maClientData.aInputEv.mpTextAttr )
+         {
+@@ -761,8 +761,8 @@
+     preedit_attr = XVaCreateNestedList(
+                                        0,
+                                        XNPreeditState, &preedit_state,
+-                                       NULL);
+-    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
++                                       (void *)NULL);
++    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
+     {
+         XFree(preedit_attr);
+ 
+@@ -770,8 +770,8 @@
+         preedit_attr = XVaCreateNestedList(
+                                            0,
+                                            XNPreeditState, preedit_state,
+-                                           NULL);
+-        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++                                           (void *)NULL);
++        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     }
+ 
+     XFree(preedit_attr);
+Index: vcl/unx/source/app/i18n_im.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_im.cxx
+--- vcl/unx/source/app/i18n_im.cxx	7 Apr 2006 08:04:45 -0000	1.35
++++ vcl/unx/source/app/i18n_im.cxx	16 Jun 2006 00:59:17 -0000
+@@ -427,13 +427,13 @@
+ 				mbMultiLingual = False;
+ 			else
+ 			if ( XGetIMValues(maMethod,
+-					XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
++					XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
+ 				mbMultiLingual = False;
+             if( mbMultiLingual )
+             {
+                 XIMUnicodeCharacterSubsets* subsets;
+                 if( XGetIMValues( maMethod,
+-                                  XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
++                                  XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
+                 {
+ #if OSL_DEBUG_LEVEL > 1
+                     fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
+@@ -473,7 +473,7 @@
+ 
+ 		if ( maMethod != (XIM)NULL )
+ 		{
+-			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
++			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
+ 				!= NULL)
+ 				mbUseable = False;
+             #if OSL_DEBUG_LEVEL > 1
+@@ -496,7 +496,7 @@
+     maDestroyCallback.callback	  = (XIMProc)IM_IMDestroyCallback;
+ 	maDestroyCallback.client_data = (XPointer)this;
+     if (mbUseable && maMethod != NULL)
+-        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
++        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
+ 
+ 	return mbUseable;
+ }
+Index: vcl/unx/source/app/i18n_status.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
+retrieving revision 1.30
+diff -u -r1.30 i18n_status.cxx
+--- vcl/unx/source/app/i18n_status.cxx	16 Jan 2006 13:08:00 -0000	1.30
++++ vcl/unx/source/app/i18n_status.cxx	16 Jun 2006 00:59:17 -0000
+@@ -502,7 +502,7 @@
+             XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
+                           XNUnicodeCharacterSubset,
+                           rChoices[nIndex].pData,
+-                          NULL);
++                          (void *)NULL);
+             // FIXME: get rid of X11SalFrame
+             X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
+             if( pParent && pParent->isMapped() )
diff --git a/editors/openoffice-3/files/patch-i66667 b/editors/openoffice-3/files/patch-i66667
new file mode 100644
index 000000000000..6e3a697c4bf0
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i66667
@@ -0,0 +1,56 @@
+Index: gtkinst.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
+retrieving revision 1.13
+diff -u -r1.13 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
++++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+@@ -43,6 +43,7 @@
+ #include <plugins/gtk/atkbridge.hxx>
+ 
+ #include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ #include <stdio.h>
+@@ -111,13 +112,28 @@
+ 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
+ 		pYieldMutex->ThreadsLeave();
+ 	}
+-	static bool hookLocks( oslModule pModule )
++	static bool hookLocks( void )
+ 	{
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
+ 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ 
++		/* XXX GDK library path should be set by configure. */
++		OUStringBuffer aModName( 128 );
++		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
++		aModName.appendAscii( SAL_DLLEXTENSION );
++		OUString aModule = aModName.makeStringAndClear();
++		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
++
++		if ( !aMod )
++		{
++#if OSL_DEBUG_LEVEL > 1
++		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
++#endif
++			return false;
++		}
++
+ 		GdkLockFn gdk_threads_set_lock_functions =
+-				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
++				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
+ 		if ( !gdk_threads_set_lock_functions )
+ 		{
+ #if OSL_DEBUG_LEVEL > 1
+@@ -150,7 +166,7 @@
+ 		if ( !g_thread_supported() )
+ 			g_thread_init( NULL );
+ 
+-		if ( hookLocks( pModule ) )
++		if ( hookLocks() )
+ 			pYieldMutex = new GtkHookedYieldMutex();
+ 		else
+ 			pYieldMutex = new GtkYieldMutex();
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index de0de65c256a..c794c2d84395 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -15,19 +15,19 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${OOOVERSION}_src_060601.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOVERSION}_src_060601.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-OOOVERSION=	2.0.3rc5
+OOOVERSION=	2.0.3rc6
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -71,7 +71,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOC680_m5
+OOOTAG?=		OOC680_m6
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 3a5518feaa83..75dcc4fc9e8a 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = caef8f901a69a990b8747c92581078ac
-SHA256 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 00bd7716b7abf74001ccfdf94022cb8e87a13bd96e44205ebba967c1fc200b14
-SIZE (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 307315179
+MD5 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 6e77a24432359a1cfa860c827b2d1832
+SHA256 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 95bb5fe24f2e1df7a5c6209d0f52e92297abf4d1c3553fd3e47fda75b764d03e
+SIZE (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 307311939
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2-RC/files/patch-i66666 b/editors/openoffice.org-2-RC/files/patch-i66666
new file mode 100644
index 000000000000..8c288b9c3875
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i66666
@@ -0,0 +1,537 @@
+it also includes the following patch
+http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
+from i66686 (dupe of i66666)
+Index: tools/inc/solar.h
+===================================================================
+RCS file: /cvs/util/tools/inc/solar.h,v
+retrieving revision 1.44
+diff -u -r1.44 solar.h
+--- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
++++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
+@@ -55,9 +55,6 @@
+ #define FALSE		0
+ #endif
+ 
+-#undef NULL
+-#define NULL		0
+-
+ #ifdef _SOLAR__PRIVATE
+ #undef _SOLAR__PRIVATE
+ #endif
+
+Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx	29 Mar 2006 07:41:24 -0000	1.11
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -208,7 +208,7 @@
+ 			GTK_FILE_CHOOSER_ACTION_OPEN,
+ 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ 			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+-			NULL );
++			(void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 
+@@ -347,7 +347,7 @@
+         cell = gtk_cell_renderer_text_new ();
+         gtk_tree_view_column_set_expand (column, TRUE);
+         gtk_tree_view_column_pack_start (column, cell, FALSE);
+-        gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
++        gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
+         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
+     }
+ 
+@@ -377,7 +377,7 @@
+     PangoRectangle row_height;
+     pango_layout_set_markup (layout, "All Files", -1);
+     pango_layout_get_pixel_extents (layout, NULL, &row_height);
+-    g_object_get (cell, "ypad", &ypad, NULL);
++    g_object_get (cell, "ypad", &ypad, (void *)NULL);
+     guint height = (row_height.height + 2*ypad) * 5;
+     gtk_widget_set_size_request (m_pFilterView, -1, height);
+     gtk_widget_set_size_request (m_pPreview, 1, height);
+@@ -1414,7 +1414,7 @@
+ 	}
+ 	if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
+ 		g_object_set( pWidget, "label", aTxt.getStr(),
+-					  "use_underline", TRUE, NULL );
++					  "use_underline", TRUE, (void *)NULL );
+ 	else
+ 		OSL_TRACE("Can't set label on list\n");
+ }
+Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 SalGtkFolderPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	8 Sep 2005 23:35:19 -0000	1.6
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -125,7 +125,7 @@
+     m_pDialog = gtk_file_chooser_dialog_new(
+     	OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
+ 		NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
++		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 	gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.27
+diff -u -r1.27 salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	11 May 2006 10:00:59 -0000	1.27
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2006 00:59:16 -0000
+@@ -550,7 +550,7 @@
+ 	    gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									    "has-secondary-forward-stepper", &has_forward2,
+ 									    "has-backward-stepper", &has_backward,
+-	   								    "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								    "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+         Rectangle aForward;
+         Rectangle aBackward;
+ 
+@@ -910,7 +910,7 @@
+                                  gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
+             gtk_widget_style_get( pWidget,
+                                   "indicator_size", &indicator_size,
+-                                  NULL );
++                                  (void *)NULL );
+             rNativeBoundingRegion = rControlRegion;
+             Rectangle aIndicatorRect( Point( 0,
+                                              (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+@@ -928,7 +928,7 @@
+         gtk_widget_style_get( widget,
+                               "indicator_size", &indicator_size,
+                               "indicator_spacing", &indicator_spacing,
+-                              NULL);
++                              (void *)NULL);
+         indicator_size += 2*indicator_spacing; // guess overpaint of theme
+         rNativeBoundingRegion = rControlRegion;
+         Rectangle aIndicatorRect( Point( 0,
+@@ -978,7 +978,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1081,7 +1081,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1134,7 +1134,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1192,7 +1192,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1291,7 +1291,7 @@
+ 									  "stepper_size", &stepper_size,
+ 									  "trough_border", &trough_border,
+ 									  "stepper_spacing", &stepper_spacing,
+-									  "min_slider_length", &min_slider_length, NULL );
++									  "min_slider_length", &min_slider_length, (void *)NULL );
+     gboolean has_forward;
+     gboolean has_forward2;
+     gboolean has_backward;
+@@ -1300,7 +1300,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint magic = trough_border ? 1 : 0;
+     gint nFirst = 0;
+ 
+@@ -1570,7 +1570,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
+ 									  "stepper-size", &stepper_size,
+ 									  "trough-border", &trough_border,
+-	   								  "stepper-spacing", &stepper_spacing, NULL );
++	   								  "stepper-spacing", &stepper_spacing, (void *)NULL );
+ 
+     gboolean has_forward;
+     gboolean has_forward2;
+@@ -1580,7 +1580,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint       buttonWidth;
+ 	gint       buttonHeight;
+ 	Rectangle  buttonRect;
+@@ -1687,7 +1687,7 @@
+ 
+ 	// Grab some entry style attributes
+ 	gtk_widget_style_get( gEditBoxWidget,	"focus-line-width",	&focusWidth,
+-					 				"interior-focus",	&interiorFocus, NULL );
++					 				"interior-focus",	&interiorFocus, (void *)NULL );
+ 
+ 	if ( !interiorFocus )
+ 	{
+@@ -1838,7 +1838,7 @@
+ 	}
+ 
+ 	NWSetWidgetState( gSpinButtonWidget, nState, stateType );
+-	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
++	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
+ 
+ 	if ( shadowType != GTK_SHADOW_NONE )
+ 	{
+@@ -2048,7 +2048,7 @@
+ 
+ 	// Grab some button style attributes
+ 	gtk_widget_style_get( gDropdownWidget,	"focus-line-width",	&nFocusWidth,
+-									"focus-padding", 	&nFocusPad, NULL );
++									"focus-padding", 	&nFocusPad, (void *)NULL );
+ 
+ 	nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
+     nButtonWidth = nArrowWidth +
+@@ -2272,7 +2272,7 @@
+ 			"interior_focus",	&bInteriorFocus,
+ 			"focus_line_width",	&nFocusLineWidth,
+ 			"focus_padding",	&nFocusPadding,
+-			NULL);
++			(void *)NULL);
+     }
+     
+     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+@@ -2482,7 +2482,7 @@
+         {
+             gtk_widget_style_get( gMenuItemMenubarWidget,
+                                   "selected_shadow_type", &selected_shadow_type,
+-                                  NULL);
++                                  (void *)NULL);
+         }
+     }
+     
+@@ -2571,7 +2571,7 @@
+     {
+         gtk_widget_style_get( gMenuItemMenuWidget,
+                               "selected_shadow_type", &selected_shadow_type,
+-                              NULL);
++                              (void *)NULL);
+     }
+ 
+     NWSetWidgetState( gMenuWidget, nState, stateType );
+@@ -2730,7 +2730,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+ 		width = pIndicatorSize->width;
+@@ -2791,7 +2791,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+     {
+@@ -3074,11 +3074,11 @@
+     GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
+     gboolean blink = false;
+ 
+-    g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
++    g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
+     if( blink )
+     {
+         gint blink_time = STYLE_CURSOR_NOBLINKTIME;
+-        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
++        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
+         // set the blink_time if there is a setting and it is reasonable
+         // else leave the default value
+         if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
+@@ -3097,7 +3097,7 @@
+                           "slider-width", &slider_width,
+                           "trough-border", &trough_border,
+                           "min-slider-length", &min_slider_length,
+-                          NULL );
++                          (void *)NULL );
+     gint magic = trough_border ? 1 : 0;
+     aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
+     aStyleSet.SetMinThumbSize( min_slider_length - magic );
+@@ -3439,7 +3439,7 @@
+         gtk_widget_ensure_style( gToolbarWidget );
+         gtk_widget_style_get( gToolbarWidget,
+ 			                  "button_relief", &aRelief,
+-                              NULL);
++                              (void *)NULL);
+                               
+         gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
+         GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
+Index: vcl/unx/source/app/i18n_cb.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
+retrieving revision 1.28
+diff -u -r1.28 i18n_cb.cxx
+--- vcl/unx/source/app/i18n_cb.cxx	19 Apr 2006 13:56:47 -0000	1.28
++++ vcl/unx/source/app/i18n_cb.cxx	16 Jun 2006 00:59:17 -0000
+@@ -463,8 +463,8 @@
+   	point.y = mPosEvent.mnY + mPosEvent.mnHeight;
+ 
+   	XVaNestedList preedit_attr;
+-  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
+-  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
++  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
++  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
+   	XFree(preedit_attr);
+ 
+ 	return;
+@@ -600,7 +600,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( ic,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             ::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
+Index: vcl/unx/source/app/i18n_ic.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_ic.cxx
+--- vcl/unx/source/app/i18n_ic.cxx	16 Jan 2006 13:07:29 -0000	1.35
++++ vcl/unx/source/app/i18n_ic.cxx	16 Jun 2006 00:59:17 -0000
+@@ -137,7 +137,7 @@
+         a_dstlist = XVaCreateNestedList(
+                                         0,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+     else
+     {
+@@ -145,7 +145,7 @@
+                                         0,
+                                         XNVaNestedList, a_srclist,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+ 
+     return a_dstlist != NULL ? a_dstlist : a_srclist ;
+@@ -263,7 +263,7 @@
+                                                           XNStatusStartCallback, &aStatusStartCallback,
+                                                           XNStatusDoneCallback,  &aStatusDoneCallback,
+                                                           XNStatusDrawCallback,  &aStatusDrawCallback,
+-                                                          NULL );
++                                                          (void *)NULL );
+ 
+                 break;
+             }
+@@ -302,7 +302,7 @@
+                                                            XNPreeditDoneCallback,  &maPreeditDoneCallback,
+                                                            XNPreeditDrawCallback,   &maPreeditDrawCallback,
+                                                            XNPreeditCaretCallback, &maPreeditCaretCallback,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 break;
+ 
+@@ -324,7 +324,7 @@
+                 mpPreeditAttributes = XVaCreateNestedList (
+                                                            0,
+                                                            XNSpotLocation, &aSpot,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 // XCreateIC() fails on Redflag Linux 2.0 if there is no
+                 // fontset though the data itself is not evaluated nor is
+@@ -357,7 +357,7 @@
+                                            XNFocusWindow,       aFocusWindow,
+                                            XNClientWindow,      aClientWindow,
+                                            XNInputStyle,        mnPreeditStyle | mnStatusStyle,
+-                                           NULL );
++                                           (void *)NULL );
+ 
+         if ( mnPreeditStyle != XIMPreeditNone )
+         {
+@@ -377,7 +377,7 @@
+         }
+         maContext = XCreateIC( pInputMethod->GetMethod(),
+                                XNVaNestedList, mpAttributes,
+-                               NULL );
++                               (void *)NULL );
+     }
+ 
+     if ( maContext == NULL )
+@@ -416,7 +416,7 @@
+         XSetICValues( maContext,
+                       XNCommitStringCallback, &maCommitStringCallback,
+                       XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+     if ( maContext != NULL)
+     {
+@@ -424,7 +424,7 @@
+         maDestroyCallback.client_data = (XPointer)this;
+         XSetICValues( maContext,
+                       XNDestroyCallback,      &maDestroyCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+ 
+     if( mbMultiLingual )
+@@ -433,7 +433,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( maContext,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
+@@ -481,12 +481,12 @@
+ 
+                 maContext = XCreateIC( pInputMethod->GetMethod(),
+                                        XNVaNestedList, mpAttributes,
+-                                       NULL );
++                                       (void *)NULL );
+                 if ( maContext != NULL && mbMultiLingual )
+                     XSetICValues( maContext,
+                                   XNCommitStringCallback, &maCommitStringCallback,
+                                   XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                                  NULL );
++                                  (void *)NULL );
+             }
+             if( maClientData.pFrame != pFrame )
+                 SetICFocus( pFrame );
+@@ -529,7 +529,7 @@
+                               &aWindowAttributes );
+         XGetICValues ( maContext,
+                        XNFilterEvents, &nIMEventMask,
+-                       NULL);
++                       (void *)NULL);
+         nIMEventMask |= aWindowAttributes.your_event_mask;
+         XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
+     }
+@@ -685,8 +685,8 @@
+     aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
+     aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
+ 
+-    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
+-    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
++    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     XFree(preedit_attr);
+ 
+     I18NStatus::get().show( true, I18NStatus::contextmap );
+@@ -717,7 +717,7 @@
+         XSetICValues( maContext,
+                       XNFocusWindow,       aFocusWindow,
+                       XNClientWindow,      aClientWindow,
+-                      NULL );
++                      (void *)NULL );
+ 
+         if( maClientData.aInputEv.mpTextAttr )
+         {
+@@ -761,8 +761,8 @@
+     preedit_attr = XVaCreateNestedList(
+                                        0,
+                                        XNPreeditState, &preedit_state,
+-                                       NULL);
+-    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
++                                       (void *)NULL);
++    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
+     {
+         XFree(preedit_attr);
+ 
+@@ -770,8 +770,8 @@
+         preedit_attr = XVaCreateNestedList(
+                                            0,
+                                            XNPreeditState, preedit_state,
+-                                           NULL);
+-        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++                                           (void *)NULL);
++        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     }
+ 
+     XFree(preedit_attr);
+Index: vcl/unx/source/app/i18n_im.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_im.cxx
+--- vcl/unx/source/app/i18n_im.cxx	7 Apr 2006 08:04:45 -0000	1.35
++++ vcl/unx/source/app/i18n_im.cxx	16 Jun 2006 00:59:17 -0000
+@@ -427,13 +427,13 @@
+ 				mbMultiLingual = False;
+ 			else
+ 			if ( XGetIMValues(maMethod,
+-					XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
++					XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
+ 				mbMultiLingual = False;
+             if( mbMultiLingual )
+             {
+                 XIMUnicodeCharacterSubsets* subsets;
+                 if( XGetIMValues( maMethod,
+-                                  XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
++                                  XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
+                 {
+ #if OSL_DEBUG_LEVEL > 1
+                     fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
+@@ -473,7 +473,7 @@
+ 
+ 		if ( maMethod != (XIM)NULL )
+ 		{
+-			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
++			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
+ 				!= NULL)
+ 				mbUseable = False;
+             #if OSL_DEBUG_LEVEL > 1
+@@ -496,7 +496,7 @@
+     maDestroyCallback.callback	  = (XIMProc)IM_IMDestroyCallback;
+ 	maDestroyCallback.client_data = (XPointer)this;
+     if (mbUseable && maMethod != NULL)
+-        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
++        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
+ 
+ 	return mbUseable;
+ }
+Index: vcl/unx/source/app/i18n_status.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
+retrieving revision 1.30
+diff -u -r1.30 i18n_status.cxx
+--- vcl/unx/source/app/i18n_status.cxx	16 Jan 2006 13:08:00 -0000	1.30
++++ vcl/unx/source/app/i18n_status.cxx	16 Jun 2006 00:59:17 -0000
+@@ -502,7 +502,7 @@
+             XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
+                           XNUnicodeCharacterSubset,
+                           rChoices[nIndex].pData,
+-                          NULL);
++                          (void *)NULL);
+             // FIXME: get rid of X11SalFrame
+             X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
+             if( pParent && pParent->isMapped() )
diff --git a/editors/openoffice.org-2-RC/files/patch-i66667 b/editors/openoffice.org-2-RC/files/patch-i66667
new file mode 100644
index 000000000000..6e3a697c4bf0
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i66667
@@ -0,0 +1,56 @@
+Index: gtkinst.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
+retrieving revision 1.13
+diff -u -r1.13 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
++++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+@@ -43,6 +43,7 @@
+ #include <plugins/gtk/atkbridge.hxx>
+ 
+ #include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ #include <stdio.h>
+@@ -111,13 +112,28 @@
+ 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
+ 		pYieldMutex->ThreadsLeave();
+ 	}
+-	static bool hookLocks( oslModule pModule )
++	static bool hookLocks( void )
+ 	{
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
+ 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ 
++		/* XXX GDK library path should be set by configure. */
++		OUStringBuffer aModName( 128 );
++		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
++		aModName.appendAscii( SAL_DLLEXTENSION );
++		OUString aModule = aModName.makeStringAndClear();
++		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
++
++		if ( !aMod )
++		{
++#if OSL_DEBUG_LEVEL > 1
++		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
++#endif
++			return false;
++		}
++
+ 		GdkLockFn gdk_threads_set_lock_functions =
+-				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
++				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
+ 		if ( !gdk_threads_set_lock_functions )
+ 		{
+ #if OSL_DEBUG_LEVEL > 1
+@@ -150,7 +166,7 @@
+ 		if ( !g_thread_supported() )
+ 			g_thread_init( NULL );
+ 
+-		if ( hookLocks( pModule ) )
++		if ( hookLocks() )
+ 			pYieldMutex = new GtkHookedYieldMutex();
+ 		else
+ 			pYieldMutex = new GtkYieldMutex();
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index de0de65c256a..c794c2d84395 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -15,19 +15,19 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${OOOVERSION}_src_060601.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOVERSION}_src_060601.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-OOOVERSION=	2.0.3rc5
+OOOVERSION=	2.0.3rc6
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -71,7 +71,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOC680_m5
+OOOTAG?=		OOC680_m6
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 3a5518feaa83..75dcc4fc9e8a 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = caef8f901a69a990b8747c92581078ac
-SHA256 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 00bd7716b7abf74001ccfdf94022cb8e87a13bd96e44205ebba967c1fc200b14
-SIZE (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 307315179
+MD5 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 6e77a24432359a1cfa860c827b2d1832
+SHA256 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 95bb5fe24f2e1df7a5c6209d0f52e92297abf4d1c3553fd3e47fda75b764d03e
+SIZE (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 307311939
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2.0/files/patch-i66666 b/editors/openoffice.org-2.0/files/patch-i66666
new file mode 100644
index 000000000000..8c288b9c3875
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-i66666
@@ -0,0 +1,537 @@
+it also includes the following patch
+http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
+from i66686 (dupe of i66666)
+Index: tools/inc/solar.h
+===================================================================
+RCS file: /cvs/util/tools/inc/solar.h,v
+retrieving revision 1.44
+diff -u -r1.44 solar.h
+--- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
++++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
+@@ -55,9 +55,6 @@
+ #define FALSE		0
+ #endif
+ 
+-#undef NULL
+-#define NULL		0
+-
+ #ifdef _SOLAR__PRIVATE
+ #undef _SOLAR__PRIVATE
+ #endif
+
+Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx	29 Mar 2006 07:41:24 -0000	1.11
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -208,7 +208,7 @@
+ 			GTK_FILE_CHOOSER_ACTION_OPEN,
+ 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ 			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+-			NULL );
++			(void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 
+@@ -347,7 +347,7 @@
+         cell = gtk_cell_renderer_text_new ();
+         gtk_tree_view_column_set_expand (column, TRUE);
+         gtk_tree_view_column_pack_start (column, cell, FALSE);
+-        gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
++        gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
+         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
+     }
+ 
+@@ -377,7 +377,7 @@
+     PangoRectangle row_height;
+     pango_layout_set_markup (layout, "All Files", -1);
+     pango_layout_get_pixel_extents (layout, NULL, &row_height);
+-    g_object_get (cell, "ypad", &ypad, NULL);
++    g_object_get (cell, "ypad", &ypad, (void *)NULL);
+     guint height = (row_height.height + 2*ypad) * 5;
+     gtk_widget_set_size_request (m_pFilterView, -1, height);
+     gtk_widget_set_size_request (m_pPreview, 1, height);
+@@ -1414,7 +1414,7 @@
+ 	}
+ 	if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
+ 		g_object_set( pWidget, "label", aTxt.getStr(),
+-					  "use_underline", TRUE, NULL );
++					  "use_underline", TRUE, (void *)NULL );
+ 	else
+ 		OSL_TRACE("Can't set label on list\n");
+ }
+Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 SalGtkFolderPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	8 Sep 2005 23:35:19 -0000	1.6
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -125,7 +125,7 @@
+     m_pDialog = gtk_file_chooser_dialog_new(
+     	OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
+ 		NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
++		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 	gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.27
+diff -u -r1.27 salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	11 May 2006 10:00:59 -0000	1.27
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2006 00:59:16 -0000
+@@ -550,7 +550,7 @@
+ 	    gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									    "has-secondary-forward-stepper", &has_forward2,
+ 									    "has-backward-stepper", &has_backward,
+-	   								    "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								    "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+         Rectangle aForward;
+         Rectangle aBackward;
+ 
+@@ -910,7 +910,7 @@
+                                  gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
+             gtk_widget_style_get( pWidget,
+                                   "indicator_size", &indicator_size,
+-                                  NULL );
++                                  (void *)NULL );
+             rNativeBoundingRegion = rControlRegion;
+             Rectangle aIndicatorRect( Point( 0,
+                                              (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+@@ -928,7 +928,7 @@
+         gtk_widget_style_get( widget,
+                               "indicator_size", &indicator_size,
+                               "indicator_spacing", &indicator_spacing,
+-                              NULL);
++                              (void *)NULL);
+         indicator_size += 2*indicator_spacing; // guess overpaint of theme
+         rNativeBoundingRegion = rControlRegion;
+         Rectangle aIndicatorRect( Point( 0,
+@@ -978,7 +978,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1081,7 +1081,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1134,7 +1134,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1192,7 +1192,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1291,7 +1291,7 @@
+ 									  "stepper_size", &stepper_size,
+ 									  "trough_border", &trough_border,
+ 									  "stepper_spacing", &stepper_spacing,
+-									  "min_slider_length", &min_slider_length, NULL );
++									  "min_slider_length", &min_slider_length, (void *)NULL );
+     gboolean has_forward;
+     gboolean has_forward2;
+     gboolean has_backward;
+@@ -1300,7 +1300,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint magic = trough_border ? 1 : 0;
+     gint nFirst = 0;
+ 
+@@ -1570,7 +1570,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
+ 									  "stepper-size", &stepper_size,
+ 									  "trough-border", &trough_border,
+-	   								  "stepper-spacing", &stepper_spacing, NULL );
++	   								  "stepper-spacing", &stepper_spacing, (void *)NULL );
+ 
+     gboolean has_forward;
+     gboolean has_forward2;
+@@ -1580,7 +1580,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint       buttonWidth;
+ 	gint       buttonHeight;
+ 	Rectangle  buttonRect;
+@@ -1687,7 +1687,7 @@
+ 
+ 	// Grab some entry style attributes
+ 	gtk_widget_style_get( gEditBoxWidget,	"focus-line-width",	&focusWidth,
+-					 				"interior-focus",	&interiorFocus, NULL );
++					 				"interior-focus",	&interiorFocus, (void *)NULL );
+ 
+ 	if ( !interiorFocus )
+ 	{
+@@ -1838,7 +1838,7 @@
+ 	}
+ 
+ 	NWSetWidgetState( gSpinButtonWidget, nState, stateType );
+-	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
++	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
+ 
+ 	if ( shadowType != GTK_SHADOW_NONE )
+ 	{
+@@ -2048,7 +2048,7 @@
+ 
+ 	// Grab some button style attributes
+ 	gtk_widget_style_get( gDropdownWidget,	"focus-line-width",	&nFocusWidth,
+-									"focus-padding", 	&nFocusPad, NULL );
++									"focus-padding", 	&nFocusPad, (void *)NULL );
+ 
+ 	nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
+     nButtonWidth = nArrowWidth +
+@@ -2272,7 +2272,7 @@
+ 			"interior_focus",	&bInteriorFocus,
+ 			"focus_line_width",	&nFocusLineWidth,
+ 			"focus_padding",	&nFocusPadding,
+-			NULL);
++			(void *)NULL);
+     }
+     
+     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+@@ -2482,7 +2482,7 @@
+         {
+             gtk_widget_style_get( gMenuItemMenubarWidget,
+                                   "selected_shadow_type", &selected_shadow_type,
+-                                  NULL);
++                                  (void *)NULL);
+         }
+     }
+     
+@@ -2571,7 +2571,7 @@
+     {
+         gtk_widget_style_get( gMenuItemMenuWidget,
+                               "selected_shadow_type", &selected_shadow_type,
+-                              NULL);
++                              (void *)NULL);
+     }
+ 
+     NWSetWidgetState( gMenuWidget, nState, stateType );
+@@ -2730,7 +2730,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+ 		width = pIndicatorSize->width;
+@@ -2791,7 +2791,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+     {
+@@ -3074,11 +3074,11 @@
+     GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
+     gboolean blink = false;
+ 
+-    g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
++    g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
+     if( blink )
+     {
+         gint blink_time = STYLE_CURSOR_NOBLINKTIME;
+-        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
++        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
+         // set the blink_time if there is a setting and it is reasonable
+         // else leave the default value
+         if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
+@@ -3097,7 +3097,7 @@
+                           "slider-width", &slider_width,
+                           "trough-border", &trough_border,
+                           "min-slider-length", &min_slider_length,
+-                          NULL );
++                          (void *)NULL );
+     gint magic = trough_border ? 1 : 0;
+     aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
+     aStyleSet.SetMinThumbSize( min_slider_length - magic );
+@@ -3439,7 +3439,7 @@
+         gtk_widget_ensure_style( gToolbarWidget );
+         gtk_widget_style_get( gToolbarWidget,
+ 			                  "button_relief", &aRelief,
+-                              NULL);
++                              (void *)NULL);
+                               
+         gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
+         GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
+Index: vcl/unx/source/app/i18n_cb.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
+retrieving revision 1.28
+diff -u -r1.28 i18n_cb.cxx
+--- vcl/unx/source/app/i18n_cb.cxx	19 Apr 2006 13:56:47 -0000	1.28
++++ vcl/unx/source/app/i18n_cb.cxx	16 Jun 2006 00:59:17 -0000
+@@ -463,8 +463,8 @@
+   	point.y = mPosEvent.mnY + mPosEvent.mnHeight;
+ 
+   	XVaNestedList preedit_attr;
+-  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
+-  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
++  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
++  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
+   	XFree(preedit_attr);
+ 
+ 	return;
+@@ -600,7 +600,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( ic,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             ::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
+Index: vcl/unx/source/app/i18n_ic.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_ic.cxx
+--- vcl/unx/source/app/i18n_ic.cxx	16 Jan 2006 13:07:29 -0000	1.35
++++ vcl/unx/source/app/i18n_ic.cxx	16 Jun 2006 00:59:17 -0000
+@@ -137,7 +137,7 @@
+         a_dstlist = XVaCreateNestedList(
+                                         0,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+     else
+     {
+@@ -145,7 +145,7 @@
+                                         0,
+                                         XNVaNestedList, a_srclist,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+ 
+     return a_dstlist != NULL ? a_dstlist : a_srclist ;
+@@ -263,7 +263,7 @@
+                                                           XNStatusStartCallback, &aStatusStartCallback,
+                                                           XNStatusDoneCallback,  &aStatusDoneCallback,
+                                                           XNStatusDrawCallback,  &aStatusDrawCallback,
+-                                                          NULL );
++                                                          (void *)NULL );
+ 
+                 break;
+             }
+@@ -302,7 +302,7 @@
+                                                            XNPreeditDoneCallback,  &maPreeditDoneCallback,
+                                                            XNPreeditDrawCallback,   &maPreeditDrawCallback,
+                                                            XNPreeditCaretCallback, &maPreeditCaretCallback,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 break;
+ 
+@@ -324,7 +324,7 @@
+                 mpPreeditAttributes = XVaCreateNestedList (
+                                                            0,
+                                                            XNSpotLocation, &aSpot,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 // XCreateIC() fails on Redflag Linux 2.0 if there is no
+                 // fontset though the data itself is not evaluated nor is
+@@ -357,7 +357,7 @@
+                                            XNFocusWindow,       aFocusWindow,
+                                            XNClientWindow,      aClientWindow,
+                                            XNInputStyle,        mnPreeditStyle | mnStatusStyle,
+-                                           NULL );
++                                           (void *)NULL );
+ 
+         if ( mnPreeditStyle != XIMPreeditNone )
+         {
+@@ -377,7 +377,7 @@
+         }
+         maContext = XCreateIC( pInputMethod->GetMethod(),
+                                XNVaNestedList, mpAttributes,
+-                               NULL );
++                               (void *)NULL );
+     }
+ 
+     if ( maContext == NULL )
+@@ -416,7 +416,7 @@
+         XSetICValues( maContext,
+                       XNCommitStringCallback, &maCommitStringCallback,
+                       XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+     if ( maContext != NULL)
+     {
+@@ -424,7 +424,7 @@
+         maDestroyCallback.client_data = (XPointer)this;
+         XSetICValues( maContext,
+                       XNDestroyCallback,      &maDestroyCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+ 
+     if( mbMultiLingual )
+@@ -433,7 +433,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( maContext,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
+@@ -481,12 +481,12 @@
+ 
+                 maContext = XCreateIC( pInputMethod->GetMethod(),
+                                        XNVaNestedList, mpAttributes,
+-                                       NULL );
++                                       (void *)NULL );
+                 if ( maContext != NULL && mbMultiLingual )
+                     XSetICValues( maContext,
+                                   XNCommitStringCallback, &maCommitStringCallback,
+                                   XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                                  NULL );
++                                  (void *)NULL );
+             }
+             if( maClientData.pFrame != pFrame )
+                 SetICFocus( pFrame );
+@@ -529,7 +529,7 @@
+                               &aWindowAttributes );
+         XGetICValues ( maContext,
+                        XNFilterEvents, &nIMEventMask,
+-                       NULL);
++                       (void *)NULL);
+         nIMEventMask |= aWindowAttributes.your_event_mask;
+         XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
+     }
+@@ -685,8 +685,8 @@
+     aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
+     aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
+ 
+-    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
+-    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
++    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     XFree(preedit_attr);
+ 
+     I18NStatus::get().show( true, I18NStatus::contextmap );
+@@ -717,7 +717,7 @@
+         XSetICValues( maContext,
+                       XNFocusWindow,       aFocusWindow,
+                       XNClientWindow,      aClientWindow,
+-                      NULL );
++                      (void *)NULL );
+ 
+         if( maClientData.aInputEv.mpTextAttr )
+         {
+@@ -761,8 +761,8 @@
+     preedit_attr = XVaCreateNestedList(
+                                        0,
+                                        XNPreeditState, &preedit_state,
+-                                       NULL);
+-    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
++                                       (void *)NULL);
++    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
+     {
+         XFree(preedit_attr);
+ 
+@@ -770,8 +770,8 @@
+         preedit_attr = XVaCreateNestedList(
+                                            0,
+                                            XNPreeditState, preedit_state,
+-                                           NULL);
+-        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++                                           (void *)NULL);
++        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     }
+ 
+     XFree(preedit_attr);
+Index: vcl/unx/source/app/i18n_im.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_im.cxx
+--- vcl/unx/source/app/i18n_im.cxx	7 Apr 2006 08:04:45 -0000	1.35
++++ vcl/unx/source/app/i18n_im.cxx	16 Jun 2006 00:59:17 -0000
+@@ -427,13 +427,13 @@
+ 				mbMultiLingual = False;
+ 			else
+ 			if ( XGetIMValues(maMethod,
+-					XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
++					XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
+ 				mbMultiLingual = False;
+             if( mbMultiLingual )
+             {
+                 XIMUnicodeCharacterSubsets* subsets;
+                 if( XGetIMValues( maMethod,
+-                                  XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
++                                  XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
+                 {
+ #if OSL_DEBUG_LEVEL > 1
+                     fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
+@@ -473,7 +473,7 @@
+ 
+ 		if ( maMethod != (XIM)NULL )
+ 		{
+-			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
++			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
+ 				!= NULL)
+ 				mbUseable = False;
+             #if OSL_DEBUG_LEVEL > 1
+@@ -496,7 +496,7 @@
+     maDestroyCallback.callback	  = (XIMProc)IM_IMDestroyCallback;
+ 	maDestroyCallback.client_data = (XPointer)this;
+     if (mbUseable && maMethod != NULL)
+-        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
++        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
+ 
+ 	return mbUseable;
+ }
+Index: vcl/unx/source/app/i18n_status.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
+retrieving revision 1.30
+diff -u -r1.30 i18n_status.cxx
+--- vcl/unx/source/app/i18n_status.cxx	16 Jan 2006 13:08:00 -0000	1.30
++++ vcl/unx/source/app/i18n_status.cxx	16 Jun 2006 00:59:17 -0000
+@@ -502,7 +502,7 @@
+             XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
+                           XNUnicodeCharacterSubset,
+                           rChoices[nIndex].pData,
+-                          NULL);
++                          (void *)NULL);
+             // FIXME: get rid of X11SalFrame
+             X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
+             if( pParent && pParent->isMapped() )
diff --git a/editors/openoffice.org-2.0/files/patch-i66667 b/editors/openoffice.org-2.0/files/patch-i66667
new file mode 100644
index 000000000000..6e3a697c4bf0
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-i66667
@@ -0,0 +1,56 @@
+Index: gtkinst.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
+retrieving revision 1.13
+diff -u -r1.13 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
++++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+@@ -43,6 +43,7 @@
+ #include <plugins/gtk/atkbridge.hxx>
+ 
+ #include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ #include <stdio.h>
+@@ -111,13 +112,28 @@
+ 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
+ 		pYieldMutex->ThreadsLeave();
+ 	}
+-	static bool hookLocks( oslModule pModule )
++	static bool hookLocks( void )
+ 	{
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
+ 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ 
++		/* XXX GDK library path should be set by configure. */
++		OUStringBuffer aModName( 128 );
++		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
++		aModName.appendAscii( SAL_DLLEXTENSION );
++		OUString aModule = aModName.makeStringAndClear();
++		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
++
++		if ( !aMod )
++		{
++#if OSL_DEBUG_LEVEL > 1
++		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
++#endif
++			return false;
++		}
++
+ 		GdkLockFn gdk_threads_set_lock_functions =
+-				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
++				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
+ 		if ( !gdk_threads_set_lock_functions )
+ 		{
+ #if OSL_DEBUG_LEVEL > 1
+@@ -150,7 +166,7 @@
+ 		if ( !g_thread_supported() )
+ 			g_thread_init( NULL );
+ 
+-		if ( hookLocks( pModule ) )
++		if ( hookLocks() )
+ 			pYieldMutex = new GtkHookedYieldMutex();
+ 		else
+ 			pYieldMutex = new GtkYieldMutex();
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index de0de65c256a..c794c2d84395 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -15,19 +15,19 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${OOOVERSION}_src_060601.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOVERSION}_src_060601.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-OOOVERSION=	2.0.3rc5
+OOOVERSION=	2.0.3rc6
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -71,7 +71,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOC680_m5
+OOOTAG?=		OOC680_m6
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 3a5518feaa83..75dcc4fc9e8a 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = caef8f901a69a990b8747c92581078ac
-SHA256 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 00bd7716b7abf74001ccfdf94022cb8e87a13bd96e44205ebba967c1fc200b14
-SIZE (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 307315179
+MD5 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 6e77a24432359a1cfa860c827b2d1832
+SHA256 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 95bb5fe24f2e1df7a5c6209d0f52e92297abf4d1c3553fd3e47fda75b764d03e
+SIZE (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 307311939
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2/files/patch-i66666 b/editors/openoffice.org-2/files/patch-i66666
new file mode 100644
index 000000000000..8c288b9c3875
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i66666
@@ -0,0 +1,537 @@
+it also includes the following patch
+http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
+from i66686 (dupe of i66666)
+Index: tools/inc/solar.h
+===================================================================
+RCS file: /cvs/util/tools/inc/solar.h,v
+retrieving revision 1.44
+diff -u -r1.44 solar.h
+--- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
++++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
+@@ -55,9 +55,6 @@
+ #define FALSE		0
+ #endif
+ 
+-#undef NULL
+-#define NULL		0
+-
+ #ifdef _SOLAR__PRIVATE
+ #undef _SOLAR__PRIVATE
+ #endif
+
+Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx	29 Mar 2006 07:41:24 -0000	1.11
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -208,7 +208,7 @@
+ 			GTK_FILE_CHOOSER_ACTION_OPEN,
+ 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ 			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+-			NULL );
++			(void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 
+@@ -347,7 +347,7 @@
+         cell = gtk_cell_renderer_text_new ();
+         gtk_tree_view_column_set_expand (column, TRUE);
+         gtk_tree_view_column_pack_start (column, cell, FALSE);
+-        gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
++        gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
+         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
+     }
+ 
+@@ -377,7 +377,7 @@
+     PangoRectangle row_height;
+     pango_layout_set_markup (layout, "All Files", -1);
+     pango_layout_get_pixel_extents (layout, NULL, &row_height);
+-    g_object_get (cell, "ypad", &ypad, NULL);
++    g_object_get (cell, "ypad", &ypad, (void *)NULL);
+     guint height = (row_height.height + 2*ypad) * 5;
+     gtk_widget_set_size_request (m_pFilterView, -1, height);
+     gtk_widget_set_size_request (m_pPreview, 1, height);
+@@ -1414,7 +1414,7 @@
+ 	}
+ 	if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
+ 		g_object_set( pWidget, "label", aTxt.getStr(),
+-					  "use_underline", TRUE, NULL );
++					  "use_underline", TRUE, (void *)NULL );
+ 	else
+ 		OSL_TRACE("Can't set label on list\n");
+ }
+Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 SalGtkFolderPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	8 Sep 2005 23:35:19 -0000	1.6
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -125,7 +125,7 @@
+     m_pDialog = gtk_file_chooser_dialog_new(
+     	OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
+ 		NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
++		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 	gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.27
+diff -u -r1.27 salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	11 May 2006 10:00:59 -0000	1.27
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2006 00:59:16 -0000
+@@ -550,7 +550,7 @@
+ 	    gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									    "has-secondary-forward-stepper", &has_forward2,
+ 									    "has-backward-stepper", &has_backward,
+-	   								    "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								    "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+         Rectangle aForward;
+         Rectangle aBackward;
+ 
+@@ -910,7 +910,7 @@
+                                  gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
+             gtk_widget_style_get( pWidget,
+                                   "indicator_size", &indicator_size,
+-                                  NULL );
++                                  (void *)NULL );
+             rNativeBoundingRegion = rControlRegion;
+             Rectangle aIndicatorRect( Point( 0,
+                                              (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+@@ -928,7 +928,7 @@
+         gtk_widget_style_get( widget,
+                               "indicator_size", &indicator_size,
+                               "indicator_spacing", &indicator_spacing,
+-                              NULL);
++                              (void *)NULL);
+         indicator_size += 2*indicator_spacing; // guess overpaint of theme
+         rNativeBoundingRegion = rControlRegion;
+         Rectangle aIndicatorRect( Point( 0,
+@@ -978,7 +978,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1081,7 +1081,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1134,7 +1134,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1192,7 +1192,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1291,7 +1291,7 @@
+ 									  "stepper_size", &stepper_size,
+ 									  "trough_border", &trough_border,
+ 									  "stepper_spacing", &stepper_spacing,
+-									  "min_slider_length", &min_slider_length, NULL );
++									  "min_slider_length", &min_slider_length, (void *)NULL );
+     gboolean has_forward;
+     gboolean has_forward2;
+     gboolean has_backward;
+@@ -1300,7 +1300,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint magic = trough_border ? 1 : 0;
+     gint nFirst = 0;
+ 
+@@ -1570,7 +1570,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
+ 									  "stepper-size", &stepper_size,
+ 									  "trough-border", &trough_border,
+-	   								  "stepper-spacing", &stepper_spacing, NULL );
++	   								  "stepper-spacing", &stepper_spacing, (void *)NULL );
+ 
+     gboolean has_forward;
+     gboolean has_forward2;
+@@ -1580,7 +1580,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint       buttonWidth;
+ 	gint       buttonHeight;
+ 	Rectangle  buttonRect;
+@@ -1687,7 +1687,7 @@
+ 
+ 	// Grab some entry style attributes
+ 	gtk_widget_style_get( gEditBoxWidget,	"focus-line-width",	&focusWidth,
+-					 				"interior-focus",	&interiorFocus, NULL );
++					 				"interior-focus",	&interiorFocus, (void *)NULL );
+ 
+ 	if ( !interiorFocus )
+ 	{
+@@ -1838,7 +1838,7 @@
+ 	}
+ 
+ 	NWSetWidgetState( gSpinButtonWidget, nState, stateType );
+-	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
++	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
+ 
+ 	if ( shadowType != GTK_SHADOW_NONE )
+ 	{
+@@ -2048,7 +2048,7 @@
+ 
+ 	// Grab some button style attributes
+ 	gtk_widget_style_get( gDropdownWidget,	"focus-line-width",	&nFocusWidth,
+-									"focus-padding", 	&nFocusPad, NULL );
++									"focus-padding", 	&nFocusPad, (void *)NULL );
+ 
+ 	nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
+     nButtonWidth = nArrowWidth +
+@@ -2272,7 +2272,7 @@
+ 			"interior_focus",	&bInteriorFocus,
+ 			"focus_line_width",	&nFocusLineWidth,
+ 			"focus_padding",	&nFocusPadding,
+-			NULL);
++			(void *)NULL);
+     }
+     
+     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+@@ -2482,7 +2482,7 @@
+         {
+             gtk_widget_style_get( gMenuItemMenubarWidget,
+                                   "selected_shadow_type", &selected_shadow_type,
+-                                  NULL);
++                                  (void *)NULL);
+         }
+     }
+     
+@@ -2571,7 +2571,7 @@
+     {
+         gtk_widget_style_get( gMenuItemMenuWidget,
+                               "selected_shadow_type", &selected_shadow_type,
+-                              NULL);
++                              (void *)NULL);
+     }
+ 
+     NWSetWidgetState( gMenuWidget, nState, stateType );
+@@ -2730,7 +2730,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+ 		width = pIndicatorSize->width;
+@@ -2791,7 +2791,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+     {
+@@ -3074,11 +3074,11 @@
+     GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
+     gboolean blink = false;
+ 
+-    g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
++    g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
+     if( blink )
+     {
+         gint blink_time = STYLE_CURSOR_NOBLINKTIME;
+-        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
++        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
+         // set the blink_time if there is a setting and it is reasonable
+         // else leave the default value
+         if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
+@@ -3097,7 +3097,7 @@
+                           "slider-width", &slider_width,
+                           "trough-border", &trough_border,
+                           "min-slider-length", &min_slider_length,
+-                          NULL );
++                          (void *)NULL );
+     gint magic = trough_border ? 1 : 0;
+     aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
+     aStyleSet.SetMinThumbSize( min_slider_length - magic );
+@@ -3439,7 +3439,7 @@
+         gtk_widget_ensure_style( gToolbarWidget );
+         gtk_widget_style_get( gToolbarWidget,
+ 			                  "button_relief", &aRelief,
+-                              NULL);
++                              (void *)NULL);
+                               
+         gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
+         GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
+Index: vcl/unx/source/app/i18n_cb.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
+retrieving revision 1.28
+diff -u -r1.28 i18n_cb.cxx
+--- vcl/unx/source/app/i18n_cb.cxx	19 Apr 2006 13:56:47 -0000	1.28
++++ vcl/unx/source/app/i18n_cb.cxx	16 Jun 2006 00:59:17 -0000
+@@ -463,8 +463,8 @@
+   	point.y = mPosEvent.mnY + mPosEvent.mnHeight;
+ 
+   	XVaNestedList preedit_attr;
+-  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
+-  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
++  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
++  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
+   	XFree(preedit_attr);
+ 
+ 	return;
+@@ -600,7 +600,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( ic,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             ::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
+Index: vcl/unx/source/app/i18n_ic.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_ic.cxx
+--- vcl/unx/source/app/i18n_ic.cxx	16 Jan 2006 13:07:29 -0000	1.35
++++ vcl/unx/source/app/i18n_ic.cxx	16 Jun 2006 00:59:17 -0000
+@@ -137,7 +137,7 @@
+         a_dstlist = XVaCreateNestedList(
+                                         0,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+     else
+     {
+@@ -145,7 +145,7 @@
+                                         0,
+                                         XNVaNestedList, a_srclist,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+ 
+     return a_dstlist != NULL ? a_dstlist : a_srclist ;
+@@ -263,7 +263,7 @@
+                                                           XNStatusStartCallback, &aStatusStartCallback,
+                                                           XNStatusDoneCallback,  &aStatusDoneCallback,
+                                                           XNStatusDrawCallback,  &aStatusDrawCallback,
+-                                                          NULL );
++                                                          (void *)NULL );
+ 
+                 break;
+             }
+@@ -302,7 +302,7 @@
+                                                            XNPreeditDoneCallback,  &maPreeditDoneCallback,
+                                                            XNPreeditDrawCallback,   &maPreeditDrawCallback,
+                                                            XNPreeditCaretCallback, &maPreeditCaretCallback,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 break;
+ 
+@@ -324,7 +324,7 @@
+                 mpPreeditAttributes = XVaCreateNestedList (
+                                                            0,
+                                                            XNSpotLocation, &aSpot,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 // XCreateIC() fails on Redflag Linux 2.0 if there is no
+                 // fontset though the data itself is not evaluated nor is
+@@ -357,7 +357,7 @@
+                                            XNFocusWindow,       aFocusWindow,
+                                            XNClientWindow,      aClientWindow,
+                                            XNInputStyle,        mnPreeditStyle | mnStatusStyle,
+-                                           NULL );
++                                           (void *)NULL );
+ 
+         if ( mnPreeditStyle != XIMPreeditNone )
+         {
+@@ -377,7 +377,7 @@
+         }
+         maContext = XCreateIC( pInputMethod->GetMethod(),
+                                XNVaNestedList, mpAttributes,
+-                               NULL );
++                               (void *)NULL );
+     }
+ 
+     if ( maContext == NULL )
+@@ -416,7 +416,7 @@
+         XSetICValues( maContext,
+                       XNCommitStringCallback, &maCommitStringCallback,
+                       XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+     if ( maContext != NULL)
+     {
+@@ -424,7 +424,7 @@
+         maDestroyCallback.client_data = (XPointer)this;
+         XSetICValues( maContext,
+                       XNDestroyCallback,      &maDestroyCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+ 
+     if( mbMultiLingual )
+@@ -433,7 +433,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( maContext,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
+@@ -481,12 +481,12 @@
+ 
+                 maContext = XCreateIC( pInputMethod->GetMethod(),
+                                        XNVaNestedList, mpAttributes,
+-                                       NULL );
++                                       (void *)NULL );
+                 if ( maContext != NULL && mbMultiLingual )
+                     XSetICValues( maContext,
+                                   XNCommitStringCallback, &maCommitStringCallback,
+                                   XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                                  NULL );
++                                  (void *)NULL );
+             }
+             if( maClientData.pFrame != pFrame )
+                 SetICFocus( pFrame );
+@@ -529,7 +529,7 @@
+                               &aWindowAttributes );
+         XGetICValues ( maContext,
+                        XNFilterEvents, &nIMEventMask,
+-                       NULL);
++                       (void *)NULL);
+         nIMEventMask |= aWindowAttributes.your_event_mask;
+         XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
+     }
+@@ -685,8 +685,8 @@
+     aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
+     aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
+ 
+-    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
+-    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
++    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     XFree(preedit_attr);
+ 
+     I18NStatus::get().show( true, I18NStatus::contextmap );
+@@ -717,7 +717,7 @@
+         XSetICValues( maContext,
+                       XNFocusWindow,       aFocusWindow,
+                       XNClientWindow,      aClientWindow,
+-                      NULL );
++                      (void *)NULL );
+ 
+         if( maClientData.aInputEv.mpTextAttr )
+         {
+@@ -761,8 +761,8 @@
+     preedit_attr = XVaCreateNestedList(
+                                        0,
+                                        XNPreeditState, &preedit_state,
+-                                       NULL);
+-    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
++                                       (void *)NULL);
++    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
+     {
+         XFree(preedit_attr);
+ 
+@@ -770,8 +770,8 @@
+         preedit_attr = XVaCreateNestedList(
+                                            0,
+                                            XNPreeditState, preedit_state,
+-                                           NULL);
+-        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++                                           (void *)NULL);
++        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     }
+ 
+     XFree(preedit_attr);
+Index: vcl/unx/source/app/i18n_im.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_im.cxx
+--- vcl/unx/source/app/i18n_im.cxx	7 Apr 2006 08:04:45 -0000	1.35
++++ vcl/unx/source/app/i18n_im.cxx	16 Jun 2006 00:59:17 -0000
+@@ -427,13 +427,13 @@
+ 				mbMultiLingual = False;
+ 			else
+ 			if ( XGetIMValues(maMethod,
+-					XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
++					XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
+ 				mbMultiLingual = False;
+             if( mbMultiLingual )
+             {
+                 XIMUnicodeCharacterSubsets* subsets;
+                 if( XGetIMValues( maMethod,
+-                                  XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
++                                  XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
+                 {
+ #if OSL_DEBUG_LEVEL > 1
+                     fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
+@@ -473,7 +473,7 @@
+ 
+ 		if ( maMethod != (XIM)NULL )
+ 		{
+-			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
++			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
+ 				!= NULL)
+ 				mbUseable = False;
+             #if OSL_DEBUG_LEVEL > 1
+@@ -496,7 +496,7 @@
+     maDestroyCallback.callback	  = (XIMProc)IM_IMDestroyCallback;
+ 	maDestroyCallback.client_data = (XPointer)this;
+     if (mbUseable && maMethod != NULL)
+-        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
++        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
+ 
+ 	return mbUseable;
+ }
+Index: vcl/unx/source/app/i18n_status.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
+retrieving revision 1.30
+diff -u -r1.30 i18n_status.cxx
+--- vcl/unx/source/app/i18n_status.cxx	16 Jan 2006 13:08:00 -0000	1.30
++++ vcl/unx/source/app/i18n_status.cxx	16 Jun 2006 00:59:17 -0000
+@@ -502,7 +502,7 @@
+             XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
+                           XNUnicodeCharacterSubset,
+                           rChoices[nIndex].pData,
+-                          NULL);
++                          (void *)NULL);
+             // FIXME: get rid of X11SalFrame
+             X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
+             if( pParent && pParent->isMapped() )
diff --git a/editors/openoffice.org-2/files/patch-i66667 b/editors/openoffice.org-2/files/patch-i66667
new file mode 100644
index 000000000000..6e3a697c4bf0
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i66667
@@ -0,0 +1,56 @@
+Index: gtkinst.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
+retrieving revision 1.13
+diff -u -r1.13 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
++++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+@@ -43,6 +43,7 @@
+ #include <plugins/gtk/atkbridge.hxx>
+ 
+ #include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ #include <stdio.h>
+@@ -111,13 +112,28 @@
+ 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
+ 		pYieldMutex->ThreadsLeave();
+ 	}
+-	static bool hookLocks( oslModule pModule )
++	static bool hookLocks( void )
+ 	{
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
+ 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ 
++		/* XXX GDK library path should be set by configure. */
++		OUStringBuffer aModName( 128 );
++		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
++		aModName.appendAscii( SAL_DLLEXTENSION );
++		OUString aModule = aModName.makeStringAndClear();
++		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
++
++		if ( !aMod )
++		{
++#if OSL_DEBUG_LEVEL > 1
++		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
++#endif
++			return false;
++		}
++
+ 		GdkLockFn gdk_threads_set_lock_functions =
+-				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
++				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
+ 		if ( !gdk_threads_set_lock_functions )
+ 		{
+ #if OSL_DEBUG_LEVEL > 1
+@@ -150,7 +166,7 @@
+ 		if ( !g_thread_supported() )
+ 			g_thread_init( NULL );
+ 
+-		if ( hookLocks( pModule ) )
++		if ( hookLocks() )
+ 			pYieldMutex = new GtkHookedYieldMutex();
+ 		else
+ 			pYieldMutex = new GtkYieldMutex();
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index de0de65c256a..c794c2d84395 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -15,19 +15,19 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${OOOVERSION}_src_060601.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOVERSION}_src_060601.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-OOOVERSION=	2.0.3rc5
+OOOVERSION=	2.0.3rc6
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -71,7 +71,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOC680_m5
+OOOTAG?=		OOC680_m6
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 3a5518feaa83..75dcc4fc9e8a 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = caef8f901a69a990b8747c92581078ac
-SHA256 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 00bd7716b7abf74001ccfdf94022cb8e87a13bd96e44205ebba967c1fc200b14
-SIZE (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 307315179
+MD5 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 6e77a24432359a1cfa860c827b2d1832
+SHA256 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 95bb5fe24f2e1df7a5c6209d0f52e92297abf4d1c3553fd3e47fda75b764d03e
+SIZE (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 307311939
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-RC/files/patch-i66666 b/editors/openoffice.org-3-RC/files/patch-i66666
new file mode 100644
index 000000000000..8c288b9c3875
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i66666
@@ -0,0 +1,537 @@
+it also includes the following patch
+http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
+from i66686 (dupe of i66666)
+Index: tools/inc/solar.h
+===================================================================
+RCS file: /cvs/util/tools/inc/solar.h,v
+retrieving revision 1.44
+diff -u -r1.44 solar.h
+--- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
++++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
+@@ -55,9 +55,6 @@
+ #define FALSE		0
+ #endif
+ 
+-#undef NULL
+-#define NULL		0
+-
+ #ifdef _SOLAR__PRIVATE
+ #undef _SOLAR__PRIVATE
+ #endif
+
+Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx	29 Mar 2006 07:41:24 -0000	1.11
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -208,7 +208,7 @@
+ 			GTK_FILE_CHOOSER_ACTION_OPEN,
+ 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ 			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+-			NULL );
++			(void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 
+@@ -347,7 +347,7 @@
+         cell = gtk_cell_renderer_text_new ();
+         gtk_tree_view_column_set_expand (column, TRUE);
+         gtk_tree_view_column_pack_start (column, cell, FALSE);
+-        gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
++        gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
+         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
+     }
+ 
+@@ -377,7 +377,7 @@
+     PangoRectangle row_height;
+     pango_layout_set_markup (layout, "All Files", -1);
+     pango_layout_get_pixel_extents (layout, NULL, &row_height);
+-    g_object_get (cell, "ypad", &ypad, NULL);
++    g_object_get (cell, "ypad", &ypad, (void *)NULL);
+     guint height = (row_height.height + 2*ypad) * 5;
+     gtk_widget_set_size_request (m_pFilterView, -1, height);
+     gtk_widget_set_size_request (m_pPreview, 1, height);
+@@ -1414,7 +1414,7 @@
+ 	}
+ 	if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
+ 		g_object_set( pWidget, "label", aTxt.getStr(),
+-					  "use_underline", TRUE, NULL );
++					  "use_underline", TRUE, (void *)NULL );
+ 	else
+ 		OSL_TRACE("Can't set label on list\n");
+ }
+Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 SalGtkFolderPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	8 Sep 2005 23:35:19 -0000	1.6
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -125,7 +125,7 @@
+     m_pDialog = gtk_file_chooser_dialog_new(
+     	OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
+ 		NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
++		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 	gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.27
+diff -u -r1.27 salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	11 May 2006 10:00:59 -0000	1.27
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2006 00:59:16 -0000
+@@ -550,7 +550,7 @@
+ 	    gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									    "has-secondary-forward-stepper", &has_forward2,
+ 									    "has-backward-stepper", &has_backward,
+-	   								    "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								    "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+         Rectangle aForward;
+         Rectangle aBackward;
+ 
+@@ -910,7 +910,7 @@
+                                  gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
+             gtk_widget_style_get( pWidget,
+                                   "indicator_size", &indicator_size,
+-                                  NULL );
++                                  (void *)NULL );
+             rNativeBoundingRegion = rControlRegion;
+             Rectangle aIndicatorRect( Point( 0,
+                                              (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+@@ -928,7 +928,7 @@
+         gtk_widget_style_get( widget,
+                               "indicator_size", &indicator_size,
+                               "indicator_spacing", &indicator_spacing,
+-                              NULL);
++                              (void *)NULL);
+         indicator_size += 2*indicator_spacing; // guess overpaint of theme
+         rNativeBoundingRegion = rControlRegion;
+         Rectangle aIndicatorRect( Point( 0,
+@@ -978,7 +978,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1081,7 +1081,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1134,7 +1134,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1192,7 +1192,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1291,7 +1291,7 @@
+ 									  "stepper_size", &stepper_size,
+ 									  "trough_border", &trough_border,
+ 									  "stepper_spacing", &stepper_spacing,
+-									  "min_slider_length", &min_slider_length, NULL );
++									  "min_slider_length", &min_slider_length, (void *)NULL );
+     gboolean has_forward;
+     gboolean has_forward2;
+     gboolean has_backward;
+@@ -1300,7 +1300,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint magic = trough_border ? 1 : 0;
+     gint nFirst = 0;
+ 
+@@ -1570,7 +1570,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
+ 									  "stepper-size", &stepper_size,
+ 									  "trough-border", &trough_border,
+-	   								  "stepper-spacing", &stepper_spacing, NULL );
++	   								  "stepper-spacing", &stepper_spacing, (void *)NULL );
+ 
+     gboolean has_forward;
+     gboolean has_forward2;
+@@ -1580,7 +1580,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint       buttonWidth;
+ 	gint       buttonHeight;
+ 	Rectangle  buttonRect;
+@@ -1687,7 +1687,7 @@
+ 
+ 	// Grab some entry style attributes
+ 	gtk_widget_style_get( gEditBoxWidget,	"focus-line-width",	&focusWidth,
+-					 				"interior-focus",	&interiorFocus, NULL );
++					 				"interior-focus",	&interiorFocus, (void *)NULL );
+ 
+ 	if ( !interiorFocus )
+ 	{
+@@ -1838,7 +1838,7 @@
+ 	}
+ 
+ 	NWSetWidgetState( gSpinButtonWidget, nState, stateType );
+-	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
++	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
+ 
+ 	if ( shadowType != GTK_SHADOW_NONE )
+ 	{
+@@ -2048,7 +2048,7 @@
+ 
+ 	// Grab some button style attributes
+ 	gtk_widget_style_get( gDropdownWidget,	"focus-line-width",	&nFocusWidth,
+-									"focus-padding", 	&nFocusPad, NULL );
++									"focus-padding", 	&nFocusPad, (void *)NULL );
+ 
+ 	nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
+     nButtonWidth = nArrowWidth +
+@@ -2272,7 +2272,7 @@
+ 			"interior_focus",	&bInteriorFocus,
+ 			"focus_line_width",	&nFocusLineWidth,
+ 			"focus_padding",	&nFocusPadding,
+-			NULL);
++			(void *)NULL);
+     }
+     
+     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+@@ -2482,7 +2482,7 @@
+         {
+             gtk_widget_style_get( gMenuItemMenubarWidget,
+                                   "selected_shadow_type", &selected_shadow_type,
+-                                  NULL);
++                                  (void *)NULL);
+         }
+     }
+     
+@@ -2571,7 +2571,7 @@
+     {
+         gtk_widget_style_get( gMenuItemMenuWidget,
+                               "selected_shadow_type", &selected_shadow_type,
+-                              NULL);
++                              (void *)NULL);
+     }
+ 
+     NWSetWidgetState( gMenuWidget, nState, stateType );
+@@ -2730,7 +2730,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+ 		width = pIndicatorSize->width;
+@@ -2791,7 +2791,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+     {
+@@ -3074,11 +3074,11 @@
+     GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
+     gboolean blink = false;
+ 
+-    g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
++    g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
+     if( blink )
+     {
+         gint blink_time = STYLE_CURSOR_NOBLINKTIME;
+-        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
++        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
+         // set the blink_time if there is a setting and it is reasonable
+         // else leave the default value
+         if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
+@@ -3097,7 +3097,7 @@
+                           "slider-width", &slider_width,
+                           "trough-border", &trough_border,
+                           "min-slider-length", &min_slider_length,
+-                          NULL );
++                          (void *)NULL );
+     gint magic = trough_border ? 1 : 0;
+     aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
+     aStyleSet.SetMinThumbSize( min_slider_length - magic );
+@@ -3439,7 +3439,7 @@
+         gtk_widget_ensure_style( gToolbarWidget );
+         gtk_widget_style_get( gToolbarWidget,
+ 			                  "button_relief", &aRelief,
+-                              NULL);
++                              (void *)NULL);
+                               
+         gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
+         GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
+Index: vcl/unx/source/app/i18n_cb.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
+retrieving revision 1.28
+diff -u -r1.28 i18n_cb.cxx
+--- vcl/unx/source/app/i18n_cb.cxx	19 Apr 2006 13:56:47 -0000	1.28
++++ vcl/unx/source/app/i18n_cb.cxx	16 Jun 2006 00:59:17 -0000
+@@ -463,8 +463,8 @@
+   	point.y = mPosEvent.mnY + mPosEvent.mnHeight;
+ 
+   	XVaNestedList preedit_attr;
+-  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
+-  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
++  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
++  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
+   	XFree(preedit_attr);
+ 
+ 	return;
+@@ -600,7 +600,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( ic,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             ::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
+Index: vcl/unx/source/app/i18n_ic.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_ic.cxx
+--- vcl/unx/source/app/i18n_ic.cxx	16 Jan 2006 13:07:29 -0000	1.35
++++ vcl/unx/source/app/i18n_ic.cxx	16 Jun 2006 00:59:17 -0000
+@@ -137,7 +137,7 @@
+         a_dstlist = XVaCreateNestedList(
+                                         0,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+     else
+     {
+@@ -145,7 +145,7 @@
+                                         0,
+                                         XNVaNestedList, a_srclist,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+ 
+     return a_dstlist != NULL ? a_dstlist : a_srclist ;
+@@ -263,7 +263,7 @@
+                                                           XNStatusStartCallback, &aStatusStartCallback,
+                                                           XNStatusDoneCallback,  &aStatusDoneCallback,
+                                                           XNStatusDrawCallback,  &aStatusDrawCallback,
+-                                                          NULL );
++                                                          (void *)NULL );
+ 
+                 break;
+             }
+@@ -302,7 +302,7 @@
+                                                            XNPreeditDoneCallback,  &maPreeditDoneCallback,
+                                                            XNPreeditDrawCallback,   &maPreeditDrawCallback,
+                                                            XNPreeditCaretCallback, &maPreeditCaretCallback,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 break;
+ 
+@@ -324,7 +324,7 @@
+                 mpPreeditAttributes = XVaCreateNestedList (
+                                                            0,
+                                                            XNSpotLocation, &aSpot,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 // XCreateIC() fails on Redflag Linux 2.0 if there is no
+                 // fontset though the data itself is not evaluated nor is
+@@ -357,7 +357,7 @@
+                                            XNFocusWindow,       aFocusWindow,
+                                            XNClientWindow,      aClientWindow,
+                                            XNInputStyle,        mnPreeditStyle | mnStatusStyle,
+-                                           NULL );
++                                           (void *)NULL );
+ 
+         if ( mnPreeditStyle != XIMPreeditNone )
+         {
+@@ -377,7 +377,7 @@
+         }
+         maContext = XCreateIC( pInputMethod->GetMethod(),
+                                XNVaNestedList, mpAttributes,
+-                               NULL );
++                               (void *)NULL );
+     }
+ 
+     if ( maContext == NULL )
+@@ -416,7 +416,7 @@
+         XSetICValues( maContext,
+                       XNCommitStringCallback, &maCommitStringCallback,
+                       XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+     if ( maContext != NULL)
+     {
+@@ -424,7 +424,7 @@
+         maDestroyCallback.client_data = (XPointer)this;
+         XSetICValues( maContext,
+                       XNDestroyCallback,      &maDestroyCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+ 
+     if( mbMultiLingual )
+@@ -433,7 +433,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( maContext,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
+@@ -481,12 +481,12 @@
+ 
+                 maContext = XCreateIC( pInputMethod->GetMethod(),
+                                        XNVaNestedList, mpAttributes,
+-                                       NULL );
++                                       (void *)NULL );
+                 if ( maContext != NULL && mbMultiLingual )
+                     XSetICValues( maContext,
+                                   XNCommitStringCallback, &maCommitStringCallback,
+                                   XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                                  NULL );
++                                  (void *)NULL );
+             }
+             if( maClientData.pFrame != pFrame )
+                 SetICFocus( pFrame );
+@@ -529,7 +529,7 @@
+                               &aWindowAttributes );
+         XGetICValues ( maContext,
+                        XNFilterEvents, &nIMEventMask,
+-                       NULL);
++                       (void *)NULL);
+         nIMEventMask |= aWindowAttributes.your_event_mask;
+         XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
+     }
+@@ -685,8 +685,8 @@
+     aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
+     aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
+ 
+-    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
+-    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
++    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     XFree(preedit_attr);
+ 
+     I18NStatus::get().show( true, I18NStatus::contextmap );
+@@ -717,7 +717,7 @@
+         XSetICValues( maContext,
+                       XNFocusWindow,       aFocusWindow,
+                       XNClientWindow,      aClientWindow,
+-                      NULL );
++                      (void *)NULL );
+ 
+         if( maClientData.aInputEv.mpTextAttr )
+         {
+@@ -761,8 +761,8 @@
+     preedit_attr = XVaCreateNestedList(
+                                        0,
+                                        XNPreeditState, &preedit_state,
+-                                       NULL);
+-    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
++                                       (void *)NULL);
++    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
+     {
+         XFree(preedit_attr);
+ 
+@@ -770,8 +770,8 @@
+         preedit_attr = XVaCreateNestedList(
+                                            0,
+                                            XNPreeditState, preedit_state,
+-                                           NULL);
+-        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++                                           (void *)NULL);
++        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     }
+ 
+     XFree(preedit_attr);
+Index: vcl/unx/source/app/i18n_im.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_im.cxx
+--- vcl/unx/source/app/i18n_im.cxx	7 Apr 2006 08:04:45 -0000	1.35
++++ vcl/unx/source/app/i18n_im.cxx	16 Jun 2006 00:59:17 -0000
+@@ -427,13 +427,13 @@
+ 				mbMultiLingual = False;
+ 			else
+ 			if ( XGetIMValues(maMethod,
+-					XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
++					XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
+ 				mbMultiLingual = False;
+             if( mbMultiLingual )
+             {
+                 XIMUnicodeCharacterSubsets* subsets;
+                 if( XGetIMValues( maMethod,
+-                                  XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
++                                  XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
+                 {
+ #if OSL_DEBUG_LEVEL > 1
+                     fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
+@@ -473,7 +473,7 @@
+ 
+ 		if ( maMethod != (XIM)NULL )
+ 		{
+-			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
++			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
+ 				!= NULL)
+ 				mbUseable = False;
+             #if OSL_DEBUG_LEVEL > 1
+@@ -496,7 +496,7 @@
+     maDestroyCallback.callback	  = (XIMProc)IM_IMDestroyCallback;
+ 	maDestroyCallback.client_data = (XPointer)this;
+     if (mbUseable && maMethod != NULL)
+-        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
++        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
+ 
+ 	return mbUseable;
+ }
+Index: vcl/unx/source/app/i18n_status.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
+retrieving revision 1.30
+diff -u -r1.30 i18n_status.cxx
+--- vcl/unx/source/app/i18n_status.cxx	16 Jan 2006 13:08:00 -0000	1.30
++++ vcl/unx/source/app/i18n_status.cxx	16 Jun 2006 00:59:17 -0000
+@@ -502,7 +502,7 @@
+             XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
+                           XNUnicodeCharacterSubset,
+                           rChoices[nIndex].pData,
+-                          NULL);
++                          (void *)NULL);
+             // FIXME: get rid of X11SalFrame
+             X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
+             if( pParent && pParent->isMapped() )
diff --git a/editors/openoffice.org-3-RC/files/patch-i66667 b/editors/openoffice.org-3-RC/files/patch-i66667
new file mode 100644
index 000000000000..6e3a697c4bf0
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i66667
@@ -0,0 +1,56 @@
+Index: gtkinst.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
+retrieving revision 1.13
+diff -u -r1.13 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
++++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+@@ -43,6 +43,7 @@
+ #include <plugins/gtk/atkbridge.hxx>
+ 
+ #include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ #include <stdio.h>
+@@ -111,13 +112,28 @@
+ 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
+ 		pYieldMutex->ThreadsLeave();
+ 	}
+-	static bool hookLocks( oslModule pModule )
++	static bool hookLocks( void )
+ 	{
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
+ 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ 
++		/* XXX GDK library path should be set by configure. */
++		OUStringBuffer aModName( 128 );
++		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
++		aModName.appendAscii( SAL_DLLEXTENSION );
++		OUString aModule = aModName.makeStringAndClear();
++		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
++
++		if ( !aMod )
++		{
++#if OSL_DEBUG_LEVEL > 1
++		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
++#endif
++			return false;
++		}
++
+ 		GdkLockFn gdk_threads_set_lock_functions =
+-				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
++				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
+ 		if ( !gdk_threads_set_lock_functions )
+ 		{
+ #if OSL_DEBUG_LEVEL > 1
+@@ -150,7 +166,7 @@
+ 		if ( !g_thread_supported() )
+ 			g_thread_init( NULL );
+ 
+-		if ( hookLocks( pModule ) )
++		if ( hookLocks() )
+ 			pYieldMutex = new GtkHookedYieldMutex();
+ 		else
+ 			pYieldMutex = new GtkYieldMutex();
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index de0de65c256a..c794c2d84395 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -15,19 +15,19 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${OOOVERSION}_src_060601.tar.gz
+DISTFILES+=	OOo_${OOOVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-EXTRACT_ONLY=	OOo_${OOOVERSION}_src_060601.tar.gz
+EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-OOOVERSION=	2.0.3rc5
+OOOVERSION=	2.0.3rc6
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -71,7 +71,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOC680_m5
+OOOTAG?=		OOC680_m6
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 3a5518feaa83..75dcc4fc9e8a 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = caef8f901a69a990b8747c92581078ac
-SHA256 (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 00bd7716b7abf74001ccfdf94022cb8e87a13bd96e44205ebba967c1fc200b14
-SIZE (openoffice.org2.0/OOo_2.0.3rc5_src_060601.tar.gz) = 307315179
+MD5 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 6e77a24432359a1cfa860c827b2d1832
+SHA256 (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 95bb5fe24f2e1df7a5c6209d0f52e92297abf4d1c3553fd3e47fda75b764d03e
+SIZE (openoffice.org2.0/OOo_2.0.3rc6_src.tar.gz) = 307311939
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3/files/patch-i66666 b/editors/openoffice.org-3/files/patch-i66666
new file mode 100644
index 000000000000..8c288b9c3875
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i66666
@@ -0,0 +1,537 @@
+it also includes the following patch
+http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
+from i66686 (dupe of i66666)
+Index: tools/inc/solar.h
+===================================================================
+RCS file: /cvs/util/tools/inc/solar.h,v
+retrieving revision 1.44
+diff -u -r1.44 solar.h
+--- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
++++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
+@@ -55,9 +55,6 @@
+ #define FALSE		0
+ #endif
+ 
+-#undef NULL
+-#define NULL		0
+-
+ #ifdef _SOLAR__PRIVATE
+ #undef _SOLAR__PRIVATE
+ #endif
+
+Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx	29 Mar 2006 07:41:24 -0000	1.11
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -208,7 +208,7 @@
+ 			GTK_FILE_CHOOSER_ACTION_OPEN,
+ 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ 			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+-			NULL );
++			(void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 
+@@ -347,7 +347,7 @@
+         cell = gtk_cell_renderer_text_new ();
+         gtk_tree_view_column_set_expand (column, TRUE);
+         gtk_tree_view_column_pack_start (column, cell, FALSE);
+-        gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
++        gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
+         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
+     }
+ 
+@@ -377,7 +377,7 @@
+     PangoRectangle row_height;
+     pango_layout_set_markup (layout, "All Files", -1);
+     pango_layout_get_pixel_extents (layout, NULL, &row_height);
+-    g_object_get (cell, "ypad", &ypad, NULL);
++    g_object_get (cell, "ypad", &ypad, (void *)NULL);
+     guint height = (row_height.height + 2*ypad) * 5;
+     gtk_widget_set_size_request (m_pFilterView, -1, height);
+     gtk_widget_set_size_request (m_pPreview, 1, height);
+@@ -1414,7 +1414,7 @@
+ 	}
+ 	if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
+ 		g_object_set( pWidget, "label", aTxt.getStr(),
+-					  "use_underline", TRUE, NULL );
++					  "use_underline", TRUE, (void *)NULL );
+ 	else
+ 		OSL_TRACE("Can't set label on list\n");
+ }
+Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 SalGtkFolderPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	8 Sep 2005 23:35:19 -0000	1.6
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx	23 Jun 2006 18:20:18 -0000
+@@ -125,7 +125,7 @@
+     m_pDialog = gtk_file_chooser_dialog_new(
+     	OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
+ 		NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
++		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
+ 
+ 	gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
+ 	gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.27
+diff -u -r1.27 salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	11 May 2006 10:00:59 -0000	1.27
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2006 00:59:16 -0000
+@@ -550,7 +550,7 @@
+ 	    gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									    "has-secondary-forward-stepper", &has_forward2,
+ 									    "has-backward-stepper", &has_backward,
+-	   								    "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								    "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+         Rectangle aForward;
+         Rectangle aBackward;
+ 
+@@ -910,7 +910,7 @@
+                                  gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
+             gtk_widget_style_get( pWidget,
+                                   "indicator_size", &indicator_size,
+-                                  NULL );
++                                  (void *)NULL );
+             rNativeBoundingRegion = rControlRegion;
+             Rectangle aIndicatorRect( Point( 0,
+                                              (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+@@ -928,7 +928,7 @@
+         gtk_widget_style_get( widget,
+                               "indicator_size", &indicator_size,
+                               "indicator_spacing", &indicator_spacing,
+-                              NULL);
++                              (void *)NULL);
+         indicator_size += 2*indicator_spacing; // guess overpaint of theme
+         rNativeBoundingRegion = rControlRegion;
+         Rectangle aIndicatorRect( Point( 0,
+@@ -978,7 +978,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1081,7 +1081,7 @@
+ 								"focus-padding", 	&focusPad,
+ 					 			"interior_focus",	&interiorFocus,
+ 								"default_border",	&pBorder,
+-								NULL );
++								(void *)NULL );
+ 
+ 	// Make sure the border values exist, otherwise use some defaults
+ 	if ( pBorder )
+@@ -1134,7 +1134,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1192,7 +1192,7 @@
+ 	NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
+ 
+     gint indicator_size;
+-    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
++    gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
+ 
+     x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
+     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
+@@ -1291,7 +1291,7 @@
+ 									  "stepper_size", &stepper_size,
+ 									  "trough_border", &trough_border,
+ 									  "stepper_spacing", &stepper_spacing,
+-									  "min_slider_length", &min_slider_length, NULL );
++									  "min_slider_length", &min_slider_length, (void *)NULL );
+     gboolean has_forward;
+     gboolean has_forward2;
+     gboolean has_backward;
+@@ -1300,7 +1300,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint magic = trough_border ? 1 : 0;
+     gint nFirst = 0;
+ 
+@@ -1570,7 +1570,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
+ 									  "stepper-size", &stepper_size,
+ 									  "trough-border", &trough_border,
+-	   								  "stepper-spacing", &stepper_spacing, NULL );
++	   								  "stepper-spacing", &stepper_spacing, (void *)NULL );
+ 
+     gboolean has_forward;
+     gboolean has_forward2;
+@@ -1580,7 +1580,7 @@
+ 	gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
+ 									  "has-secondary-forward-stepper", &has_forward2,
+ 									  "has-backward-stepper", &has_backward,
+-	   								  "has-secondary-backward-stepper", &has_backward2, NULL );
++	   								  "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
+ 	gint       buttonWidth;
+ 	gint       buttonHeight;
+ 	Rectangle  buttonRect;
+@@ -1687,7 +1687,7 @@
+ 
+ 	// Grab some entry style attributes
+ 	gtk_widget_style_get( gEditBoxWidget,	"focus-line-width",	&focusWidth,
+-					 				"interior-focus",	&interiorFocus, NULL );
++					 				"interior-focus",	&interiorFocus, (void *)NULL );
+ 
+ 	if ( !interiorFocus )
+ 	{
+@@ -1838,7 +1838,7 @@
+ 	}
+ 
+ 	NWSetWidgetState( gSpinButtonWidget, nState, stateType );
+-	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
++	gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
+ 
+ 	if ( shadowType != GTK_SHADOW_NONE )
+ 	{
+@@ -2048,7 +2048,7 @@
+ 
+ 	// Grab some button style attributes
+ 	gtk_widget_style_get( gDropdownWidget,	"focus-line-width",	&nFocusWidth,
+-									"focus-padding", 	&nFocusPad, NULL );
++									"focus-padding", 	&nFocusPad, (void *)NULL );
+ 
+ 	nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
+     nButtonWidth = nArrowWidth +
+@@ -2272,7 +2272,7 @@
+ 			"interior_focus",	&bInteriorFocus,
+ 			"focus_line_width",	&nFocusLineWidth,
+ 			"focus_padding",	&nFocusPadding,
+-			NULL);
++			(void *)NULL);
+     }
+     
+     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+@@ -2482,7 +2482,7 @@
+         {
+             gtk_widget_style_get( gMenuItemMenubarWidget,
+                                   "selected_shadow_type", &selected_shadow_type,
+-                                  NULL);
++                                  (void *)NULL);
+         }
+     }
+     
+@@ -2571,7 +2571,7 @@
+     {
+         gtk_widget_style_get( gMenuItemMenuWidget,
+                               "selected_shadow_type", &selected_shadow_type,
+-                              NULL);
++                              (void *)NULL);
+     }
+ 
+     NWSetWidgetState( gMenuWidget, nState, stateType );
+@@ -2730,7 +2730,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+ 		width = pIndicatorSize->width;
+@@ -2791,7 +2791,7 @@
+ 
+ 	gtk_widget_style_get( gOptionMenuWidget,
+ 			"indicator_size",	&pIndicatorSize,
+-			"indicator_spacing",&pIndicatorSpacing, NULL);
++			"indicator_spacing",&pIndicatorSpacing, (void *)NULL);
+ 	
+ 	if ( pIndicatorSize )
+     {
+@@ -3074,11 +3074,11 @@
+     GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
+     gboolean blink = false;
+ 
+-    g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
++    g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
+     if( blink )
+     {
+         gint blink_time = STYLE_CURSOR_NOBLINKTIME;
+-        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
++        g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
+         // set the blink_time if there is a setting and it is reasonable
+         // else leave the default value
+         if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
+@@ -3097,7 +3097,7 @@
+                           "slider-width", &slider_width,
+                           "trough-border", &trough_border,
+                           "min-slider-length", &min_slider_length,
+-                          NULL );
++                          (void *)NULL );
+     gint magic = trough_border ? 1 : 0;
+     aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
+     aStyleSet.SetMinThumbSize( min_slider_length - magic );
+@@ -3439,7 +3439,7 @@
+         gtk_widget_ensure_style( gToolbarWidget );
+         gtk_widget_style_get( gToolbarWidget,
+ 			                  "button_relief", &aRelief,
+-                              NULL);
++                              (void *)NULL);
+                               
+         gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
+         GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
+Index: vcl/unx/source/app/i18n_cb.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
+retrieving revision 1.28
+diff -u -r1.28 i18n_cb.cxx
+--- vcl/unx/source/app/i18n_cb.cxx	19 Apr 2006 13:56:47 -0000	1.28
++++ vcl/unx/source/app/i18n_cb.cxx	16 Jun 2006 00:59:17 -0000
+@@ -463,8 +463,8 @@
+   	point.y = mPosEvent.mnY + mPosEvent.mnHeight;
+ 
+   	XVaNestedList preedit_attr;
+-  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
+-  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
++  	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
++  	XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
+   	XFree(preedit_attr);
+ 
+ 	return;
+@@ -600,7 +600,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( ic,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             ::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
+Index: vcl/unx/source/app/i18n_ic.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_ic.cxx
+--- vcl/unx/source/app/i18n_ic.cxx	16 Jan 2006 13:07:29 -0000	1.35
++++ vcl/unx/source/app/i18n_ic.cxx	16 Jun 2006 00:59:17 -0000
+@@ -137,7 +137,7 @@
+         a_dstlist = XVaCreateNestedList(
+                                         0,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+     else
+     {
+@@ -145,7 +145,7 @@
+                                         0,
+                                         XNVaNestedList, a_srclist,
+                                         name,           value,
+-                                        NULL );
++                                        (void *)NULL );
+     }
+ 
+     return a_dstlist != NULL ? a_dstlist : a_srclist ;
+@@ -263,7 +263,7 @@
+                                                           XNStatusStartCallback, &aStatusStartCallback,
+                                                           XNStatusDoneCallback,  &aStatusDoneCallback,
+                                                           XNStatusDrawCallback,  &aStatusDrawCallback,
+-                                                          NULL );
++                                                          (void *)NULL );
+ 
+                 break;
+             }
+@@ -302,7 +302,7 @@
+                                                            XNPreeditDoneCallback,  &maPreeditDoneCallback,
+                                                            XNPreeditDrawCallback,   &maPreeditDrawCallback,
+                                                            XNPreeditCaretCallback, &maPreeditCaretCallback,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 break;
+ 
+@@ -324,7 +324,7 @@
+                 mpPreeditAttributes = XVaCreateNestedList (
+                                                            0,
+                                                            XNSpotLocation, &aSpot,
+-                                                           NULL );
++                                                           (void *)NULL );
+ 
+                 // XCreateIC() fails on Redflag Linux 2.0 if there is no
+                 // fontset though the data itself is not evaluated nor is
+@@ -357,7 +357,7 @@
+                                            XNFocusWindow,       aFocusWindow,
+                                            XNClientWindow,      aClientWindow,
+                                            XNInputStyle,        mnPreeditStyle | mnStatusStyle,
+-                                           NULL );
++                                           (void *)NULL );
+ 
+         if ( mnPreeditStyle != XIMPreeditNone )
+         {
+@@ -377,7 +377,7 @@
+         }
+         maContext = XCreateIC( pInputMethod->GetMethod(),
+                                XNVaNestedList, mpAttributes,
+-                               NULL );
++                               (void *)NULL );
+     }
+ 
+     if ( maContext == NULL )
+@@ -416,7 +416,7 @@
+         XSetICValues( maContext,
+                       XNCommitStringCallback, &maCommitStringCallback,
+                       XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+     if ( maContext != NULL)
+     {
+@@ -424,7 +424,7 @@
+         maDestroyCallback.client_data = (XPointer)this;
+         XSetICValues( maContext,
+                       XNDestroyCallback,      &maDestroyCallback,
+-                      NULL );
++                      (void *)NULL );
+     }
+ 
+     if( mbMultiLingual )
+@@ -433,7 +433,7 @@
+         XIMUnicodeCharacterSubset* pSubset = NULL;
+         if( ! XGetICValues( maContext,
+                             XNUnicodeCharacterSubset, & pSubset,
+-                            NULL )
++                            (void *)NULL )
+             && pSubset )
+         {
+             String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
+@@ -481,12 +481,12 @@
+ 
+                 maContext = XCreateIC( pInputMethod->GetMethod(),
+                                        XNVaNestedList, mpAttributes,
+-                                       NULL );
++                                       (void *)NULL );
+                 if ( maContext != NULL && mbMultiLingual )
+                     XSetICValues( maContext,
+                                   XNCommitStringCallback, &maCommitStringCallback,
+                                   XNSwitchIMNotifyCallback, &maSwitchIMCallback,
+-                                  NULL );
++                                  (void *)NULL );
+             }
+             if( maClientData.pFrame != pFrame )
+                 SetICFocus( pFrame );
+@@ -529,7 +529,7 @@
+                               &aWindowAttributes );
+         XGetICValues ( maContext,
+                        XNFilterEvents, &nIMEventMask,
+-                       NULL);
++                       (void *)NULL);
+         nIMEventMask |= aWindowAttributes.your_event_mask;
+         XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
+     }
+@@ -685,8 +685,8 @@
+     aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
+     aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
+ 
+-    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
+-    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++    XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
++    XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     XFree(preedit_attr);
+ 
+     I18NStatus::get().show( true, I18NStatus::contextmap );
+@@ -717,7 +717,7 @@
+         XSetICValues( maContext,
+                       XNFocusWindow,       aFocusWindow,
+                       XNClientWindow,      aClientWindow,
+-                      NULL );
++                      (void *)NULL );
+ 
+         if( maClientData.aInputEv.mpTextAttr )
+         {
+@@ -761,8 +761,8 @@
+     preedit_attr = XVaCreateNestedList(
+                                        0,
+                                        XNPreeditState, &preedit_state,
+-                                       NULL);
+-    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
++                                       (void *)NULL);
++    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
+     {
+         XFree(preedit_attr);
+ 
+@@ -770,8 +770,8 @@
+         preedit_attr = XVaCreateNestedList(
+                                            0,
+                                            XNPreeditState, preedit_state,
+-                                           NULL);
+-        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
++                                           (void *)NULL);
++        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
+     }
+ 
+     XFree(preedit_attr);
+Index: vcl/unx/source/app/i18n_im.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
+retrieving revision 1.35
+diff -u -r1.35 i18n_im.cxx
+--- vcl/unx/source/app/i18n_im.cxx	7 Apr 2006 08:04:45 -0000	1.35
++++ vcl/unx/source/app/i18n_im.cxx	16 Jun 2006 00:59:17 -0000
+@@ -427,13 +427,13 @@
+ 				mbMultiLingual = False;
+ 			else
+ 			if ( XGetIMValues(maMethod,
+-					XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
++					XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
+ 				mbMultiLingual = False;
+             if( mbMultiLingual )
+             {
+                 XIMUnicodeCharacterSubsets* subsets;
+                 if( XGetIMValues( maMethod,
+-                                  XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
++                                  XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
+                 {
+ #if OSL_DEBUG_LEVEL > 1
+                     fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
+@@ -473,7 +473,7 @@
+ 
+ 		if ( maMethod != (XIM)NULL )
+ 		{
+-			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
++			if (   XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
+ 				!= NULL)
+ 				mbUseable = False;
+             #if OSL_DEBUG_LEVEL > 1
+@@ -496,7 +496,7 @@
+     maDestroyCallback.callback	  = (XIMProc)IM_IMDestroyCallback;
+ 	maDestroyCallback.client_data = (XPointer)this;
+     if (mbUseable && maMethod != NULL)
+-        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
++        XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
+ 
+ 	return mbUseable;
+ }
+Index: vcl/unx/source/app/i18n_status.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
+retrieving revision 1.30
+diff -u -r1.30 i18n_status.cxx
+--- vcl/unx/source/app/i18n_status.cxx	16 Jan 2006 13:08:00 -0000	1.30
++++ vcl/unx/source/app/i18n_status.cxx	16 Jun 2006 00:59:17 -0000
+@@ -502,7 +502,7 @@
+             XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
+                           XNUnicodeCharacterSubset,
+                           rChoices[nIndex].pData,
+-                          NULL);
++                          (void *)NULL);
+             // FIXME: get rid of X11SalFrame
+             X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
+             if( pParent && pParent->isMapped() )
diff --git a/editors/openoffice.org-3/files/patch-i66667 b/editors/openoffice.org-3/files/patch-i66667
new file mode 100644
index 000000000000..6e3a697c4bf0
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i66667
@@ -0,0 +1,56 @@
+Index: gtkinst.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
+retrieving revision 1.13
+diff -u -r1.13 gtkinst.cxx
+--- vcl/unx/gtk/app/gtkinst.cxx	11 May 2006 13:32:35 -0000	1.13
++++ vcl/unx/gtk/app/gtkinst.cxx	16 Jun 2006 20:48:58 -0000
+@@ -43,6 +43,7 @@
+ #include <plugins/gtk/atkbridge.hxx>
+ 
+ #include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ 
+ #if OSL_DEBUG_LEVEL > 1
+ #include <stdio.h>
+@@ -111,13 +112,28 @@
+ 		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
+ 		pYieldMutex->ThreadsLeave();
+ 	}
+-	static bool hookLocks( oslModule pModule )
++	static bool hookLocks( void )
+ 	{
+-		typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
++		typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
+ 		rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ 
++		/* XXX GDK library path should be set by configure. */
++		OUStringBuffer aModName( 128 );
++		aModName.appendAscii( SAL_DLLPREFIX"gdk-x11-2.0" );
++		aModName.appendAscii( SAL_DLLEXTENSION );
++		OUString aModule = aModName.makeStringAndClear();
++		oslModule aMod = osl_loadModule( aModule.pData, SAL_LOADMODULE_DEFAULT );
++
++		if ( !aMod )
++		{
++#if OSL_DEBUG_LEVEL > 1
++		    fprintf( stderr, "Failed to load "SAL_DLLPREFIX"gdk-x11-2.0"SAL_DLLEXTENSION"\n" );
++#endif
++			return false;
++		}
++
+ 		GdkLockFn gdk_threads_set_lock_functions =
+-				(GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
++				(GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
+ 		if ( !gdk_threads_set_lock_functions )
+ 		{
+ #if OSL_DEBUG_LEVEL > 1
+@@ -150,7 +166,7 @@
+ 		if ( !g_thread_supported() )
+ 			g_thread_init( NULL );
+ 
+-		if ( hookLocks( pModule ) )
++		if ( hookLocks() )
+ 			pYieldMutex = new GtkHookedYieldMutex();
+ 		else
+ 			pYieldMutex = new GtkYieldMutex();