quite a lot of bug fixes and cleanups, take a look at the ChangeLog

5 files changed, 13 insertions, 1146 deletions

diff --git a/app-office/openoffice-ximian/files/1.1.0/fixed-gcc.patch b/app-office/openoffice-ximian/files/1.1.0/fixed-gcc.patch
deleted file mode 100644
index 3f2ee40700af..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/fixed-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config_office/configure.orig	2003-08-13 15:03:11.000000000 +0200
-+++ config_office/configure	2003-08-13 15:03:46.000000000 +0200
-@@ -2895,13 +2895,6 @@
- 
-    if test "$_gcc_major" = "3"; then
-       USE_GCC3="TRUE"
--      if test "$_gcc_longver"  -eq "030203"; then
--         { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\"
--		 	gives internal error, use another version please." >&5
--echo "$as_me: error: found version \"$_gcc_version\"
--		 	gives internal error, use another version please." >&2;}
--   { (exit 1); exit 1; }; }
--      fi
-    else
-       USE_GCC3="FALSE"
-       if test "$_gcc_longver"  -lt "029502"; then
diff --git a/app-office/openoffice-ximian/files/1.1.0/norecent.patch b/app-office/openoffice-ximian/files/1.1.0/norecent.patch
deleted file mode 100644
index 210f719672ef..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/norecent.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apply.orig 2004-01-08 12:54:42.880898904 +0100
-+++ apply 2004-01-08 12:54:42.881898752 +0100
-@@ -278,9 +278,6 @@
- user-desktop-install.diff
- 
- [ Misc ]
--# Add support for the freedesktop.org ~/.recently-used spec.
--recent-files.diff
--
- # stop the user having to fight ooimpress constantly
- capitalization.diff
diff --git a/app-office/openoffice-ximian/files/1.1.0/oo_1.1-nptl.patch b/app-office/openoffice-ximian/files/1.1.0/oo_1.1-nptl.patch
deleted file mode 100644
index 71763726ba14..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/oo_1.1-nptl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sal/osl/unx/semaphor.c	2003-08-28 10:24:23.736357952 +0100
-+++ sal/osl/unx/semaphor.c	2003-08-28 10:24:26.260974152 +0100
-@@ -79,7 +79,7 @@
- /* osl_createSemaphore  */
- /*****************************************************************************/
- 
--#ifdef LINUX
-+#if 0
- /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */ 
- 
- typedef struct {
-@@ -100,7 +100,7 @@
-      * larger of both
-      * XXX
-      */
--#ifdef LINUX
-+#if 0
- 	if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) )
- 		Semaphore= malloc(sizeof(glibc_21_sem_t));
- 	else
diff --git a/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch b/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch
new file mode 100644
index 000000000000..2455c273a05a
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch
@@ -0,0 +1,13 @@
+--- oo_1.1_src/solenv/bin/checkdll.sh.org	2003-11-13 10:54:00.000000000 -0600
++++ oo_1.1_src/solenv/bin/checkdll.sh	2003-11-13 10:54:15.000000000 -0600
+@@ -52,8 +52,8 @@
+         export LD_LIBRARY_PATH;;
+     esac
+ 
+-    $checkdll "$*"
+-    if [ $? -ne 0 ]; then exit 1 ; fi
++#    $checkdll "$*"
++#    if [ $? -ne 0 ]; then exit 1 ; fi
+     
+     for parameter in $*; do
+         library=$parameter;
diff --git a/app-office/openoffice-ximian/files/1.1.0/recent-files.diff b/app-office/openoffice-ximian/files/1.1.0/recent-files.diff
deleted file mode 100644
index da7ca16e276e..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/recent-files.diff
+++ /dev/null
@@ -1,1099 +0,0 @@
---- svtools/prj/build.lst.orig	2003-06-05 22:23:34.000000000 -0500
-+++ svtools/prj/build.lst	2003-06-05 22:23:42.000000000 -0500
-@@ -1,4 +1,4 @@
--st	svtools	:	offuh toolkit ucbhelper unotools jpeg NULL
-+st	svtools	:	offuh toolkit ucbhelper unotools jpeg expat NULL
- st	svtools						usr1	-	all	st_mkout NULL
- st	svtools\inc					get	-	all	st_inc NULL
- st	svtools\inc\sane				get	-	all	st_incsa NULL
---- svtools/inc/historyoptions.hxx.orig	2003-06-05 22:25:11.000000000 -0500
-+++ svtools/inc/historyoptions.hxx	2003-06-05 22:26:05.000000000 -0500
-@@ -239,6 +239,7 @@
- 			@param		"eHistory" select right history.
- 			@param		"sURL" URL to save in history
- 			@param		"sFilter" filter name to save in history
-+			@param		"sMimeType" MIME type of the URL; used only for ePICKLIST.
- 			@param		"sTitle" document title to save in history
- 			@param		"sPassword" password to save in history
- 			@return		-
-@@ -249,6 +250,7 @@
- 		void AppendItem(			EHistoryType		eHistory	,
- 							const	::rtl::OUString&	sURL		,
- 							const	::rtl::OUString&	sFilter		,
-+							const	::rtl::OUString&	sMimeType	,
- 							const	::rtl::OUString&	sTitle		,
- 							const	::rtl::OUString&	sPassword	);
- 
---- svtools/source/config/historyoptions.cxx.orig	2003-06-05 22:26:20.000000000 -0500
-+++ svtools/source/config/historyoptions.cxx	2003-06-05 23:12:47.000000000 -0500
-@@ -95,6 +95,8 @@
- #include <algorithm>
- #endif
- 
-+#include "recent-files.hxx"
-+
- //_________________________________________________________________________________________________________________
- //	namespaces
- //_________________________________________________________________________________________________________________
-@@ -403,8 +405,10 @@
-     sal_uInt32 nPosition = FIXPROPERTYCOUNT; // step over first three readed size values! but count begins at 0!
- 	// Get names/values for picklist.
- 	// 4 subkeys for every item!
-+	sal_uInt32 nItem;
-+#if 0
- 	OUString sName;
--    for( sal_uInt32 nItem=0; nItem<nPicklistCount; ++nItem )
-+    for( nItem=0; nItem<nPicklistCount; ++nItem )
- 	{
- 		seqValues[nPosition] >>= aItem.sURL			;
- 		++nPosition;
-@@ -416,6 +420,26 @@
- 		++nPosition;
- 		m_aPicklist.push_back( aItem );
- 	}
-+#endif
-+	/* The user may already have a pick list from OOo, so we have to skip over it --- we now fetch the list from GNOME */
-+	nPosition += nPicklistCount * 4;
-+
-+	::svt::RecentFileItem *items;
-+	int nItems;
-+	int i;
-+
-+	::svt::recentFilesGetList (&items, &nItems);
-+
-+	aItem.sFilter = OUString ("", 0, RTL_TEXTENCODING_ASCII_US);
-+	aItem.sPassword = OUString ("", 0, RTL_TEXTENCODING_ASCII_US);
-+
-+	for (i = 0; i < nItems; i++) {
-+		aItem.sURL = OUString(items[i].uri);
-+		aItem.sTitle = OUString (items[i].uri); /* We don't have a title, so just use the filename */
-+		m_aPicklist.push_back (aItem);
-+	}
-+
-+	::svt::recentFilesFree (items, nItems);
- 
- 	// Attention: Don't reset nPosition here!
- 
-@@ -506,9 +530,11 @@
- 	OUString					sNode					;
- 	Sequence< PropertyValue >	seqPropertyValues( 4 )	;
- 
-+	sal_uInt32 nItem;
-+#if 0
- 	// Copy picklist entries to save-list!
-     sal_uInt32 nPicklistCount = m_aPicklist.size();
--    for( sal_uInt32 nItem=0; nItem<nPicklistCount; ++nItem )
-+    for( nItem=0; nItem<nPicklistCount; ++nItem )
- 	{
- 		aItem	= m_aPicklist[nItem];
- 		sNode	= PROPERTYNAME_PICKLIST + PATHDELIMITER + FIXP + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
-@@ -523,7 +549,7 @@
- 
- 		SetSetProperties( PROPERTYNAME_PICKLIST, seqPropertyValues );
- 	}
--
-+#endif
- 	// Copy URL-list entries to save-list!
-     sal_uInt32 nHistoryCount = m_aHistory.size();
- 	for( nItem=0; nItem<nHistoryCount; ++nItem )
-@@ -909,11 +935,15 @@
- void SvtHistoryOptions::AppendItem(			EHistoryType	eHistory	,
- 									const	OUString&		sURL		,
- 									const	OUString&		sFilter		,
-+									const	OUString&		sMimeType	,
- 									const	OUString&		sTitle		,
- 									const	OUString&		sPassword	)
- {
-     MutexGuard aGuard( GetOwnStaticMutex() );
--	m_pDataContainer->AppendItem( eHistory, sURL, sFilter, sTitle, sPassword );
-+
-+	if (eHistory == ePICKLIST)
-+		::svt::recentFilesAddItem (sURL.pData, sMimeType.pData);
-+	m_pDataContainer->AppendItem( eHistory, sURL, sFilter, sTitle, sPassword );
- }
- 
- //*****************************************************************************************************************
---- sfx2/source/appl/newhelp.cxx.orig	2003-06-05 22:34:06.000000000 -0500
-+++ sfx2/source/appl/newhelp.cxx	2003-06-05 22:35:03.000000000 -0500
-@@ -1383,7 +1383,7 @@
- 	{
- 		String aTitle = GetEntry(i);
- 		String* pURL = (String*)(ULONG)GetEntryData(i);
--		aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, rtl::OUString( aTitle ), sEmpty );
-+		aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, sEmpty, rtl::OUString( aTitle ), sEmpty );
- 		delete pURL;
- 	}
- }
---- sfx2/source/appl/sfxpicklist.cxx.orig	2003-04-11 10:54:18.000000000 -0500
-+++ sfx2/source/appl/sfxpicklist.cxx	2003-06-05 22:46:10.000000000 -0500
-@@ -461,6 +461,7 @@
-                     SvtHistoryOptions().AppendItem( eHISTORY,
-                             aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
-                             aFilter,
-+							::rtl::OUString(),
-                             aTitle,
-                             SfxStringEncode( aURL.GetPass() ) );
-                 }
-@@ -497,17 +498,21 @@
- 
- 					::rtl::OUString		aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST);
- 					::rtl::OUString		aFilter;
-+					::rtl::OUString		aMimeType;
- 
- 					INetURLObject		aURL( pMed->GetOrigURL() );
- 					const SfxFilter*	pFilter = pMed->GetOrigFilter();
- 
--					if ( pFilter )
-+					if ( pFilter ) {
-                         aFilter = pFilter->GetFilterName();
-+						aMimeType = pFilter->GetMimeType();
-+					}
- 
- 					// add to svtool history options
- 					SvtHistoryOptions().AppendItem( ePICKLIST,
- 							aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
- 							aFilter,
-+							aMimeType,
- 							aTitle,
- 							SfxStringEncode( aURL.GetPass() ) );
- 
---- sd/source/ui/dlg/dlgass.cxx.orig	2003-06-05 23:00:04.000000000 -0500
-+++ sd/source/ui/dlg/dlgass.cxx	2003-06-05 23:05:19.000000000 -0500
-@@ -186,6 +186,12 @@
- #include <sfx2/filedlghelper.hxx>
- #endif
- 
-+#include <com/sun/star/system/XSystemShellExecute.hpp>
-+#include <com/sun/star/document/XTypeDetection.hpp>
-+#include <com/sun/star/util/URL.hpp>
-+#include <com/sun/star/util/XURLTransformer.hpp>
-+#include <sfx2/fcontnr.hxx>
-+ 
- #include "sdpage.hxx"
- #include "helpids.h"
- #include "assclass.hxx"
-@@ -198,6 +204,8 @@
- 
- using namespace ::com::sun::star;
- using namespace ::sd;
-+using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::system;
- 
- 
- void InterpolateFixedBitmap( FixedBitmap * pBitmap )
-@@ -774,7 +782,38 @@
- 	m_pWindow = NULL;
- }
- 
-+/* Queries the name of the filter that we can use to open a file */
-+static const String &
-+getFilterNameForFile (rtl_uString *uri)
-+{
-+	Reference< ::com::sun::star::document::XTypeDetection >	type_detection (
-+		::comphelper::getProcessServiceFactory ()->createInstance (
-+			::rtl::OUString::createFromAscii ("com.sun.star.comp.framework.TypeDetection" )),
-+		UNO_QUERY );
- 
-+	if (!type_detection.is())
-+		return;
-+
-+	::com::sun::star::util::URL url;
-+	::rtl::OUString type_name;
-+
-+	url.Complete = uri;
-+
-+	Reference < ::com::sun::star::util::XURLTransformer > trans (
-+		::comphelper::getProcessServiceFactory ()->createInstance (
-+			::rtl::OUString::createFromAscii ("com.sun.star.util.URLTransformer" )),
-+		UNO_QUERY);
-+ 
-+	trans->parseStrict (url);
-+
-+	type_name = type_detection->queryTypeByURL (url.Main);
-+	SfxFilterMatcher &filter_matcher = SFX_APP ()->GetFilterMatcher ();
-+	const SfxFilter *filter = filter_matcher.GetFilter4EA (type_name);
-+	if (!filter)
-+		return String ();
-+
-+	return filter->GetFilterName ();
-+}
- 
- 
- void	AssistentDlgImpl::ScanDocmenu	(void)
-@@ -808,6 +847,10 @@
- 			else if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_PASSWORD)
- 				aPropertySet[nProperty].Value >>= sPassword;
- 
-+		sFilter = rtl::OUString (getFilterNameForFile (sURL.pData).GetBuffer ());
-+		if (sFilter.getLength () == 0)
-+			continue;
-+
- 		//	If the entry is an impress file then insert it into the
- 		//	history list and the list box.
-         uno::Any aFilterPropSet = xFilterFactory->getByName( sFilter );
---- svtools/source/config/recent-files.hxx	2003-01-30 04:24:37.000000000 -0600
-+++ svtools/source/config/recent-files.hxx	2003-06-05 23:10:17.000000000 -0500
-@@ -0,0 +1,30 @@
-+#ifndef RECENT_FILES_HXX
-+#define RECENT_FILES_HXX
-+
-+#ifndef _RTL_USTRING_
-+#include <rtl/ustring.h>
-+#endif
-+
-+#include <time.h>
-+
-+namespace svt {
-+
-+/* A recent file item */
-+struct RecentFileItem {
-+	rtl_uString *uri;	/* URI of the file */
-+	rtl_uString *mimeType;	/* MIME type */
-+	time_t timestamp;	/* Timestamp for when the item was added */
-+};
-+
-+/* Queries the list of recent file items for OpenOffice.org */
-+void recentFilesGetList (RecentFileItem **items, int *nItems);
-+
-+/* Frees an array of RecentFileItem structures */
-+void recentFilesFree (RecentFileItem *items, int nItems);
-+
-+/* Adds an item to the list of recent file items */
-+void recentFilesAddItem (rtl_uString *uri, const rtl_uString *mimeType);
-+
-+};
-+
-+#endif
---- svtools/source/config/recent-files.cxx	2003-12-07 18:35:03.000000000 +0530
-+++ svtools/source/config/recent-files.cxx	2003-12-10 14:07:51.000000000 +0530
-@@ -0,0 +1,801 @@
-+#include <stdio.h>
-+#include <string.h>
-+#include <time.h>
-+#include <unistd.h>
-+#include <sys/file.h>
-+#include <tools/string.hxx>
-+#include "expat/xmlparse.h"
-+#include "recent-files.hxx"
-+
-+#include <rtl/ustring.hxx>
-+#include <osl/security.hxx>
-+#ifndef _OSL_THREAD_H_
-+#include <osl/thread.h>
-+#endif
-+
-+#ifndef _CONFIG_HXX
-+#include <tools/config.hxx>
-+#endif
-+
-+
-+#include <list>
-+#include <functional>
-+
-+using namespace osl;
-+using namespace rtl;
-+using namespace ::std;
-+
-+namespace svt {
-+
-+/*
-+  example:
-+<?xml version="1.0"?>
-+<RecentFiles>
-+  <RecentItem>
-+    <URI>file:///home/federico/gedit.txt</URI>
-+    <Mime-Type>text/plain</Mime-Type>
-+    <Timestamp>1046485966</Timestamp>
-+    <Groups>
-+      <Group>gedit</Group>
-+    </Groups>
-+  </RecentItem>
-+  <RecentItem>
-+    <URI>file:///home/federico/gedit-2.2.0.tar.bz2</URI>
-+    <Mime-Type>application/x-bzip</Mime-Type>
-+    <Timestamp>1046209851</Timestamp>
-+    <Private/>
-+    <Groups>
-+    </Groups>
-+  </RecentItem>
-+</RecentFiles>
-+*/
-+
-+/* Name of the standard ~/.recently-used file */
-+#define RECENT_FILE_NAME ".recently-used"
-+
-+/* Items without a MIME type get assigned this by default */
-+#define APPLICATION_OCTET_STREAM "application/octet-stream"
-+
-+/* Buffer size for reading ~/.recently-used */
-+#define BUFFER_SIZE 16384
-+
-+/* Maximum number of entries to keep before pruning */
-+#define MAX_ITEMS 20
-+
-+/* The group we use for OO.o files */
-+#define GROUP_OPENOFFICE_ORG	"OpenOffice.org"
-+
-+/* Tags we understand in the ~/.recently-used XML */
-+#define TAG_RECENT_FILES	"RecentFiles"
-+#define TAG_RECENT_ITEM		"RecentItem"
-+#define TAG_URI			"URI"
-+#define TAG_MIME_TYPE		"Mime-Type"
-+#define TAG_TIMESTAMP		"Timestamp"
-+#define TAG_PRIVATE		"Private"
-+#define TAG_GROUPS		"Groups"
-+#define TAG_GROUP		"Group"
-+
-+  typedef list<OString> StringList;
-+/* Recent item as parsed from the file */
-+class Item {
-+public:
-+  	OString uri;
-+  	OString mimeType;
-+
-+	time_t timestamp;
-+	bool isPrivate;
-+  StringList groups;
-+
-+  Item()
-+  {
-+	timestamp = -1;
-+	isPrivate = false;
-+  }
-+  ~Item()
-+  {
-+	if (!(groups.empty()))
-+	  groups.clear();
-+  }
-+};
-+
-+/* Parser state */
-+enum State {
-+	STATE_BEGIN,		/* No elements read yet */
-+	STATE_RECENT_FILES,	/* Inside the toplevel RecentFiles element */
-+	STATE_RECENT_ITEM,	/* Inside RecentItem */
-+	STATE_URI,		/* Inside URI */
-+	STATE_MIME_TYPE,	/* Inside Mime-Type */
-+	STATE_TIMESTAMP,	/* Inside Timestamp */
-+	STATE_PRIVATE,		/* Inside Private */
-+	STATE_GROUPS,		/* Inside Groups */
-+	STATE_GROUP,		/* Inside Group */
-+	STATE_END,		/* Finished parsing the toplevel element */
-+	STATE_ERROR		/* Bad XML */
-+};
-+
-+  typedef list<Item*> ItemList;
-+
-+/* XML parsing context */
-+struct ParseContext {
-+    ItemList items;
-+
-+	State state;
-+};
-+
-+/* Computes the name of the ~/.recent-files file */
-+static OString
-+getRecentFilename (void)
-+{
-+    OUString ustrHomeDir;
-+    oslSecurity aSec = osl_getCurrentSecurity();
-+    osl_getHomeDir( aSec, &ustrHomeDir.pData );
-+    osl_freeSecurityHandle( aSec );
-+    OString strHomeUrl, strHomeDir;
-+
-+    static OString strFileUrlPrefix("file://");
-+    if (ustrHomeDir.convertToString(&strHomeUrl, osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS))
-+      {
-+	if (strHomeUrl.indexOf(strFileUrlPrefix) == 0)
-+	{
-+	  strHomeDir = strHomeUrl.copy(strFileUrlPrefix.getLength());
-+	}
-+      }
-+
-+    return strHomeDir.concat("/").concat(RECENT_FILE_NAME);
-+}
-+
-+/* Creates a new item in the context as a result of entering a RecentItem element */
-+static void
-+startRecentItem (ParseContext *context)
-+{
-+	Item *item;
-+
-+	item = new Item();
-+	context->items.push_front(item);
-+}
-+
-+/* Terminates a RecentItem element by ensuring that the basic properties of the
-+ * current are fulfilled.  If the URI is empty, removes the item from the
-+ * context.
-+ */
-+static void
-+endRecentItem (ParseContext *context)
-+{
-+	Item *item;
-+
-+	assert (!(context->items.empty()));
-+	item = *(context->items.begin());
-+
-+	if (0 == item->uri.getLength()) {
-+	  delete item;
-+	  context->items.pop_front();
-+		return;
-+	}
-+
-+	if (0 == item->mimeType.getLength())
-+	  item->mimeType = APPLICATION_OCTET_STREAM;
-+
-+	if (item->timestamp == -1)
-+		item->timestamp = time (NULL);
-+}
-+
-+/* Handles entering a Private element */
-+static void
-+startPrivate (ParseContext *context)
-+{
-+	Item *item;
-+
-+	assert (!(context->items.empty()));
-+	item = *(context->items.begin());
-+
-+	item->isPrivate = true;
-+}
-+
-+/* Start element handler for the parser */
-+static void
-+startElementCb (void *data, const XML_Char *name, const XML_Char **attributes)
-+{
-+	ParseContext *context;
-+
-+	context = data;
-+
-+	if (context->state == STATE_ERROR || context->state == STATE_END)
-+		return;
-+
-+	switch (context->state) {
-+	case STATE_BEGIN:
-+		if (strcmp (name, TAG_RECENT_FILES) == 0)
-+			context->state = STATE_RECENT_FILES;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_RECENT_FILES:
-+		if (strcmp (name, TAG_RECENT_ITEM) == 0) {
-+			startRecentItem (context);
-+			context->state = STATE_RECENT_ITEM;
-+		} else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_RECENT_ITEM:
-+		if (strcmp (name, TAG_URI) == 0)
-+			context->state = STATE_URI;
-+		else if (strcmp (name, TAG_MIME_TYPE) == 0)
-+			context->state = STATE_MIME_TYPE;
-+		else if (strcmp (name, TAG_TIMESTAMP) == 0)
-+			context->state = STATE_TIMESTAMP;
-+		else if (strcmp (name, TAG_PRIVATE) == 0) {
-+			startPrivate (context);
-+			context->state = STATE_PRIVATE;
-+		} else if (strcmp (name, TAG_GROUPS) == 0)
-+			context->state = STATE_GROUPS;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_URI:
-+	case STATE_MIME_TYPE:
-+	case STATE_TIMESTAMP:
-+	case STATE_PRIVATE:
-+	case STATE_GROUP:
-+	case STATE_END:
-+	case STATE_ERROR:
-+		context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_GROUPS:
-+		if (strcmp (name, TAG_GROUP) == 0)
-+			context->state = STATE_GROUP;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	default:
-+	  assert(0);
-+	}
-+}
-+
-+/* End element handler for the parser */
-+static void
-+endElementCb (void *data, const XML_Char *name)
-+{
-+	ParseContext *context;
-+
-+	context = data;
-+
-+	switch (context->state) {
-+	case STATE_RECENT_FILES:
-+		if (strcmp (name, TAG_RECENT_FILES) == 0)
-+			context->state = STATE_END;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_RECENT_ITEM:
-+		if (strcmp (name, TAG_RECENT_ITEM) == 0) {
-+			endRecentItem (context);
-+			context->state = STATE_RECENT_FILES;
-+		} else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_URI:
-+		if (strcmp (name, TAG_URI) == 0)
-+			context->state = STATE_RECENT_ITEM;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_MIME_TYPE:
-+		if (strcmp (name, TAG_MIME_TYPE) == 0)
-+			context->state = STATE_RECENT_ITEM;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_TIMESTAMP:
-+		if (strcmp (name, TAG_TIMESTAMP) == 0)
-+			context->state = STATE_RECENT_ITEM;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_PRIVATE:
-+		if (strcmp (name, TAG_PRIVATE) == 0) {
-+			startPrivate (context); /* I don't know if expat calls the start or end element handler for <foo/> */
-+			context->state = STATE_RECENT_ITEM;
-+		} else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_GROUPS:
-+		if (strcmp (name, TAG_GROUPS) == 0)
-+			context->state = STATE_RECENT_ITEM;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_GROUP:
-+		if (strcmp (name, TAG_GROUP) == 0)
-+			context->state = STATE_GROUPS;
-+		else
-+			context->state = STATE_ERROR;
-+		break;
-+
-+	case STATE_BEGIN:
-+	case STATE_END:
-+	case STATE_ERROR:
-+		context->state = STATE_ERROR;
-+		break;
-+
-+	default:
-+	  assert(0);
-+	}
-+}
-+
-+/* Sets the timestamp field of an Item */
-+static void
-+setTimestamp (Item *item, const char *s, int len)
-+{
-+	char *dup;
-+	long t;
-+
-+	dup = strndup (s, len);
-+	if (sscanf (dup, "%ld", &t) != 1)
-+		item->timestamp = -1;
-+	else
-+		item->timestamp = t;
-+
-+	free (dup);
-+}
-+
-+// binary predicate object type
-+struct CompareWithLength : public binary_function<OString, OString,bool>
-+{
-+public: 
-+  bool operator()(const OString& str1, const OString& str2) const
-+  {
-+    return (0 == str2.compareTo(str1, str2.getLength()));
-+  }
-+};
-+
-+/* Adds a group to an item */
-+static void
-+addGroup (Item *item, const char *s, int len)
-+{
-+
-+	StringList::iterator i = ::std::find_if(item->groups.begin(), item->groups.end(), ::std::bind2nd(CompareWithLength(), OString(s,len)));
-+	if (i != item->groups.end())
-+	  return;
-+
-+	item->groups.push_front(OString(s, len));
-+}
-+
-+/* Handler for character data between tags */
-+static void
-+characterDataCb (void *data, const XML_Char *s, int len)
-+{
-+	ParseContext *context;
-+	Item *item;
-+
-+	context = data;
-+	item = !(context->items.empty()) ? *(context->items.begin()) : NULL;
-+
-+	switch (context->state) {
-+	case STATE_URI:
-+		{
-+		  OString tempStr(s, len);
-+		  item->uri = tempStr;
-+		}
-+		break;
-+
-+	case STATE_MIME_TYPE:
-+		{
-+		  OString tempStr(s, len);
-+		  item->mimeType = tempStr;
-+		}
-+		break;
-+
-+	case STATE_TIMESTAMP:
-+		setTimestamp (item, s, len);
-+		break;
-+
-+	case STATE_GROUP:
-+		addGroup (item, s, len);
-+		break;
-+
-+	case STATE_BEGIN:
-+	case STATE_RECENT_FILES:
-+	case STATE_RECENT_ITEM:
-+	case STATE_PRIVATE:
-+	case STATE_GROUPS:
-+	case STATE_END:
-+	case STATE_ERROR:
-+		/* Ignore character data that may appear elsewhere */
-+		break;
-+
-+	default:
-+	  assert(0);
-+	}
-+}
-+
-+/* Creates an XML parser for .recent-files */
-+static XML_Parser
-+createParser (ParseContext *context)
-+{
-+	XML_Parser parser;
-+
-+	parser = XML_ParserCreate (NULL);
-+	if (!parser)
-+		return NULL;
-+
-+	XML_SetUserData (parser, context);
-+	XML_SetElementHandler (parser, startElementCb, endElementCb);
-+	XML_SetCharacterDataHandler (parser, characterDataCb);
-+
-+	return parser;
-+}
-+
-+/* Binary predicate class - Compares items by timestamps so as to sort them in DECREASING order */
-+class CompareTimestamps : binary_function<Item*, Item*, bool>
-+{
-+public: 
-+  bool operator()(const Item* pItem1, const Item* pItem2) const
-+  {
-+	time_t ta, tb;
-+
-+	ta = pItem1->timestamp;
-+
-+	tb = pItem2->timestamp;
-+
-+	return (ta > tb);
-+  }
-+};
-+
-+/* Returns whether an item has a certain group */
-+static bool
-+hasGroup (Item *item, const char *group)
-+{
-+	StringList::iterator i = find(item->groups.begin(), item->groups.end(), OString(group));
-+	return (i != item->groups.end());
-+}
-+
-+/* Removes the oldest items from the context */
-+static void
-+trimOldItems (ParseContext *context)
-+{
-+	int i;
-+
-+	i = 0;
-+	ItemList::iterator l = context->items.begin();
-+	ItemList::iterator next;
-+
-+	while (l != context->items.end()) {
-+		Item *item;
-+
-+		item = *l;
-+		next = (++l)--;
-+
-+		if (hasGroup (item, GROUP_OPENOFFICE_ORG)) {
-+			i++;
-+
-+			if (i > MAX_ITEMS) {
-+			  delete item;
-+			  context->items.erase(l);
-+			}
-+		}
-+
-+		l = next;
-+	}
-+}
-+
-+/* Parses the file and fills in the context */
-+static void
-+parse (FILE *file, ParseContext *context)
-+{
-+	XML_Parser parser;
-+	char buf[BUFFER_SIZE];
-+
-+	context->state = STATE_BEGIN;
-+
-+	parser = createParser (context);
-+
-+	if (!parser)
-+		return;
-+
-+	while (1) {
-+		int len;
-+		int eof;
-+
-+		len = fread (buf, 1, sizeof (buf), file);
-+		if (ferror (file))
-+			break;
-+
-+		eof = feof (file);
-+
-+		if (!XML_Parse (parser, buf, len, eof)) {
-+			context->state = STATE_ERROR;
-+			break;
-+		}
-+
-+		if (eof)
-+			break;
-+	}
-+
-+	if (!(context->items.empty()))
-+		endRecentItem (context); /* Finish it off for if we terminated prematurely on error */
-+
-+	XML_ParserFree (parser);
-+
-+	context->items.sort(CompareTimestamps());
-+	trimOldItems (context);
-+}
-+
-+/* Frees the contents of a parse context */
-+static void
-+freeContext(ParseContext *context)
-+{
-+	for (ItemList::iterator l = context->items.begin(); l != context->items.end(); l++) {
-+		Item *item;
-+
-+		item = *l;
-+		delete item;
-+	}
-+
-+	context->items.clear();
-+}
-+
-+/* Converts our items into exported structures */
-+static void
-+convertItems (ParseContext *context, RecentFileItem **items, int *nItems)
-+{
-+	int i;
-+
-+	/* Count items with the OpenOffice.org group */
-+
-+	*nItems = 0;
-+	for (ItemList::iterator l = context->items.begin(); l != context->items.end(); l++) {
-+		Item *item;
-+
-+		item = *l;
-+		if (hasGroup (item, GROUP_OPENOFFICE_ORG))
-+			(*nItems)++;
-+	}
-+
-+	if (*nItems == 0)
-+		return;
-+
-+	/* Add only the items we want */
-+
-+	*items = malloc (sizeof(RecentFileItem) * *nItems);
-+
-+	i = 0;
-+
-+	for (l = context->items.begin(); l != context->items.end(); l++) {
-+		Item *item;
-+
-+		item = *l;
-+
-+		if (hasGroup (item, GROUP_OPENOFFICE_ORG)) {
-+			RecentFileItem *rfi;
-+
-+			rfi = (*items) + i;
-+
-+			rfi->uri = NULL;
-+			rtl_string2UString (&rfi->uri, item->uri, strlen (item->uri), RTL_TEXTENCODING_UTF8, 0);
-+			rfi->mimeType = NULL;
-+			rtl_string2UString (&rfi->mimeType, item->mimeType, strlen (item->mimeType), RTL_TEXTENCODING_UTF8, 0);
-+
-+			rfi->timestamp = item->timestamp;
-+
-+			i++;
-+		}
-+	}
-+}
-+
-+/* Opens ~/.recent-files and locks it.  If something fails, returns NULL. */
-+
-+static FILE *
-+openAndLock (void)
-+{
-+	char *filename;
-+	FILE *file;
-+	int fd;
-+	//	ParseContext context;
-+
-+	filename = getRecentFilename ().getStr();
-+
-+	file = fopen (filename, "r+");
-+
-+	if (!file)
-+		return NULL;
-+
-+	fd = fileno (file);
-+	if (lockf (fd, F_LOCK, 0) != 0) {
-+		fclose (file);
-+		return NULL;
-+	}
-+
-+	return file;
-+}
-+
-+/* Unlocks ~/.recent-files and closes it. */
-+static void
-+unlockAndClose (FILE *file)
-+{
-+	int fd;
-+
-+	fd = fileno (file);
-+	lockf (fd, F_ULOCK, 0);
-+	fclose (file);
-+}
-+
-+/**
-+ * recentFilesGetList:
-+ * @items: Return value; pointer to an array of items.  Should be freed with recentFilesFree().
-+ * @nItems: Return value; number of items returned.
-+ * 
-+ * Queries the list of GNOME recent file items.
-+ **/
-+void
-+recentFilesGetList (RecentFileItem **items, int *nItems)
-+{
-+	FILE *file;
-+	ParseContext context;
-+
-+	*items = NULL;
-+	*nItems = 0;
-+
-+	file = openAndLock ();
-+	if (!file)
-+		return;
-+
-+	parse (file, &context);
-+
-+	unlockAndClose (file);
-+
-+	convertItems (&context, items, nItems);
-+	freeContext (&context);
-+}
-+
-+/* Writes the ~/.recent-files file */
-+static void
-+writeXml (FILE *file, ParseContext *context)
-+{
-+
-+	fputs ("<?xml version=\"1.0\"?>\n"
-+	       "<" TAG_RECENT_FILES ">\n",
-+	       file);
-+
-+	for (ItemList::iterator l = context->items.begin(); l != context->items.end(); l++) {
-+		Item *item;
-+
-+		item = *l;
-+
-+		fputs ("  <" TAG_RECENT_ITEM ">\n", file);
-+		fprintf (file,
-+			 "    <" TAG_URI ">%s</" TAG_URI ">\n"
-+			 "    <" TAG_MIME_TYPE ">%s</" TAG_MIME_TYPE ">\n"
-+			 "    <" TAG_TIMESTAMP ">%ld</" TAG_TIMESTAMP ">\n"
-+			 "%s"
-+			 "    <" TAG_GROUPS ">\n",
-+			 item->uri.getStr(),
-+			 item->mimeType.getStr(),
-+			 (long) item->timestamp,
-+			 item->isPrivate ? "    <" TAG_PRIVATE "/>\n" : "");
-+
-+		StringList::iterator gl;
-+		for (gl = item->groups.begin(); gl != item->groups.end(); gl++) {
-+			const char *group;
-+
-+			group = (*gl).getStr();
-+			fprintf (file,
-+				 "      <" TAG_GROUP ">%s</" TAG_GROUP ">\n",
-+				 group);
-+		}
-+
-+		fputs ("    </" TAG_GROUPS ">\n"
-+		       "  </" TAG_RECENT_ITEM ">\n",
-+		       file);
-+	}
-+
-+	fputs ("</" TAG_RECENT_FILES ">\n", file);
-+}
-+
-+/**
-+ * recentFilesFree:
-+ * @items: Array of items.
-+ * @nItems: Number of items in the array.
-+ * 
-+ * Frees an array of #RecentFileItem structures as returned by recentFilesGetList().
-+ **/
-+void
-+recentFilesFree (RecentFileItem *items, int nItems)
-+{
-+	int i;
-+
-+	for (i = 0; i < nItems; i++) {
-+		rtl_uString_release (items[i].uri);
-+		rtl_uString_release (items[i].mimeType);
-+	}
-+
-+	free (items);
-+}
-+
-+/**
-+ * recentFilesAddItem:
-+ * @uri: URI to add.
-+ * @mimeType: MIME type of the item.
-+ * 
-+ * Adds an item to GNOME's recent files list.  Automatically adds the "OpenOffice.org" group.
-+ **/
-+void
-+recentFilesAddItem (rtl_uString *uri, const rtl_uString *mimeType)
-+{
-+	FILE *file;
-+	ParseContext context;
-+	bool alreadyExists;
-+	int fd;
-+	rtl_String *uriString;
-+	rtl_String *mimeTypeString;
-+
-+	file = openAndLock ();
-+	if (!file)
-+		return;
-+
-+	parse (file, &context);
-+
-+	alreadyExists = false;
-+
-+	uriString = NULL;
-+	mimeTypeString = NULL;
-+	rtl_uString2String (&uriString, uri->buffer, uri->length, RTL_TEXTENCODING_UTF8, 0);
-+	rtl_uString2String (&mimeTypeString, mimeType->buffer, mimeType->length, RTL_TEXTENCODING_UTF8, 0);
-+
-+	for (ItemList::iterator l = context.items.begin(); l != context.items.end(); l++) {
-+		Item *item;
-+
-+		item = *l;
-+		if (strcmp (item->uri, uriString->buffer) == 0) {
-+			free (item->mimeType);
-+			item->mimeType = strdup (mimeTypeString->buffer);
-+			item->timestamp = time (NULL);
-+			alreadyExists = true;
-+			break;
-+		}
-+	}
-+
-+	if (!alreadyExists) {
-+		Item *item;
-+
-+		item = new Item();
-+		item->uri = strdup (uriString->buffer);
-+		item->mimeType = strdup (mimeTypeString->buffer);
-+		item->timestamp = time (NULL);
-+		item->isPrivate = false;
-+		item->groups.push_front(GROUP_OPENOFFICE_ORG);
-+
-+		context.items.push_front(item);
-+	}
-+
-+	rtl_string_release (uriString);
-+	rtl_string_release (mimeTypeString);
-+
-+	fd = fileno (file);
-+
-+	/* FIXME: perhaps we should do a write to a temporary file, then do an atomic rename() */
-+
-+	rewind (file);
-+	if (ftruncate (fd, 0) != 0)
-+		goto out;
-+
-+	writeXml (file, &context);
-+
-+out:
-+
-+	unlockAndClose (file);
-+	freeContext (&context);
-+}
-+
-+};
---- svtools/source/config/makefile.mk.orig	2003-12-07 18:35:03.000000000 +0530
-+++ svtools/source/config/makefile.mk	2003-12-10 14:07:51.000000000 +0530
-@@ -107,7 +107,12 @@
- 	$(SLO)$/accessibilityoptions.obj	\
- 	$(SLO)$/cmdoptions.obj				\
-     $(SLO)$/extendedsecurityoptions.obj \
--    $(SLO)$/sourceviewconfig.obj
-+    $(SLO)$/sourceviewconfig.obj			\
-+	$(SLO)$/recent-files.obj
-+
-+.IF "$(GUI)"=="UNX"
-+CFLAGS+=-Wall
-+.ENDIF
- 
- EXCEPTIONSFILES = \
-     $(SLO)$/accelcfg.obj				\
---- svtools/util/makefile.mk.orig	2003-12-07 18:34:32.000000000 +0530
-+++ svtools/util/makefile.mk	2003-12-10 14:08:21.000000000 +0530
-@@ -240,6 +240,10 @@
- 		$(VOSLIB)			\
- 		$(SALLIB)
- 
-+.IF "$(GUI)"=="UNX"
-+SHL2STDLIBS+= $(EXPATASCII3RDLIB)
-+.ENDIF
-+
- .IF "$(GUI)"=="WNT"
- SHL2STDLIBS+= \
- 		uwinapi.lib \