[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/FC-4 openoffice.org-1.9.112.ooo51724.testtools.patch, NONE, 1.1 openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch, NONE, 1.1 openoffice.org-1.9.113.ooo51385.bridges.stack.patch, NONE, 1.1 openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch, NONE, 1.1 openoffice.org-1.9.114.ooo51638.mailmerge.patch, NONE, 1.1 openoffice.org-1.9.114.ooo51718.rpath.patch, NONE, 1.1 openoffice.org-1.9.114.oooXXXXX.systemboost.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51673.printing.checkerror.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51745.cpputools.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51755.scp2.parallel.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51931.systemxmlsec.patch, NONE, 1.1 openoffice.org-1.9.116.ooo51774.rsc.parallel.patch, NONE, 1.1 openoffice.org-1.9.116.oooXXXXX.extensions.evolut! ion.patch, NONE, 1.1 openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch, NONE, 1.1 openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch, NONE, 1.1 openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch, NONE, 1.1 workspace.impress63.patch, NONE, 1.1



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2003

Added Files:
	openoffice.org-1.9.112.ooo51724.testtools.patch 
	openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch 
	openoffice.org-1.9.113.ooo51385.bridges.stack.patch 
	openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch 
	openoffice.org-1.9.114.ooo51638.mailmerge.patch 
	openoffice.org-1.9.114.ooo51718.rpath.patch 
	openoffice.org-1.9.114.oooXXXXX.systemboost.patch 
	openoffice.org-1.9.114.rh161886.rpath.desktop.patch 
	openoffice.org-1.9.115.ooo51673.printing.checkerror.patch 
	openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch 
	openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch 
	openoffice.org-1.9.115.ooo51745.cpputools.patch 
	openoffice.org-1.9.115.ooo51755.scp2.parallel.patch 
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 
	openoffice.org-1.9.116.ooo51774.rsc.parallel.patch 
	openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch 
	openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch 
	openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch 
	openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch 
	workspace.impress63.patch 
Log Message:
new patches

openoffice.org-1.9.112.ooo51724.testtools.patch:
 source/bridgetest/makefile.mk           |    0 
 testtools/source/bridgetest/makefile.mk |    2 ++
 2 files changed, 2 insertions(+)

--- NEW FILE openoffice.org-1.9.112.ooo51724.testtools.patch ---
Index: source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.21
diff -u -p -r1.21 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/makefile.mk	17 Jun 2005 09:42:46 -0000	1.21
+++ openoffice.org/testtools/source/bridgetest/makefile.mk	27 Jun 2005 12:20:00 -0000
@@ -201,6 +201,8 @@ MY_JARS=java_uno.jar ridl.jar jurt.jar j
 MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
 MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class
 
+.EXPORT : CLASSPATH
+
 # Use "127.0.0.1" instead of "localhost", see #i32281#:
 $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
 	-rm -f $@

openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch:
 mozilla-source-M16-stub.patch |   16 ----------------
 1 files changed, 16 deletions(-)

--- NEW FILE openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch ---
Index: mozilla-source-M16-stub.patch
===================================================================
RCS file: /cvs/external/np_sdk/mozilla-source-M16-stub.patch,v
retrieving revision 1.3
diff -u -p -r1.3 mozilla-source-M16-stub.patch
--- openoffice.org.orig/np_sdk/mozilla-source-M16-stub.patch	30 Mar 2005 11:38:42 -0000	1.3
+++ openoffice.org/np_sdk/mozilla-source-M16-stub.patch	1 Jul 2005 08:21:03 -0000
@@ -173,23 +173,6 @@
 *** misc/mozilla/include/npupp.h	Sat Nov  6 04:22:23 1999
 --- misc/build/mozilla/include/npupp.h	Tue Mar 19 19:32:49 2002
 ***************
-*** 22,28 ****
-  
-  
-  /*
-!  *  npupp.h $Revision$
-   *  function call mecahnics needed by platform specific glue code.
-   */
-  
---- 22,28 ----
-  
-  
-  /*
-!  *  npupp.h $Revision$
-   *  function call mecahnics needed by platform specific glue code.
-   */
-  
-***************
 *** 72,82 ****
   		
   #else

openoffice.org-1.9.113.ooo51385.bridges.stack.patch:
 bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk |    2 +-
 source/cpp_uno/gcc3_linux_intel/makefile.mk         |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.113.ooo51385.bridges.stack.patch ---
Index: source/cpp_uno/gcc3_linux_intel/makefile.mk
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk	6 Jun 2005 17:32:07 -0000	1.5
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk	1 Jul 2005 12:33:48 -0000
@@ -110,5 +110,5 @@
 .INCLUDE :  target.mk
 
 $(SLO)$/%.obj: %.s
-    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
+    $(CC) -c -o $(SLO)$/$(@:b).o $<
     touch $@

openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch:
 bin/modules/installer/servicesfile.pm        |    0 
 solenv/bin/modules/installer/servicesfile.pm |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch ---
Index: bin/modules/installer/servicesfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
retrieving revision 1.20
diff -u -p -u -r1.20 servicesfile.pm
--- openoffice.org.orig/solenv/bin/modules/installer/servicesfile.pm	17 Jun 2005 09:49:10 -0000	1.20
+++ openoffice.org/solenv/bin/modules/installer/servicesfile.pm	6 Jul 2005 12:19:41 -0000
@@ -400,7 +400,7 @@ sub register_pythoncomponents
 				$counter++;
 			}
 			
-			if ((( $counter > 0 ) && ( $counter%$installer::globals::unomaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$pythoncomponents} )))	# limiting to $installer::globals::maxservices files
+			if ( $counter > 0 ) 
 			{
 				$filestring =~ s/\;\s*$//;
 				$filestring = substr( $filestring, 0, length($filestring)-3);

openoffice.org-1.9.114.ooo51638.mailmerge.patch:
 instsetoo_native/util/makefile.mk                             |    3 
 openoffice.org/scp2/source/python/module_python_mailmerge.scp |   71 ++
 openoffice.org/scripting/source/pyprov/mailmerge.py           |  343 ++++++++++
 scp2/source/python/file_python.scp                            |   14 
 scp2/source/python/makefile.mk                                |    1 
 scp2/source/python/module_python.ulf                          |    5 
 scp2/util/makefile.mk                                         |    2 
 scripting/source/pyprov/makefile.mk                           |    3 
 source/pyprov/makefile.mk                                     |    0 
 source/python/file_python.scp                                 |    0 
 source/python/makefile.mk                                     |    0 
 source/python/module_python.ulf                               |    0 
 util/makefile.mk                                              |    0 
 13 files changed, 438 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-1.9.114.ooo51638.mailmerge.patch ---
Index: source/pyprov/makefile.mk
===================================================================
RCS file: /cvs/framework/scripting/source/pyprov/makefile.mk,v
retrieving revision 1.5
diff -u -p -r1.5 makefile.mk
--- openoffice.org.orig/scripting/source/pyprov/makefile.mk	11 Feb 2005 16:35:48 -0000	1.5
+++ openoffice.org/scripting/source/pyprov/makefile.mk	6 Jul 2005 09:56:59 -0000
@@ -76,7 +76,8 @@ TARGET=pyprov
 
 # --- Targets ------------------------------------------------------
 ALL : ALLTAR \
-        $(DLLDEST)$/pythonscript.py
+        $(DLLDEST)$/pythonscript.py \
+        $(DLLDEST)$/mailmerge.py
 
 $(DLLDEST)$/%.py: %.py
     +cp $? $@
--- /dev/null	2005-07-06 07:58:19.524521250 +0100
+++ openoffice.org/scripting/source/pyprov/mailmerge.py	2005-07-06 12:36:24.000000000 +0100
@@ -0,0 +1,343 @@
+#!/bin/python
+
+# Caolan McNamara caolanm redhat com
+# a simple email mailmerge component
+
+# manual installation for hackers, not necessary for users
+# cp mailmerge.py /usr/lib/openoffice.org2.0/program
+# cd /usr/lib/openoffice.org2.0/program
+# ./unopkg add --shared mailmerge.py
+# edit ~/.openoffice.org2/user/registry/data/org/openoffice/Office/Writer.xcu
+# and change EMailSupported to as follows...
+#  <prop oor:name="EMailSupported" oor:type="xs:boolean">
+#   <value>true</value>
+#  </prop>
+
+import unohelper
+import uno
+
+#to implement com::sun::star::mail::XMailServiceProvider
+
+from com.sun.star.mail import XMailServiceProvider
+from com.sun.star.mail import XMailService
+from com.sun.star.mail import XSmtpService
+from com.sun.star.mail import XConnectionListener
+from com.sun.star.mail import XAuthenticator
+from com.sun.star.mail import XMailMessage
+from com.sun.star.mail.MailServiceType import SMTP
+from com.sun.star.mail.MailServiceType import POP3
+from com.sun.star.mail.MailServiceType import IMAP
+from com.sun.star.uno import XCurrentContext
+from com.sun.star.lang import IllegalArgumentException
+from com.sun.star.lang import EventObject
+from com.sun.star.mail import SendMailMessageFailedException
+
+from email.MIMEBase import MIMEBase
+from email.Message import Message
+from email import Encoders
+from email.MIMEMultipart import MIMEMultipart
+
+import sys, smtplib, imaplib, poplib
+
+dbg = False
+
+class PyMailSMTPService(unohelper.Base, XSmtpService):
+	def __init__( self, ctx ):
+		self.ctx = ctx
+		self.listeners = []
+		self.supportedtypes = ('Insecure', 'Ssl')
+		self.server = None
+		self.connectioncontext = None
+		self.notify = EventObject()
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService init"
+	def addConnectionListener(self, xListener):
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService addConnectionListener"
+		self.listeners.append(xListener)
+	def removeConnectionListener(self, xListener):
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService removeConnectionListener"
+		self.listeners.remove(xListener)
+	def getSupportedConnectionTypes(self):
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService getSupportedConnectionTypes"
+		return self.supportedtypes
+	def connect(self, xConnectionContext, xAuthenticator):
+		self.connectioncontext = xConnectionContext
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService connect"
+		server = xConnectionContext.getValueByName("ServerName")
+		if dbg:
+			print >> sys.stderr, server
+		port = xConnectionContext.getValueByName("Port")
+		if dbg:
+			print >> sys.stderr, port
+		self.server = smtplib.SMTP(server, port)
+		if dbg:
+			self.server.set_debuglevel(1)
+		connectiontype = xConnectionContext.getValueByName("ConnectionType")
+		if dbg:
+			print >> sys.stderr, connectiontype
+		if connectiontype == 'Ssl':
+			self.server.starttls()
+
+		user = xAuthenticator.getUserName()
+		password = xAuthenticator.getPassword()
+		if user != '':
+			if dbg:
+				print >> sys.stderr, 'Logging in, username of', user
+			self.server.login(user, password)
+
+		for listener in self.listeners:
+			listener.connected(self.notify)
+	def disconnect(self):
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService disconnect"
+		if self.server:
+			self.server.quit()
+			self.server = None
+		for listener in self.listeners:
+			listener.disconnected(self.notify)
+	def isConnected(self):
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService isConnected"
+		return self.server != None
+	def getCurrentConnectionContext(self):
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService getCurrentConnectionContext"
+		return self.connectioncontext
+	def sendMailMessage(self, xMailMessage):
+		COMMASPACE = ', '
+
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService sendMailMessage"
+		recipients = xMailMessage.getRecipients()
+		sender = xMailMessage.SenderAddress
+		subject = xMailMessage.Subject
+		ccrecipients = xMailMessage.getCcRecipients()
+		bccrecipients = xMailMessage.getBccRecipients()
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService subject", subject
+			print >> sys.stderr, "PyMailSMPTService from", sender
+			print >> sys.stderr, "PyMailSMPTService send to", recipients
+
+		attachments = xMailMessage.getAttachments()
+
+		content = xMailMessage.Body
+		flavors = content.getTransferDataFlavors()
+		flavor = flavors[0]
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService mimetype is", flavor.MimeType
+		textbody = content.getTransferData(flavor)
+
+		textmsg = Message()
+		textmsg['Content-Type'] = flavor.MimeType
+	        textmsg['MIME-Version'] = '1.0'
+		textmsg.set_payload(textbody)
+
+		if (len(attachments)):
+			msg = MIMEMultipart()
+			msg.epilogue = ''
+			msg.attach(textmsg)
+		else:
+			msg = textmsg
+
+		msg['Subject'] = subject
+		msg['From'] = sender
+		msg['To'] = COMMASPACE.join(recipients)
+		if len(ccrecipients):
+			msg['Cc'] = COMMASPACE.join(ccrecipients)
+		if xMailMessage.ReplyToAddress != '':
+			msg['Reply-To'] = xMailMessage.ReplyToAddress
+		msg['X-Mailer'] = "OpenOffice.org 2.0 via Caolan's mailmerge component"
+
+		for attachment in attachments:
+			content = attachment.Data
+			flavors = content.getTransferDataFlavors()
+			flavor = flavors[0]
+			ctype = flavor.MimeType
+			maintype, subtype = ctype.split('/', 1)
+			msgattachment = MIMEBase(maintype, subtype)
+			data = content.getTransferData(flavor)
+			msgattachment.set_payload(data)
+			Encoders.encode_base64(msgattachment)
+			msgattachment.add_header('Content-Disposition', 'attachment', \
+				filename=attachment.ReadableName)
+			msg.attach(msgattachment)
+
+		uniquer = {}
+		for key in recipients:
+			uniquer[key] = True
+		if len(ccrecipients):
+			for key in ccrecipients:
+				uniquer[key] = True
+		if len(bccrecipients):
+			for key in bccrecipients:
+				uniquer[key] = True
+		truerecipients = uniquer.keys()
+
+		if dbg:
+			print >> sys.stderr, "PyMailSMPTService recipients are", truerecipients
+
+		self.server.sendmail(sender, recipients, msg.as_string())
+
+class PyMailIMAPService(unohelper.Base, XMailService):
+	def __init__( self, ctx ):
+		self.ctx = ctx
+		self.listeners = []
+		self.supportedtypes = ('Insecure', 'Ssl')
+		self.server = None
+		self.connectioncontext = None
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService init"
+	def addConnectionListener(self, xListener):
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService addConnectionListener"
+		self.listeners.append(xListener)
+	def removeConnectionListener(self, xListener):
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService removeConnectionListener"
+		self.listeners.remove(xListener)
+	def getSupportedConnectionTypes(self):
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService getSupportedConnectionTypes"
+		return self.supportedtypes
+	def connect(self, xConnectionContext, xAuthenticator):
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService connect"
+
+		self.connectioncontext = xConnectionContext
+		server = xConnectionContext.getValueByName("ServerName")
+		if dbg:
+			print >> sys.stderr, server
+		port = xConnectionContext.getValueByName("Port")
+		if dbg:
+			print >> sys.stderr, port
+		connectiontype = xConnectionContext.getValueByName("ConnectionType")
+		if dbg:
+			print >> sys.stderr, connectiontype
+		print >> sys.stderr, "BEFORE"
+		if connectiontype == 'Ssl':
+			self.server = imaplib.IMAP4_SSL(server, port)
+		else:
+			self.server = imaplib.IMAP4(server, port)
+		print >> sys.stderr, "AFTER"
+			
+		user = xAuthenticator.getUserName()
+		password = xAuthenticator.getPassword()
+		if user != '':
+			if dbg:
+				print >> sys.stderr, 'Logging in, username of', user
+			self.server.login(user, password)
+
+		for listener in self.listeners:
+			listener.connected(self.notify)
+	def disconnect(self):
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService disconnect"
+		if self.server:
+			self.server.logout()
+			self.server = None
+		for listener in self.listeners:
+			listener.disconnected(self.notify)
+	def isConnected(self):
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService isConnected"
+		return self.server != None
+	def getCurrentConnectionContext(self):
+		if dbg:
+			print >> sys.stderr, "PyMailIMAPService getCurrentConnectionContext"
+		return self.connectioncontext
+
+class PyMailPOP3Service(unohelper.Base, XMailService):
+	def __init__( self, ctx ):
+		self.ctx = ctx
+		self.listeners = []
+		self.supportedtypes = ('Insecure', 'Ssl')
+		self.server = None
+		self.connectioncontext = None
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service init"
+	def addConnectionListener(self, xListener):
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service addConnectionListener"
+		self.listeners.append(xListener)
+	def removeConnectionListener(self, xListener):
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service removeConnectionListener"
+		self.listeners.remove(xListener)
+	def getSupportedConnectionTypes(self):
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service getSupportedConnectionTypes"
+		return self.supportedtypes
+	def connect(self, xConnectionContext, xAuthenticator):
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service connect"
+
+		self.connectioncontext = xConnectionContext
+		server = xConnectionContext.getValueByName("ServerName")
+		if dbg:
+			print >> sys.stderr, server
+		port = xConnectionContext.getValueByName("Port")
+		if dbg:
+			print >> sys.stderr, port
+		connectiontype = xConnectionContext.getValueByName("ConnectionType")
+		if dbg:
+			print >> sys.stderr, connectiontype
+		print >> sys.stderr, "BEFORE"
+		if connectiontype == 'Ssl':
+			self.server = poplib.POP3_SSL(server, port)
+		else:
+			self.server = poplib.POP3(server, port)
+		print >> sys.stderr, "AFTER"
+			
+		user = xAuthenticator.getUserName()
+		password = xAuthenticator.getPassword()
+		if dbg:
+			print >> sys.stderr, 'Logging in, username of', user
+		self.server.user(user)
+		self.server.pass_(user, password)
+
+		for listener in self.listeners:
+			listener.connected(self.notify)
+	def disconnect(self):
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service disconnect"
+		if self.server:
+			self.server.quit()
+			self.server = None
+		for listener in self.listeners:
+			listener.disconnected(self.notify)
+	def isConnected(self):
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service isConnected"
+		return self.server != None
+	def getCurrentConnectionContext(self):
+		if dbg:
+			print >> sys.stderr, "PyMailPOP3Service getCurrentConnectionContext"
+		return self.connectioncontext
+
+class PyMailServiceProvider(unohelper.Base, XMailServiceProvider):
+	def __init__( self, ctx ):
+		if dbg:
+			print >> sys.stderr, "PyMailServiceProvider init"
+		self.ctx = ctx
+	def create(self, aType):
+		if dbg:
+			print >> sys.stderr, "PyMailServiceProvider create with", aType
+		if aType == SMTP:
+			return PyMailSMTPService(self.ctx);
+		elif aType == POP3:
+			return PyMailPOP3Service(self.ctx);
+		elif aType == IMAP:
+			return PyMailIMAPService(self.ctx);
+		else:
+			print >> sys.stderr, "PyMailServiceProvider, unknown TYPE", aType
+
+# pythonloader looks for a static g_ImplementationHelper variable
+g_ImplementationHelper = unohelper.ImplementationHelper()
+g_ImplementationHelper.addImplementation( \
+	PyMailServiceProvider, "org.openoffice.pyuno.MailServiceProvider",
+		("com.sun.star.mail.MailServiceProvider",),)
+
Index: source/python/file_python.scp
===================================================================
RCS file: /cvs/installation/scp2/source/python/file_python.scp,v
retrieving revision 1.10
diff -u -p -r1.10 file_python.scp
--- openoffice.org.orig/scp2/source/python/file_python.scp	20 Apr 2005 12:02:13 -0000	1.10
+++ openoffice.org/scp2/source/python/file_python.scp	6 Jul 2005 11:15:06 -0000
@@ -114,6 +114,20 @@ File gid_File_Py_Python_Core
 End
 #endif
 
+File gid_File_Pymailmerge
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Program;
+    Name = "mailmerge.py";
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED,UNO_COMPONENT);
+End
+
+File gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Writer;
+    Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
 
 // substitute for the python Windows basic scripts
 
Index: source/python/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/python/makefile.mk,v
retrieving revision 1.9
diff -u -p -r1.9 makefile.mk
--- openoffice.org.orig/scp2/source/python/makefile.mk	11 Feb 2005 15:55:37 -0000	1.9
+++ openoffice.org/scp2/source/python/makefile.mk	6 Jul 2005 11:15:07 -0000
@@ -86,6 +86,7 @@ SCP_PRODUCT_TYPE=osl
 
 PARFILES=\
         module_python.par              \
+	module_python_mailmerge.par    \
         profileitem_python.par         \
         file_python.par
 
Index: source/python/module_python.ulf
===================================================================
RCS file: /cvs/installation/scp2/source/python/module_python.ulf,v
retrieving revision 1.3
diff -u -p -r1.3 module_python.ulf
--- openoffice.org.orig/scp2/source/python/module_python.ulf	12 Aug 2004 08:16:30 -0000	1.3
+++ openoffice.org/scp2/source/python/module_python.ulf	6 Jul 2005 11:15:07 -0000
@@ -67,5 +67,6 @@ de = "Python-UNO Sprachanbindung"
 en-US = "Adds the ability to automate %PRODUCTNAME with the python scripting language. See http://udk.openoffice.org/python/python-bridge.html for a complete documentation."
 de = "Ermöglicht es, %PRODUCTNAME mit der Skriptsprache Python zu automatisieren. Die komplette Dokumentation finden Sie auf http://udk.openoffice.org/python/python-bridge.html.";
 
-
-
+[STR_NAME_MODULE_OPTIONAL_PYTHON_MAILMERGE]
+en-US = "Python Email Mailmerge"
+de = "Python Email Mailmerge"
Index: util/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/util/makefile.mk,v
retrieving revision 1.22
diff -u -p -r1.22 makefile.mk
--- openoffice.org.orig/scp2/util/makefile.mk	21 Jun 2005 13:25:19 -0000	1.22
+++ openoffice.org/scp2/util/makefile.mk	6 Jul 2005 11:15:08 -0000
@@ -109,6 +109,7 @@ SCP1FILES  = installation_ooo.par       
              module_xsltfilter.par         \
              file_xsltfilter.par           \
              module_python.par             \
+             module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par
 
@@ -214,6 +215,7 @@ SCP2FILES  = installation_ooo.par       
              module_xsltfilter.par         \
              file_xsltfilter.par           \
              module_python.par             \
+             module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par
 
--- /dev/null	2005-07-06 07:58:19.524521250 +0100
+++ openoffice.org/scp2/source/python/module_python_mailmerge.scp	2005-07-06 12:08:22.000000000 +0100
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ *  $RCSfile$
+ *
+ *  $Revision$
+ *
+ *  last change: $Author$ $Date$
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Pymailmerge
+    MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_MAILMERGE );
+    ParentID = gid_Module_Optional_Pyuno;
+    Files = (gid_File_Pymailmerge, gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu);
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
Index: util/makefile.mk
===================================================================
RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
retrieving revision 1.32
diff -u -p -r1.32 makefile.mk
--- openoffice.org.orig/instsetoo_native/util/makefile.mk	20 Jun 2005 08:32:40 -0000	1.32
+++ openoffice.org/instsetoo_native/util/makefile.mk	6 Jul 2005 16:50:46 -0000
@@ -90,7 +90,8 @@ LOCALPYFILES= \
 	$(BIN)$/uno.py \
 	$(BIN)$/unohelper.py \
 	$(BIN)$/pythonloader.py \
-	$(BIN)$/pythonscript.py
+	$(BIN)$/pythonscript.py \
+	$(BIN)$/mailmerge.py
 
 # PKGFORMAT taken from environment. See possible
 # values below.

openoffice.org-1.9.114.ooo51718.rpath.patch:
 berkeleydb/makefile.mk          |    7 +++++++
 portaudio/portaudio_v18_1.patch |    5 +++--
 sndfile/makefile.mk             |   13 ++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-1.9.114.ooo51718.rpath.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/berkeleydb/makefile.mk,v
retrieving revision 1.21
diff -u -p -r1.21 makefile.mk
--- openoffice.org.orig/berkeleydb/makefile.mk	11 Apr 2005 09:32:45 -0000	1.21
+++ openoffice.org/berkeleydb/makefile.mk	4 Jul 2005 15:14:53 -0000
@@ -93,6 +93,13 @@ ADDITIONAL_FILES=    \
 PATCH_FILE_NAME=db-4.2.52.patch
 
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+.EXPORT: LDFLAGS
 CONFIGURE_DIR=out
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=..$/dist$/configure
Index: portaudio_v18_1.patch
===================================================================
RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
retrieving revision 1.2
diff -u -p -r1.2 portaudio_v18_1.patch
--- openoffice.org.orig/portaudio/portaudio_v18_1.patch	31 May 2005 16:34:54 -0000	1.2
+++ openoffice.org/portaudio/portaudio_v18_1.patch	4 Jul 2005 21:54:37 -0000
@@ -1,5 +1,5 @@
-*** misc/portaudio_v18_1/configure	2003-02-11 23:24:56.000000000 -0500
---- misc/build/portaudio_v18_1/configure	2004-06-02 17:23:18.000000000 -0400
+*** misc/portaudio_v18_1/configure	2005-07-04 16:28:16.000000000 +0100
+--- misc/build/portaudio_v18_1/configure	2005-07-04 16:30:12.000000000 +0100
 ***************
 *** 1883,1892 ****
   case "${host_os}" in
@@ -28,7 +28,7 @@
 ! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
 ! 	LIBS="-lm -lpthread";
 ! 	PADLL="libportaudio.so";
-! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0 -Wl,-rpath,'\$\$ORIGIN'";
 ! 	CFLAGS="-O2 -fPIC"
 ! 	;;
 ! 
Index: makefile.mk
===================================================================
RCS file: /cvs/external/sndfile/makefile.mk,v
retrieving revision 1.6
diff -u -p -r1.6 makefile.mk
--- openoffice.org.orig/sndfile/makefile.mk	31 May 2005 16:31:45 -0000	1.6
+++ openoffice.org/sndfile/makefile.mk	4 Jul 2005 16:28:16 -0000
@@ -80,11 +80,18 @@ PATCH_FILE_NAME=libsndfile-1.0.9.patch
 
 CONFIGURE_DIR=
 
-CONFIGURE_ACTION=./configure --with-pic
-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
-CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+.IF "$(GUI)"=="UNX"
+.IF "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-noinhibit-exec
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+.EXPORT: LDFLAGS
 .ENDIF
 
+CONFIGURE_ACTION=./configure --with-pic
+
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
 

openoffice.org-1.9.114.oooXXXXX.systemboost.patch:
 source/ui/app/makefile.mk    |    0 
 sw/source/ui/app/makefile.mk |    1 +
 2 files changed, 1 insertion(+)

--- NEW FILE openoffice.org-1.9.114.oooXXXXX.systemboost.patch ---
Index: source/ui/app/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/source/ui/app/makefile.mk,v
retrieving revision 1.14
diff -u -p -r1.14 makefile.mk
--- openoffice.org.orig/sw/source/ui/app/makefile.mk	10 Dec 2004 17:58:44 -0000	1.14
+++ openoffice.org/sw/source/ui/app/makefile.mk	9 Jul 2005 15:53:54 -0000
@@ -109,6 +109,7 @@ EXCEPTIONSFILES= \
 		$(SLO)$/docst.obj    \
 		$(SLO)$/swmodule.obj \
 		$(SLO)$/swmodul1.obj \
+        	$(SLO)$/apphdl.obj   \
 		$(SLO)$/docsh2.obj
 
 LIB1TARGET= $(SLB)$/app.lib

openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
 desktop/scripts/soffice.sh |   98 ++-------------------------------------------
 scripts/soffice.sh         |    0 
 2 files changed, 5 insertions(+), 93 deletions(-)

--- NEW FILE openoffice.org-1.9.114.rh161886.rpath.desktop.patch ---
Index: scripts/soffice.sh
===================================================================
RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
retrieving revision 1.17
diff -u -p -r1.17 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh	15 Jun 2005 08:16:47 -0000	1.17
+++ openoffice.org/desktop/scripts/soffice.sh	5 Jul 2005 07:49:51 -0000
@@ -92,103 +92,15 @@ sd_inst="`pwd`"
 # change back directory
 cd "$sd_cwd"
 
-# check if all required patches are installed
-if [ -x "$sd_prog/sopatchlevel.sh" ]; then
-    "$sd_prog/sopatchlevel.sh"
-    if [ $? -eq 1 ]; then
-        exit 0
-    fi
-fi
-
-# set search path for shared libraries
-sd_platform=`uname -s`
-moz_lib=
-for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
-	test -f $moz_lib_path/libnss3.so && moz_lib="$moz_lib_path" && break;
-done
-case $sd_platform in
-  AIX)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $LIBPATH ]; then
-      SYSTEM_LIBPATH=$LIBPATH
-      export SYSTEM_LIBPATH
-      LIBPATH="$sd_prog:$moz_lib":$LIBPATH
-    else
-      LIBPATH="$sd_prog:$moz_lib"
-    fi
-    export LIBPATH
-    ;;
-
-  Darwin)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $DYLD_LIBRARY_PATH ]; then 
-      SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
-      export SYSTEM_DYLD_LIBRARY_PATH
-      DYLD_LIBRARY_PATH="$sd_prog:$moz_lib":$DYLD_LIBRARY_PATH
-    else
-      DYLD_LIBRARY_PATH="$sd_prog:$moz_lib"
-    fi
-    export DYLD_LIBRARY_PATH
-    ;;
-
-  HP-UX)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $SHLIB_PATH ]; then
-      SYSTEM_SHLIB_PATH=$SHLIB_PATH
-      export SYSTEM_SHLIB_PATH
-      SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib:$SHLIB_PATH
-    else
-      SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib
-    fi
-    export SHLIB_PATH
-    ;;
-
-  IRIX*)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $LD_LIBRARYN32_PATH ]; then
-       SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
-       export SYSTEM_LD_LIBRARYN32_PATH
-       LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib":$LD_LIBRARYN32_PATH
-    else
-       LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib"
-    fi
-    export LD_LIBRARYN32_PATH
-    ;;
-
-  *)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $LD_LIBRARY_PATH ]; then
-      SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-      export SYSTEM_LD_LIBRARY_PATH
-      LD_LIBRARY_PATH="$sd_prog:$moz_lib":$LD_LIBRARY_PATH
-    else
-      LD_LIBRARY_PATH="$sd_prog:$moz_lib"
-    fi
-    export LD_LIBRARY_PATH
-    ;;
-esac
-
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x "$sd_prog/javaldx" ] ; then
     java_ld_library_path=`"$sd_prog/javaldx"`
     if [ "$java_ld_library_path" != "" ] ; then
-        case $sd_platform in
-            AIX)
-                LIBPATH=${java_ld_library_path}:${LIBPATH}
-                ;;
-            Darwin)
-                DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
-                ;;
-            HP-UX)
-                SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
-                ;;
-            IRIX*)
-                LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
-                ;;
-            *)
-                LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-                ;;
-        esac
+        if [ $LD_LIBRARY_PATH ]; then
+            LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+        else
+            LD_LIBRARY_PATH=${java_ld_library_path}
+        fi
     fi
 fi
 

openoffice.org-1.9.115.ooo51673.printing.checkerror.patch:
 psprint/source/printer/printerinfomanager.cxx |    3 +--
 psprint/source/printergfx/printerjob.cxx      |    6 +++++-
 source/gdi/print.cxx                          |    0 
 source/printer/printerinfomanager.cxx         |    0 
 source/printergfx/printerjob.cxx              |    0 
 vcl/source/gdi/print.cxx                      |   11 +++++++----
 6 files changed, 13 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51673.printing.checkerror.patch ---
Index: source/printer/printerinfomanager.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printer/printerinfomanager.cxx,v
retrieving revision 1.29
diff -u -p -r1.29 printerinfomanager.cxx
--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx	31 May 2005 17:02:11 -0000	1.29
+++ openoffice.org/psprint/source/printer/printerinfomanager.cxx	7 Jul 2005 11:59:49 -0000
@@ -1240,8 +1240,7 @@ FILE* PrinterInfoManager::startSpool( co
 
 int PrinterInfoManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData )
 {
-    pclose( pFile );
-    return 0; // job id ?
+    return (0 == pclose( pFile ));
 }
 
 void PrinterInfoManager::setupJobContextData( JobData& rData )
Index: source/printergfx/printerjob.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
retrieving revision 1.30
diff -u -p -r1.30 printerjob.cxx
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	31 May 2005 17:02:25 -0000	1.30
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx	7 Jul 2005 12:02:22 -0000
@@ -682,7 +682,11 @@ PrinterJob::EndJob ()
 #ifndef MACOSX
     {
         PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get();
-        rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, maJobTitle, pDestFILE, m_aDocumentJobData );
+        if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, 
+			maJobTitle, pDestFILE, m_aDocumentJobData ))
+		{
+			bSuccess = sal_False;
+		}
     }
 #else
     {
Index: source/gdi/print.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/print.cxx,v
retrieving revision 1.47
diff -u -p -r1.47 print.cxx
--- openoffice.org.orig/vcl/source/gdi/print.cxx	12 Apr 2005 12:19:33 -0000	1.47
+++ openoffice.org/vcl/source/gdi/print.cxx	7 Jul 2005 12:02:36 -0000
@@ -1521,8 +1527,9 @@ BOOL Printer::StartJob( const XubString&
 
 BOOL Printer::EndJob()
 {
+	BOOL bRet = FALSE;
 	if ( !IsJobActive() )
-		return FALSE;
+		return bRet;
 
 	DBG_ASSERT( !mbInPrintPage, "Printer::EndJob() - StartPage() without EndPage() called" );
 
@@ -1534,6 +1541,8 @@ BOOL Printer::EndJob()
 
 		mnCurPage = 0;
 
+		bRet = TRUE;
+
 		if ( mpPrinter )
 		{
 			mbPrinting		= FALSE;
@@ -1541,7 +1550,7 @@ BOOL Printer::EndJob()
 			maJobName.Erase();
 
 			mbDevOutput = FALSE;
-			mpPrinter->EndJob();
+			bRet = mpPrinter->EndJob();
 			// Hier den Drucker nicht asyncron zerstoeren, da es
 			// W95 nicht verkraftet, wenn gleichzeitig gedruckt wird
 			// und ein Druckerobjekt zerstoert wird
@@ -1552,10 +1561,10 @@ BOOL Printer::EndJob()
 		else
 			mpQPrinter->EndQueuePrint();
 
-		return TRUE;
+		return bRet;
 	}
 
-	return FALSE;
+	return bRet;
 }
 
 // -----------------------------------------------------------------------

openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch:
 config/ssolar.cmn              |    0 
 config/ssrc680.ini             |    0 
 config_office/configure.in     |   10 +++++++++-
 config_office/set_soenv.in     |    1 +
 solenv/config/ssolar.cmn       |    1 +
 solenv/config/ssrc680.ini      |    2 ++
 unx/source/app/makefile.mk     |    0 
 unx/source/app/vsound.hxx      |    0 
 util/makefile.mk               |    0 
 vcl/unx/source/app/makefile.mk |    8 ++++++++
 vcl/unx/source/app/vsound.hxx  |    4 ----
 vcl/util/makefile.mk           |    2 ++
 12 files changed, 23 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -p -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	8 Jul 2005 07:29:56 -0000
@@ -176,6 +176,9 @@ AC_ARG_WITH(myspell-dicts,
                           distributions where the myspell dictionaries are
                           installed from other sources
 ],,)
+AC_ARG_WITH(nas,
+[  --without-nas           Removes nas support
+],,)
 AC_ARG_WITH(system-libs,
 [  --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla, python and
@@ -2991,7 +2999,9 @@ dnl ====================================
 dnl Check for system nas
 dnl ===================================================================
 AC_MSG_CHECKING([which nas to use])
-if test -n "$with_system_nas" -o -n "$with_system_libs" && \
+if test -n "$with_nas"; then
+    AC_MSG_RESULT([none])
+elif test -n "$with_system_nas" -o -n "$with_system_libs" && \
 	test "$with_system_nas" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_NAS=YES
@@ -3006,13 +3016,16 @@ if test -n "$with_system_nas" -o -n "$wi
     )
     AC_CHECK_LIB(audio, AuOpenServer, [],
         [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
+    ENABLE_NAS=YES
 else
     AC_MSG_RESULT([internal])
     SYSTEM_NAS=NO
+    ENABLE_NAS=YES
     BUILD_TYPE="$BUILD_TYPE NAS"
 fi
 AC_SUBST(SYSTEM_NAS)
 AC_SUBST(NAS_INCLUDES)
+AC_SUBST(ENABLE_NAS)
 
 AC_MSG_CHECKING([whether to enable portaudio/sndfile support])
 if test "$_os" != "WINNT" && \
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.68
diff -u -r1.68 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	20 Jun 2005 15:18:00 -0000	1.68
+++ openoffice.org/config_office/set_soenv.in	7 Jul 2005 17:54:29 -0000
@@ -1741,6 +1741,7 @@
 ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
 ToFile( "SYSTEM_NAS",        "@SYSTEM_NAS@",       "e" );
 ToFile( "NAS_INCLUDES",      "@NAS_INCLUDES@",     "e" );
+ToFile( "ENABLE_NAS",        "@ENABLE_NAS@",       "e" );
 ToFile( "ENABLE_PASF",       "@ENABLE_PASF@",      "e" );
 ToFile( "SYSTEM_SNDFILE",    "@SYSTEM_SNDFILE@",   "e" );
 ToFile( "SYSTEM_PORTAUDIO",  "@SYSTEM_PORTAUDIO@", "e" );
Index: config/ssolar.cmn
===================================================================
RCS file: /cvs/tools/solenv/config/ssolar.cmn,v
retrieving revision 1.51
diff -u -r1.51 ssolar.cmn
--- openoffice.org.orig/solenv/config/ssolar.cmn	18 Mar 2005 16:39:40 -0000	1.51
+++ openoffice.org/solenv/config/ssolar.cmn	7 Jul 2005 17:52:25 -0000
@@ -70,6 +70,7 @@
         ENABLE_GTK
         ENABLE_GNOMEVFS
         ENABLE_PASF
+        ENABLE_NAS
 		ENABLEUNICODE
         HAVE_GCC_VISIBILITY_FEATURE
 		GCRINC
Index: config/ssrc680.ini
===================================================================
RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
retrieving revision 1.71
diff -u -r1.71 ssrc680.ini
--- openoffice.org.orig/solenv/config/ssrc680.ini	18 Apr 2005 12:02:37 -0000	1.71
+++ openoffice.org/solenv/config/ssrc680.ini	7 Jul 2005 17:52:48 -0000
@@ -2064,6 +2064,7 @@
 		COPYALL
 		GXX_INCLUDE_PATH
         ENABLE_PASF
+        ENABLE_NAS
 	}
 	restore
 	{
@@ -2230,6 +2231,7 @@
 			CPUNAME INTEL
 			DLLSUFFIX li
             ENABLE_PASF TRUE
+            ENABLE_NAS TRUE
 			INPATH unxlngi6%PROEXT%
 			GVERDIR unxlngi6%PROEXT%
 			OUTPATH unxlngi6
Index: unx/source/app/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v
retrieving revision 1.20
diff -u -r1.20 makefile.mk
--- openoffice.org.orig/vcl/unx/source/app/makefile.mk	18 Mar 2005 10:31:27 -0000	1.20
+++ openoffice.org/vcl/unx/source/app/makefile.mk	7 Jul 2005 17:56:44 -0000
@@ -108,6 +108,14 @@
 			$(SLO)$/rptpsound.obj		\
 			$(SLO)$/nassound.obj		
 
+
+
+.IF "$(ENABLE_NAS)" != ""
+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+CFLAGS+=-DUSE_NAS
+.ENDIF
+.ENDIF
+
 .IF "$(ENABLE_PASF)" != ""
 CFLAGS+=-DUSE_PASF
 SLOFILES+=$(SLO)$/pasfsound.obj
Index: unx/source/app/vsound.hxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/vsound.hxx,v
retrieving revision 1.8
diff -u -r1.8 vsound.hxx
--- openoffice.org.orig/vcl/unx/source/app/vsound.hxx	9 Nov 2004 16:49:10 -0000	1.8
+++ openoffice.org/vcl/unx/source/app/vsound.hxx	7 Jul 2005 17:57:05 -0000
@@ -69,10 +69,6 @@
 #define USE_DEVAUDIO
 #endif
 
-#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS)
-#define USE_NAS
-#endif
-
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.69
diff -u -r1.69 makefile.mk
--- openoffice.org.orig/vcl/util/makefile.mk	17 Jun 2005 09:29:14 -0000	1.69
+++ openoffice.org/vcl/util/makefile.mk	7 Jul 2005 17:57:38 -0000
@@ -325,6 +325,7 @@
 SHL2STDLIBS += -lsndfile -lportaudio
 .ENDIF # ENABLE_PASF
 
+.IF "$(ENABLE_NAS)" != ""
 .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
 SHL2STDLIBS += -laudio
 .IF "$(OS)"=="SOLARIS"
@@ -332,6 +333,7 @@
 SHL2STDLIBS += -ldl -lnsl -lsocket
 .ENDIF # SOLARIS
 .ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+.ENDIF
 
 .IF "$(GUIBASE)"=="unx"
 

openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch:
 config_office/configure.in |    5 ++++-
 inc/tg_config.mk           |    0 
 solenv/inc/tg_config.mk    |   10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	8 Jul 2005 09:42:26 -0000
@@ -105,6 +105,9 @@
                           assertions, object counting, etc. Larger build.
                           Independent from --enable-debug
 ],,)
+AC_ARG_ENABLE(xsltproc,
+[  --enable-xsltproc:      Use xsltproc at buildtime, even when java is available
+],,)
 AC_ARG_ENABLE(crashdump,
 [[  --enable-crashdump[=yes|TRUE|STATIC|no]
                           Enable (disable) the crashdump feature code. [default=STATIC]
@@ -1979,7 +1982,7 @@
 fi
 AC_SUBST(JAVACACHE)
 
-if test "$NEEDXSLTPROC" = "no"; then
+if test "$NEEDXSLTPROC" = "no" && test -z "$enable_xsltproc"; then
    XSLTPROC=NO_XSLTPROC
 else
    dnl Check for xsltproc
Index: inc/tg_config.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_config.mk,v
retrieving revision 1.2
diff -u -p -u -r1.2 tg_config.mk
--- openoffice.org.orig/solenv/inc/tg_config.mk	15 Mar 2005 13:00:23 -0000	1.2
+++ openoffice.org/solenv/inc/tg_config.mk	8 Jul 2005 09:36:02 -0000
@@ -84,7 +84,7 @@ $(XCS_TRIM) :   $(PRJ)$/registry$/compon
 $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
     @+echo -------------+ validating and stripping schema files
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
@@ -124,7 +124,7 @@ $(XCS_RESOURCES) :   $(XSLDIR)$/resource
 $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs
     @+echo -------------+ creating locale dependent resource bundles
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
 .ELSE
 	$(XSLTPROC) -o $@ \
@@ -142,7 +142,7 @@ $(XCU_DEFAULT) : $(PRJ)$/registry$/compo
 $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
     @+echo -------------+ validating and creating a locale independent file
 	-$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
@@ -184,7 +184,7 @@ $(XCU_LANG) : $(XSLDIR)$/alllang.xsl 
 $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu
     @+echo -------------+ creating locale dependent entries
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
 .ELSE
@@ -220,7 +220,7 @@ $(XCU_MODULES) : $(XSLDIR)$/alllang.xsl 
 $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu
     @+echo -------------+ creating a module file
 	-$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
 .ELSE

openoffice.org-1.9.115.ooo51745.cpputools.patch:
 makefile.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51745.cpputools.patch ---
diff -ur ooo_SRC680_m115_src.orig/cpputools/source/registercomponent/makefile.mk ooo_SRC680_m115_src/cpputools/source/registercomponent/makefile.mk
--- ooo_SRC680_m115_src.orig/cpputools/source/registercomponent/makefile.mk	2005-07-09 09:03:32.000000000 +0200
+++ ooo_SRC680_m115_src/cpputools/source/registercomponent/makefile.mk	2005-07-09 09:07:09.000000000 +0200
@@ -121,6 +121,6 @@
 .IF "$(GUI)"=="UNX"
 ALLTAR: REGCOMPSH
 
-REGCOMPSH :
-	+-chmod +x $(MISC)$/regcomp.sh
+REGCOMPSH : $(UNIXTEXT)
+	+-chmod +x $(UNIXTEXT)
 .ENDIF	

openoffice.org-1.9.115.ooo51755.scp2.parallel.patch:
 prj/build.lst      |    0 
 scp2/prj/build.lst |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.115.ooo51755.scp2.parallel.patch ---
Index: prj/build.lst
===================================================================
RCS file: /cvs/installation/scp2/prj/build.lst,v
retrieving revision 1.16
diff -u -r1.16 build.lst
--- openoffice.org.orig/scp2/prj/build.lst	23 Jun 2005 09:59:44 -0000	1.16
+++ openoffice.org/scp2/prj/build.lst	9 Jul 2005 11:44:44 -0000
@@ -20,5 +20,5 @@
 cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros NULL
 cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros NULL
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros NULL
-cp    scp2\source\ure             nmake    -    all    cp_ure NULL
+cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
 cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure NULL

openoffice.org-1.9.115.ooo51931.systemxmlsec.patch:
 config_office/configure.in                                    |   22 
 config_office/set_soenv.in                                    |    1 
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.cxx | 1836 ++++++++++
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.hxx |  238 +
 scp2/source/ooo/file_library_ooo.scp                          |    2 
 scp2/source/ooo/makefile.mk                                   |    4 
 scp2/source/ooo/shortcut_ooo.scp                              |    2 
 source/ooo/file_library_ooo.scp                               |    0 
 source/ooo/makefile.mk                                        |    0 
 source/ooo/shortcut_ooo.scp                                   |    0 
 source/xmlsec/makefile.mk                                     |    0 
 source/xmlsec/nss/makefile.mk                                 |    0 
 source/xmlsec/nss/securityenvironment_nssimpl.cxx             |    0 
 xmlsecurity/source/xmlsec/makefile.mk                         |    5 
 xmlsecurity/source/xmlsec/nss/makefile.mk                     |   10 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |    4 
 16 files changed, 2122 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51931.systemxmlsec.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -p -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	8 Jul 2005 11:13:49 -0000
@@ -248,6 +248,9 @@ AC_ARG_WITH(system-myspell,
 AC_ARG_WITH(system-mythes,
 [  --with-system-mythes    Use mythes already on system
 ],,)
+AC_ARG_WITH(system-xmlsec,
+[  --with-system-xmlsec    Use xmlsec1 already on system
+],,)
 AC_ARG_WITH(system-altlinuxhyph,
 [  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
 ],,)
@@ -2415,11 +2418,10 @@ if test -n "$with_system_libxml" -o -n "
     AC_MSG_RESULT([external])
     SYSTEM_LIBXML=YES
     PKG_CHECK_MODULES( LIBXML, libxml-2.0 >= 2.0 )
-    BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBXML=NO
-    BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
+    BUILD_TYPE="$BUILD_TYPE LIBXML2"
 fi
 AC_SUBST(SYSTEM_LIBXML)
 AC_SUBST(LIBXML_CFLAGS)
@@ -3084,6 +3086,22 @@ AC_SUBST(NEON_LIBS)
 AC_SUBST(NEON_CFLAGS)
 
 dnl ===================================================================
+dnl Check for system xmlsec1
+dnl ===================================================================
+AC_MSG_CHECKING([which xmlsec1 to use])
+if test -n "$with_system_xmlsec" -o -n "$with_system_libs" && \
+	test "$with_system_xmlsec" != "no"; then
+        AC_MSG_RESULT([external])
+        PKG_CHECK_MODULES(XMLSEC, xmlsec1-nss >= 1.2.8)
+        SYSTEM_XMLSEC=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_XMLSEC=NO
+    BUILD_TYPE="$BUILD_TYPE LIBXMSEC"
+fi
+AC_SUBST(SYSTEM_XMLSEC)
+
+dnl ===================================================================
 dnl Check for system myspell
 dnl ===================================================================
 AC_MSG_CHECKING([which myspell to use])
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.68
diff -u -p -r1.68 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	20 Jun 2005 15:18:00 -0000	1.68
+++ openoffice.org/config_office/set_soenv.in	8 Jul 2005 11:13:50 -0000
@@ -1755,6 +1755,7 @@ ToFile( "MYSPELL_CFLAGS",    "@MYSPELL_C
 ToFile( "MYSPELL_LIBS",      "@MYSPELL_LIBS@",     "e" );
 ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
 ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
+ToFile( "SYSTEM_XMLSEC",     "@SYSTEM_XMLSEC@",    "e" );
 ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );
 ToFile( "CRYPT_LINK",        "@CRYPT_LINK@",       "e" );
 ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@", "e" );
Index: source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.107
diff -u -p -r1.107 file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	17 Jun 2005 09:33:15 -0000	1.107
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	8 Jul 2005 20:34:24 -0000
@@ -2196,6 +2196,7 @@ File gid_File_Lib_XSec_XMLSecurity
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
+#ifndef SYSTEM_XMLSEC
 File gid_File_Lib_LibXMLSec_xmlseccore
     TXT_FILE_BODY;
     #ifdef UNX
@@ -2232,6 +2233,7 @@ File gid_File_Lib_LibXMLSec_xmlsecnss
     Styles = (PACKED);
 End
 #endif
+#endif
 //i20156 - end
 #endif
 
Index: source/ooo/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
retrieving revision 1.33
diff -u -p -r1.33 makefile.mk
--- openoffice.org.orig/scp2/source/ooo/makefile.mk	17 Jun 2005 14:14:51 -0000	1.33
+++ openoffice.org/scp2/source/ooo/makefile.mk	8 Jul 2005 20:34:25 -0000
@@ -158,6 +158,10 @@ SCPDEFS+=-DSYSTEM_PORTAUDIO
 SCPDEFS+=-DSYSTEM_MYSPELL
 .ENDIF
 
+.IF "$(SYSTEM_XMLSEC)" == "YES"
+SCPDEFS+=-DSYSTEM_XMLSEC
+.ENDIF
+
 SCPDEFS+=\
     -DICU_MAJOR=$(ICU_MAJOR) \
     -DICU_MINOR=$(ICU_MINOR) \
Index: source/ooo/shortcut_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/shortcut_ooo.scp,v
retrieving revision 1.18
diff -u -p -r1.18 shortcut_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp	15 Jun 2005 10:27:53 -0000	1.18
+++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp	8 Jul 2005 20:34:26 -0000
@@ -447,6 +447,7 @@ End
 
 //i38417
 #ifndef WITHOUT_MOZILLA
+#ifndef SYSTEM_XMLSEC
 #ifdef UNX
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlseccore
     FileID = gid_File_Lib_LibXMLSec_xmlseccore;
@@ -483,6 +484,7 @@ Shortcut gid_Shortcut_Lib_LibXMLSec_xmls
 End
 #endif
 #endif
+#endif
 //i38417 -end-
 
 
Index: source/xmlsec/makefile.mk
===================================================================
RCS file: /cvs/xml/xmlsecurity/source/xmlsec/makefile.mk,v
retrieving revision 1.7
diff -u -p -r1.7 makefile.mk
--- openoffice.org.orig/xmlsecurity/source/xmlsec/makefile.mk	30 Mar 2005 11:36:18 -0000	1.7
+++ openoffice.org/xmlsecurity/source/xmlsec/makefile.mk	8 Jul 2005 10:58:48 -0000
@@ -78,6 +78,11 @@ ENABLE_EXCEPTIONS = TRUE
 CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
 .ENDIF
 
+.IF "$(SYSTEM_XMLSEC)" != ""
+PKGCONFIG_MODULES=xmlsec1
+.INCLUDE: pkg_config.mk
+.ENDIF
+
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 CDEFS += -DXMLSEC_CRYPTO_MSCRYPTO -DXMLSEC_NO_XSLT
 .ELSE
Index: source/xmlsec/nss/makefile.mk
===================================================================
RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/makefile.mk,v
retrieving revision 1.5
diff -u -p -r1.5 makefile.mk
--- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/makefile.mk	18 May 2005 09:58:04 -0000	1.5
+++ openoffice.org/xmlsecurity/source/xmlsec/nss/makefile.mk	8 Jul 2005 10:58:48 -0000
@@ -89,6 +89,12 @@ LIBTARGET=NO
 	@echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss"
 .ENDIF
 
+.IF "$(SYSTEM_XMLSEC)" != ""
+PKGCONFIG_MODULES=xmlsec1
+.INCLUDE: pkg_config.mk
+CFLAGS+=-DSYSTEM_XMLSEC
+.ENDIF
+
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 NSS_INC = $(MOZ_INC)$/nss
@@ -167,6 +173,10 @@ SLOFILES = \
 	$(SLO)$/seinitializer_nssimpl.obj \
 	$(SLO)$/xsec_nss.obj
 
+.IF "$(SYSTEM_XMLSEC)" != ""
+	SLOFILES+=\
+	$(SLO)$/systemxmlsec.obj
+.ENDIF
 	
 .ENDIF
 
Index: source/xmlsec/nss/securityenvironment_nssimpl.cxx
===================================================================
RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx,v
retrieving revision 1.12
diff -u -p -r1.12 securityenvironment_nssimpl.cxx
--- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx	18 May 2005 09:58:37 -0000	1.12
+++ openoffice.org/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx	8 Jul 2005 10:58:48 -0000
@@ -89,6 +89,10 @@
 #include <xmlsec/base64.h>
 #include <xmlsec/strings.h>
 
+#ifdef SYSTEM_XMLSEC
+#include "systemxmlsec.hxx"
+#endif
+
 #include <tools/string.hxx>
 
[...1881 lines suppressed...]
+	xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), -1 ) ;
+	xmlSecAssert2( symkey != NULL, -1 ) ;
+
+	context = xmlSecNssSymKeyDataGetCtx( data ) ;
+	xmlSecAssert2(context != NULL, -1);
+
+	context->cipher = PK11_GetMechanism( symkey ) ;
+
+	if( context->slot != NULL ) {
+		PK11_FreeSlot( context->slot ) ;
+		context->slot = NULL ;
+	}
+	context->slot = PK11_GetSlotFromKey( symkey ) ;
+
+	if( context->symkey != NULL ) {
+		PK11_FreeSymKey( context->symkey ) ;
+		context->symkey = NULL ;
+	}
+	context->symkey = PK11_ReferenceSymKey( symkey ) ;
+
+	return 0 ;
+}
+
+
+
+
+int
+xmlSecNssSlotAdopt(
+	PK11SlotInfo* slot,
+	CK_MECHANISM_TYPE type
+) {
+	xmlSecNssKeySlotPtr		keySlot ;
+	xmlSecSize				ksSize ;
+	xmlSecSize				ksPos ;
+	char					flag ;
+
+	xmlSecAssert2( _xmlSecNssKeySlotList != NULL, -1 ) ;
+	xmlSecAssert2( slot != NULL, -1 ) ;
+
+	ksSize = xmlSecPtrListGetSize( _xmlSecNssKeySlotList ) ;
+
+	/*-
+	 * Firstly, checking whether the slot is in the repository already.
+	 */
+	flag = 0 ;
+	for( ksPos = 0 ; ksPos < ksSize ; ksPos ++ ) {
+		keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( _xmlSecNssKeySlotList, ksPos ) ;
+		/* If find the slot in the list */
+		if( keySlot != NULL && xmlSecNssKeySlotGetSlot( keySlot ) == slot ) {
+			/* If mechnism type is valid, bind the slot with the mechanism */
+			if( type != CKM_INVALID_MECHANISM ) {
+				if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) {
+					xmlSecError( XMLSEC_ERRORS_HERE ,
+						NULL ,
+						NULL ,
+						XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+						XMLSEC_ERRORS_NO_MESSAGE ) ;
+					return(-1);
+				}
+			}
+
+			flag = 1 ;
+		}
+	}
+
+	/* If the slot do not in the list, add a new item to the list */
+	if( flag == 0 ) {
+		/* Create a new KeySlot */
+		keySlot = xmlSecNssKeySlotCreate() ;
+		if( keySlot == NULL ) {
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+				XMLSEC_ERRORS_NO_MESSAGE ) ;
+			return(-1);
+		}
+
+		/* Initialize the keySlot with a slot */
+		if( xmlSecNssKeySlotInitialize( keySlot, slot ) < 0 ) {
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+				XMLSEC_ERRORS_NO_MESSAGE ) ;
+			xmlSecNssKeySlotDestroy( keySlot ) ;
+			return(-1);
+		}
+
+		/* If mechnism type is valid, bind the slot with the mechanism */
+		if( type != CKM_INVALID_MECHANISM ) {
+			if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) {
+				xmlSecError( XMLSEC_ERRORS_HERE ,
+					NULL ,
+					NULL ,
+					XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+					XMLSEC_ERRORS_NO_MESSAGE ) ;
+				xmlSecNssKeySlotDestroy( keySlot ) ;
+				return(-1);
+			}
+		}
+
+		/* Add keySlot into the list */
+		if( xmlSecPtrListAdd( _xmlSecNssKeySlotList, keySlot ) < 0 ) {
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+				XMLSEC_ERRORS_NO_MESSAGE ) ;
+			xmlSecNssKeySlotDestroy( keySlot ) ;
+			return(-1);
+		}
+	}
+
+	return(0);
+   }
+
+xmlSecKeyDataPtr xmlSecNssSymKeyDataKeyAdopt(
+    PK11SymKey*     symKey
+) {
+	xmlSecKeyDataPtr	data = NULL ;
+	CK_MECHANISM_TYPE	mechanism = CKM_INVALID_MECHANISM ;
+
+	xmlSecAssert2( symKey != NULL , NULL ) ;
+
+	mechanism = PK11_GetMechanism( symKey ) ;
+	switch( mechanism ) {
+		case CKM_DES3_KEY_GEN :
+		case CKM_DES3_CBC :
+		case CKM_DES3_MAC :
+			data = xmlSecKeyDataCreate( xmlSecNssKeyDataDesId ) ;
+			if( data == NULL ) {
+				xmlSecError( XMLSEC_ERRORS_HERE ,
+					NULL ,
+					"xmlSecKeyDataCreate" ,
+					XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+					"xmlSecNssKeyDataDesId" ) ;
+				return NULL ;
+			}
+			break ;
+		case CKM_AES_KEY_GEN :
+		case CKM_AES_CBC :
+		case CKM_AES_MAC :
+			data = xmlSecKeyDataCreate( xmlSecNssKeyDataAesId ) ;
+			if( data == NULL ) {
+				xmlSecError( XMLSEC_ERRORS_HERE ,
+					NULL ,
+					"xmlSecKeyDataCreate" ,
+					XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+					"xmlSecNssKeyDataDesId" ) ;
+				return NULL ;
+			}
+			break ;
+		default :
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+				"Unsupported mechanism" ) ;
+			return NULL ;
+	}
+
+	if( xmlSecNssSymKeyDataAdoptKey( data , symKey ) < 0 ) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			NULL ,
+			"xmlSecNssSymKeyDataAdoptKey" ,
+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+
+		xmlSecKeyDataDestroy( data ) ;
+		return NULL ;
+	}
+
+	return data ;
+}
+
+static int
+xmlSecNssSymKeyDataKlassCheck(xmlSecKeyDataKlass* klass) {
+#ifndef XMLSEC_NO_DES
+    if(klass == xmlSecNssKeyDataDesId) {
+    return(1);
+    }
+#endif /* XMLSEC_NO_DES */
+
+#ifndef XMLSEC_NO_AES
+    if(klass == xmlSecNssKeyDataAesId) {
+    return(1);
+    }
+#endif /* XMLSEC_NO_AES */
+
+#ifndef XMLSEC_NO_HMAC
+    if(klass == xmlSecNssKeyDataHmacId) {
+    return(1);
+    }
+#endif /* XMLSEC_NO_HMAC */
+
+    return(0);
+}
+
+}

openoffice.org-1.9.116.ooo51774.rsc.parallel.patch:
 rsc/source/parser/makefile.mk |    1 +
 source/parser/makefile.mk     |    0 
 2 files changed, 1 insertion(+)

--- NEW FILE openoffice.org-1.9.116.ooo51774.rsc.parallel.patch ---
Index: source/parser/makefile.mk
===================================================================
RCS file: /cvs/gsl/rsc/source/parser/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/rsc/source/parser/makefile.mk	22 Nov 2002 18:30:39 -0000	1.3
+++ openoffice.org/rsc/source/parser/makefile.mk	10 Jul 2005 14:46:21 -0000
@@ -106,4 +106,5 @@
 $(OBJ)$/rscinit.obj : $(YACCTARGET)
 $(OBJ)$/rscicpx.obj : $(YACCTARGET)
 $(OBJ)$/rsclex.obj  : $(YACCTARGET)
+$(OBJ)$/rscyacc.obj : $(YACCTARGET)
 

openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch:
 abpresid.hrc           |    3 +-
 abspilot.cxx           |   12 ++++++++++-
 abspilot.src           |   33 +++++++++++++++---------------
 addresssettings.hxx    |    2 +
 datasourcehandling.cxx |   12 ++++++++++-
 datasourcehandling.hxx |    8 ++++++-
 typeselectionpage.cxx  |   53 ++++++++++++++++++++++++-------------------------
 typeselectionpage.hxx  |    4 +--
 8 files changed, 78 insertions(+), 49 deletions(-)

--- NEW FILE openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch ---
--- openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx	2005-02-24 16:33:03.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/addresssettings.hxx	2005-02-24 16:33:46.000000000 +0530
@@ -80,6 +80,8 @@
 	enum AddressSourceType
 	{
 		AST_MORK,
+		AST_GROUPWISE,
+		AST_EVOLUTION_LDAP,
 		AST_EVOLUTION,
 		AST_LDAP,
 		AST_OUTLOOK,
--- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx	2005-02-23 15:50:09.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	2005-02-24 16:39:45.000000000 +0530
@@ -347,9 +347,19 @@
 	}
 
 	//---------------------------------------------------------------------
+	ODataSource	ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( ))
+	{
+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
+	}
+	//---------------------------------------------------------------------
+	ODataSource	ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( ))
+	{
+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
+	}
+	//---------------------------------------------------------------------
 	ODataSource	ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
 	{
-		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution" );
+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
 	}
 
 	//---------------------------------------------------------------------
--- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx	2005-02-23 16:41:00.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	2005-02-23 16:42:45.000000000 +0530
@@ -112,9 +112,15 @@
 		/// creates a new MORK data source
 		ODataSource createNewMORK( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
-		/// creates a new Evolution data source
+		/// creates a new Evolution local data source
 		ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
+		/// creates a new Evolution LDAP data source
+		ODataSource createNewEvolutionLdap( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
+		/// creates a new Evolution GROUPWISE data source
+		ODataSource createNewEvolutionGroupwise( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
 		/// creates a new LDAP data source
 		ODataSource	createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
--- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx	2005-02-23 16:43:50.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	2005-02-28 12:07:56.742599018 +0530
@@ -85,9 +85,9 @@
 	protected:
 		FixedText		m_aHint;
 		FixedLine		m_aTypeSep;
-		RadioButton		m_aMORK;
+		RadioButton		m_aEvolutionGroupwise;
+		RadioButton		m_aEvolutionLdap;
 		RadioButton		m_aEvolution;
-		RadioButton		m_aLDAP;
 		RadioButton		m_aOutlook;
 		RadioButton		m_aOE;
 		RadioButton		m_aOther;
--- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx	2005-02-23 14:36:42.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	2005-02-28 12:08:49.569802335 +0530
@@ -89,9 +89,9 @@
 		:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_SELECTABTYPE))
 		,m_aHint			(this,	ResId(FT_TYPE_HINTS))
 		,m_aTypeSep			(this,	ResId(FL_TYPE))
-		,m_aMORK			(this,	ResId(RB_MORK))
-		,m_aEvolution		(this,	ResId(RB_EVOLUTION))
-		,m_aLDAP			(this,	ResId(RB_LDAP))
+		,m_aEvolutionGroupwise		(this,	ResId(RB_GROUPWISE))
+		,m_aEvolutionLdap		(this,	ResId(RB_LDAP))
+		,m_aEvolution			(this,	ResId(RB_EVOLUTION))
 		,m_aOutlook			(this,	ResId(RB_OUTLOOK))
 		,m_aOE				(this,	ResId(RB_OUTLOOKEXPRESS))
 		,m_aOther			(this,	ResId(RB_OTHER))
@@ -99,20 +99,20 @@
 		FreeResource();
 
 		Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
-		m_aMORK.SetClickHdl( aTypeSelectionHandler );
+		m_aEvolutionGroupwise.SetClickHdl( aTypeSelectionHandler );
+		m_aEvolutionLdap.SetClickHdl( aTypeSelectionHandler );
 		m_aEvolution.SetClickHdl( aTypeSelectionHandler );
-		m_aLDAP.SetClickHdl( aTypeSelectionHandler );
 		m_aOutlook.SetClickHdl( aTypeSelectionHandler );
 		m_aOE.SetClickHdl( aTypeSelectionHandler );
 		m_aOther.SetClickHdl( aTypeSelectionHandler );
 
 #ifndef UNX
-		sal_Int32 nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
-		m_aEvolution.Hide();
+		sal_Int32 nMoveControlsUp = m_aEvolution.GetPosPixel().Y() - m_aEvolutionLdap.GetPosPixel().Y();
+		sal_Int32 nMoveControlsUp = m_aEvolutionLdap.GetPosPixel().Y() - m_aEvolutionGroupwise.GetPosPixel().Y();
 
-		Point aPos = m_aLDAP.GetPosPixel();
-		aPos.Y() -= nMoveControlsUp;
-		m_aLDAP.SetPosPixel( aPos );
+		m_aEvolutionGroupwise.Hide();
+		m_aEvolutionLdap.Hide();
+		m_aEvolution.Hide();
 
 		aPos = m_aOutlook.GetPosPixel();
 		aPos.Y() -= nMoveControlsUp;
@@ -139,14 +139,13 @@
 		m_aOther.SetPosPixel( aPos );
 
 		Reference< ::com::sun::star::sdbc::XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
-		if(!(xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))).is()))
+		if(!(xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))).is()))
 		{
-			nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
+			nMoveControlsUp = m_aEvolution.GetPosPixel().Y() - m_aEvolutionLdap.GetPosPixel().Y();
+			nMoveControlsUp = m_aEvolutionLdap.GetPosPixel().Y() - m_aEvolutionGroupwise.GetPosPixel().Y();
 			m_aEvolution.Hide();
-			
-			aPos = m_aLDAP.GetPosPixel();
-			aPos.Y() -= nMoveControlsUp;
-			m_aLDAP.SetPosPixel( aPos );
+			m_aEvolutionLdap.Hide();
+			m_aEvolutionGroupwise.Hide();
 			
 			aPos = m_aOther.GetPosPixel();
 			aPos.Y() -= nMoveControlsUp;
@@ -160,12 +159,12 @@
 	{
 		AddressBookSourcePage::ActivatePage();
 
-		if (m_aMORK.IsChecked())
-			m_aMORK.GrabFocus();
-		else if (m_aEvolution.IsChecked())
+		if (m_aEvolution.IsChecked())
 			m_aEvolution.GrabFocus();
-		else if (m_aLDAP.IsChecked())
-			m_aLDAP.GrabFocus();
+		else if (m_aEvolutionGroupwise.IsChecked())
+			m_aEvolutionGroupwise.GrabFocus();
+		else if (m_aEvolutionLdap.IsChecked())
+			m_aEvolutionLdap.GrabFocus();
 		else if (m_aOutlook.IsChecked())
 			m_aOutlook.GrabFocus();
 		else if (m_aOE.IsChecked())
@@ -186,9 +185,9 @@
 	//---------------------------------------------------------------------
 	void TypeSelectionPage::selectType( AddressSourceType _eType )
 	{
-		m_aMORK.Check(AST_MORK == _eType);
+		m_aEvolutionGroupwise.Check(AST_GROUPWISE == _eType);
+		m_aEvolutionLdap.Check(AST_EVOLUTION_LDAP == _eType);
 		m_aEvolution.Check(AST_EVOLUTION == _eType);
-		m_aLDAP.Check(AST_LDAP == _eType);
 		m_aOutlook.Check(AST_OUTLOOK == _eType);
 		m_aOE.Check(AST_OE == _eType);
 		m_aOther.Check(AST_OTHER == _eType);
@@ -197,12 +196,12 @@
 	//---------------------------------------------------------------------
 	AddressSourceType TypeSelectionPage::getSelectedType( )
 	{
-		if (m_aMORK.IsChecked())
-			return AST_MORK;
+		if (m_aEvolutionLdap.IsChecked())
+			return AST_EVOLUTION_LDAP;
+		else if (m_aEvolutionGroupwise.IsChecked())
+			return AST_GROUPWISE;
 		else if (m_aEvolution.IsChecked())
 			return AST_EVOLUTION;
-		else if (m_aLDAP.IsChecked())
-			return AST_LDAP;
 		else if (m_aOutlook.IsChecked())
 			return AST_OUTLOOK;
 		else if (m_aOE.IsChecked())
--- openoffice.org.orig/extensions/source/abpilot/abpresid.hrc	2005-02-23 16:33:35.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/abpresid.hrc	2005-02-23 16:35:01.000000000 +0530
@@ -198,7 +198,8 @@
 #define RB_OUTLOOK				4
 #define RB_OUTLOOKEXPRESS		5
 #define RB_OTHER				6
-
+#define RB_EVOLUTION_LDAP		7
+#define RB_GROUPWISE			8
 //........................................................................
 #define ET_DATASOURCENAME		1
 #define ET_LOCATION				2
--- openoffice.org.orig/extensions/source/abpilot/abspilot.src	2005-02-23 13:49:53.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/abspilot.src	2005-02-28 12:07:20.498948162 +0530
@@ -148,34 +148,35 @@
 		Text [ en-US ] = "Please select the type of your external address book:";
 	};
 
-	RadioButton RB_MORK
+        RadioButton RB_GROUPWISE
+        {
+                Pos             = MAP_APPFONT ( 15, 79 ) ;
+                Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+                                                                                                    
+                Text [ de ] = "Groupwise";
+                Text [ en-US ] = "Groupwise";
+        };
+	RadioButton RB_LDAP
 	{
-		Pos		= MAP_APPFONT ( 15, 68 ) ;
+		Pos		= MAP_APPFONT ( 15, 90 ) ;
 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-		Group = TRUE;
 
-		Text [ de ] = "Mozilla / Netscape";
-		Text [ en-US ] = "Mozilla / Netscape";
+		Text [ de ] = "LDAP Adress-Bestand";
+		Text [ en-US ] = "LDAP address data";
 	};
+
 	RadioButton RB_EVOLUTION
  	{
- 		Pos		= MAP_APPFONT ( 15, 79 ) ;
+ 		Pos		= MAP_APPFONT ( 15, 101 ) ;
  		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
 
 		Text [ de ] = "Evolution";
 		Text [ en-US ] = "Evolution";
 	};
-	RadioButton RB_LDAP
-	{
-		Pos		= MAP_APPFONT ( 15, 90 ) ;
-		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
 
-		Text [ de ] = "LDAP Adress-Bestand";
-		Text [ en-US ] = "LDAP address data";
-	};
 	RadioButton RB_OUTLOOK
 	{
-		Pos		= MAP_APPFONT ( 15, 101 ) ;
+		Pos		= MAP_APPFONT ( 15, 112 ) ;
 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
 
 		Text [ de ] = "Outlook Adressbuch";
@@ -183,7 +184,7 @@
 	};
 	RadioButton RB_OUTLOOKEXPRESS
 	{
-		Pos		= MAP_APPFONT ( 15,112 ) ;
+		Pos		= MAP_APPFONT ( 15,123 ) ;
 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
 
 		Text [ de ] = "Windows System-Adressbuch";
@@ -191,7 +192,7 @@
 	};
 	RadioButton RB_OTHER
 	{
-		Pos		= MAP_APPFONT ( 15, 123 ) ;
+		Pos		= MAP_APPFONT ( 15, 134 ) ;
 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
 
 		Text [ de ] = "andere externe Datenquelle";
--- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	2005-02-24 11:10:46.000000000 +0530
+++ openoffice.org/extensions/source/abpilot/abspilot.cxx	2005-02-28 12:36:20.034151760 +0530
@@ -178,7 +178,9 @@
 
 		// some initial settings
 #ifdef UNX
-		m_aSettings.eType = AST_MORK;
+		m_aSettings.eType = AST_GROUPWISE;
+		m_aSettings.eType = AST_EVOLUTION_LDAP;
+		m_aSettings.eType = AST_EVOLUTION;
 #else
 		m_aSettings.eType = AST_OE;
 #endif
@@ -423,6 +425,14 @@
 				m_aNewDataSource = aContext.createNewMORK( m_aSettings.sDataSourceName );
 				break;
 
+			case AST_GROUPWISE:
+				m_aNewDataSource = aContext.createNewEvolutionGroupwise( m_aSettings.sDataSourceName );
+				break;
+
+			case AST_EVOLUTION_LDAP:
+				m_aNewDataSource = aContext.createNewEvolutionLdap( m_aSettings.sDataSourceName );
+				break;
+
 			case AST_EVOLUTION:
 				m_aNewDataSource = aContext.createNewEvolution( m_aSettings.sDataSourceName );
 				break;

openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch:
 dlgass.cxx |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch ---
Index: dlgass.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/dlg/dlgass.cxx,v
retrieving revision 1.33
diff -u -r1.33 dlgass.cxx
--- openoffice.org.orig/sd/source/ui/dlg/dlgass.cxx	31 Mar 2005 13:21:16 -0000	1.33
+++ openoffice.org/sd/source/ui/dlg/dlgass.cxx	12 Jul 2005 13:24:32 -0000
@@ -993,12 +993,22 @@
 	::vos::OGuard aGuard (Application::GetSolarMutex());
 
     // Copy the contents of the given template folders to a local list.
-    m_aPresentList.swap (rTemplateFolder);
+//    m_aPresentList.swap (rTemplateFolder);
+	std::vector<TemplateDir*>::iterator	I;
+    std::vector<TemplateDir*> aTemp;
+	for (I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++)
+		aTemp.push_back(*I);
+    m_aPresentList.clear();
+	for (I=rTemplateFolder.begin(); I!=rTemplateFolder.end(); I++)
+		m_aPresentList.push_back(*I);
+    rTemplateFolder.clear();
+	for (I=aTemp.begin(); I!=aTemp.end(); I++)
+		rTemplateFolder.push_back(*I);
+    aTemp.clear();
 
 	//	Fill in the list box on the first page.
 	int nFirstEntry = 0;
 	m_pPage1RegionLB->Clear();
-	std::vector<TemplateDir*>::iterator	I;
 	int	i;
 	for (i=0,I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++,i++)
 	{

openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch:
 com/sun/star/wizards/ui/TitlesComponent.java         |    0 
 wizards/com/sun/star/wizards/ui/TitlesComponent.java |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch ---
Index: com/sun/star/wizards/ui/TitlesComponent.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/TitlesComponent.java,v
retrieving revision 1.4
diff -u -p -u -r1.4 TitlesComponent.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/ui/TitlesComponent.java	18 Mar 2005 16:26:07 -0000	1.4
+++ openoffice.org/wizards/com/sun/star/wizards/ui/TitlesComponent.java	13 Jul 2005 18:43:21 -0000
@@ -104,7 +104,8 @@ public class TitlesComponent extends Con
 		for (int i = 0; i < super.ControlGroupVector.size(); i++){
 			ControlRow curControlRow = (ControlRow) ControlGroupVector.elementAt(i); 
 			XTextComponent xTextBox = curControlRow.xTextComponent;
-			xTextBox.addTextListener(_xTextListener);
+			if ((xTextBox != null) && (_xTextListener != null))
+				xTextBox.addTextListener(_xTextListener);
 		}
 	}
 

openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch:
 VCL.xcu |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

--- NEW FILE openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch ---
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu	2005-07-13 15:34:20.000000000 +0100
+++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu	2005-07-13 15:34:31.000000000 +0100
@@ -94,7 +94,7 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
         <value>HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Luxi Sans</value>
@@ -127,7 +127,7 @@
         <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;Luxi Sans;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SYMBOL" oor:type="xs:string" oor:op="replace">
         <value>StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol</value>
@@ -163,13 +163,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -198,13 +198,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -233,13 +233,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -268,13 +268,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -303,13 +303,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -338,13 +338,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -373,13 +373,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -619,13 +619,13 @@
         <value>썬바탕;SunBatang;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale AMT;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
         <value>썬돋움;SunDotum;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>썬바탕;SunBatang;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>썬바탕;SunBatang;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Thorndale AMT;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>썬돋움;SunDotum;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
@@ -634,7 +634,7 @@
         <value>썬굴림;SunGulim;Baekmuk Dotum;Gulim;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale AMT;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
         <value>썬굴림;SunGulim;Baekmuk Dotum;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>

workspace.impress63.patch:
 sd/source/ui/app/sdxfer.cxx                        |   14 +++++++++-----
 sd/source/ui/inc/FrameView.hxx                     |   19 +++++++++++++++++--
 sd/source/ui/view/frmview.cxx                      |   16 ++++++++++++++--
 sd/uiconfig/simpress/accelerator/de/default.xml    |    2 +-
 sd/uiconfig/simpress/accelerator/en-GB/default.xml |    2 +-
 sd/uiconfig/simpress/accelerator/en-US/default.xml |    2 +-
 sd/uiconfig/simpress/accelerator/es/default.xml    |    2 +-
 sd/uiconfig/simpress/accelerator/fr/default.xml    |    2 +-
 source/ui/view/sdview2.cxx                         |    0 
 svx/source/svdraw/svdograf.cxx                     |   15 +++++++++++++++
 10 files changed, 60 insertions(+), 14 deletions(-)

--- NEW FILE workspace.impress63.patch ---
Index: source/ui/app/sdxfer.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/app/sdxfer.cxx,v
retrieving revision 1.40
retrieving revision 1.40.160.1
diff -u -r1.40 -r1.40.160.1
--- openoffice.org.orig/sd/source/ui/app/sdxfer.cxx	7 Feb 2005 14:41:17 -0000	1.40
+++ openoffice.org/sd/source/ui/app/sdxfer.cxx	8 Jul 2005 12:44:40 -0000	1.40.160.1
@@ -363,20 +363,24 @@
 	}
 	else if( pSdView && !pSdDrawDocumentIntern )
 	{
-		bOwnDocument = TRUE;
-
 		const SdrMarkList& rMarkList = pSdView->GetMarkedObjectList();
 
 		if( rMarkList.GetMarkCount() == 1 )
 			CreateObjectReplacement( rMarkList.GetMark( 0 )->GetObj() );
 
+		if( pSourceDoc )
+			pSourceDoc->CreatingDataObj(this);
 		pSdDrawDocumentIntern = (SdDrawDocument*) pSdView->GetAllMarkedModel();
+		if( pSourceDoc )
+			pSourceDoc->CreatingDataObj(0);
 
 		if( !aDocShellRef.Is() && pSdDrawDocumentIntern->GetDocSh() )
-		{
-			// DocShell schon vorhanden ( AllocModel() )
 			aDocShellRef = pSdDrawDocumentIntern->GetDocSh();
-			bOwnDocument = FALSE;
+
+		if( !aDocShellRef.Is() )
+		{
+			DBG_ERROR( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" );
+			bOwnDocument = TRUE;
 		}
 
 		// Groesse der Source-Seite uebernehmen
Index: source/ui/inc/FrameView.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/FrameView.hxx,v
retrieving revision 1.3
retrieving revision 1.3.180.1
diff -u -r1.3 -r1.3.180.1
--- openoffice.org.orig/sd/source/ui/inc/FrameView.hxx	27 Jan 2005 14:15:20 -0000	1.3
+++ openoffice.org/sd/source/ui/inc/FrameView.hxx	6 Jul 2005 12:04:06 -0000	1.3.180.1
@@ -133,13 +133,26 @@
 				 { aVisArea = rVisArea; }
 	const Rectangle GetVisArea() { return aVisArea; }
 
-	void SetPageKind(PageKind eKind)
-				 { ePageKind = eKind; }
+	void SetPageKind(PageKind eKind) { ePageKind = eKind; }
 	const PageKind GetPageKind() { return ePageKind; }
 
+	/** is used in FrameView::ReadUserDataSequence() only to store the
+		page kind that was selected while last saving this document */
+	void SetPageKindOnLoad(PageKind eKind) { ePageKindOnLoad = eKind; }
+
+	/** can be used to get the page kind that was selected on last save of this document */
+	const PageKind GetPageKindOnLoad() { return ePageKindOnLoad; }
+
 	void SetSelectedPage (USHORT nPage);
 	const USHORT GetSelectedPage (void) const;
 
+	/** is used in FrameView::ReadUserDataSequence() only to store the
+		page that was selected while last saving this document */
+	void SetSelectedPageOnLoad (USHORT nPage) { nSelectedPageOnLoad = nPage; }
+
+	/** can be used to get the page that was selected on last save of this document */
+	const USHORT GetSelectedPageOnLoad (void) const { return nSelectedPageOnLoad; }
+
 	void SetViewShEditMode(EditMode eMode, PageKind eKind);
 	EditMode GetViewShEditMode(PageKind eKind);
 
@@ -214,6 +227,8 @@
 	Rectangle		aVisArea;		   // Sichtbarer Bereich
 	PageKind		ePageKind;		   // Seitentyp (Standard, Notizen, Handzettel)
 	USHORT			nSelectedPage;	   // Selektierte Seite
+	PageKind		ePageKindOnLoad;
+	USHORT			nSelectedPageOnLoad;
 	EditMode        eStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage)
 	EditMode        eNotesEditMode;    // Editmode im Notizen-Modus (Page/MasterPage)
 	EditMode        eHandoutEditMode;  // Editmode im Handzettel-Modus (Page/MasterPage)
Index: source/ui/view/frmview.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/frmview.cxx,v
retrieving revision 1.25
retrieving revision 1.25.176.1
diff -u -r1.25 -r1.25.176.1
--- openoffice.org.orig/sd/source/ui/view/frmview.cxx	27 Jan 2005 14:22:22 -0000	1.25
+++ openoffice.org/sd/source/ui/view/frmview.cxx	6 Jul 2005 12:04:43 -0000	1.25.176.1
@@ -248,7 +248,9 @@
 		bNoAttribs = pFrameView->IsNoAttribs() ;
 		aVisArea = pFrameView->GetVisArea();
 		ePageKind = pFrameView->GetPageKind();
+		ePageKindOnLoad = pFrameView->GetPageKindOnLoad();
 		nSelectedPage = pFrameView->GetSelectedPage();
+		nSelectedPageOnLoad = pFrameView->GetSelectedPageOnLoad();
 		eStandardEditMode = pFrameView->GetViewShEditMode(PK_STANDARD);
 		eNotesEditMode = pFrameView->GetViewShEditMode(PK_NOTES);
 		eHandoutEditMode = pFrameView->GetViewShEditMode(PK_HANDOUT);
@@ -282,7 +284,9 @@
 		bNoAttribs = FALSE;
 		aVisArea = Rectangle( Point(), Size(0, 0) );
 		ePageKind = PK_STANDARD;
+		ePageKindOnLoad = PK_STANDARD;
 		nSelectedPage = 0;
+		nSelectedPageOnLoad = 0;
 		eStandardEditMode = EM_PAGE;
 		eNotesEditMode = EM_PAGE;
 		eHandoutEditMode = EM_MASTERPAGE;
@@ -994,14 +998,22 @@
 			{
 				if( pValue->Value >>= nInt16 )
 				{
-					SetPageKind( (PageKind)nInt16 );
+					SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
+					if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
+                        SetPageKind( (PageKind)nInt16 );
+
+					SetPageKindOnLoad( (PageKind)nInt16 );
 				}
 			}
 			else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SelectedPage ) ) )
 			{
 				if( pValue->Value >>= nInt16 )
 				{
-					SetSelectedPage( (USHORT)nInt16 );
+					SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
+					if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
+						SetSelectedPage( (USHORT)nInt16 );
+
+					SetSelectedPageOnLoad( (USHORT)nInt16 );
 				}
 			}
 			else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsLayerMode ) ) )
Index: source/ui/view/sdview2.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/sdview2.cxx,v
retrieving revision 1.42
retrieving revision 1.42.108.2
diff -u -r1.42 -r1.42.108.2
Index: uiconfig/simpress/accelerator/de/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/de/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.148.1
diff -u -r1.2 -r1.2.148.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/de/default.xml	24 Feb 2005 17:13:16 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/de/default.xml	6 Jul 2005 11:32:08 -0000	1.2.148.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_H" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_T" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/en-GB/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/en-GB/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -r1.2 -r1.2.8.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/en-GB/default.xml	24 Jun 2005 11:30:49 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/en-GB/default.xml	6 Jul 2005 11:32:24 -0000	1.2.8.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/en-US/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/en-US/default.xml,v
retrieving revision 1.4
retrieving revision 1.4.240.1
diff -u -r1.4 -r1.4.240.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/en-US/default.xml	26 Nov 2004 15:04:42 -0000	1.4
+++ openoffice.org/sd/uiconfig/simpress/accelerator/en-US/default.xml	6 Jul 2005 11:32:39 -0000	1.4.240.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/es/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/es/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.148.1
diff -u -r1.2 -r1.2.148.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/es/default.xml	24 Feb 2005 17:13:28 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/es/default.xml	6 Jul 2005 11:32:53 -0000	1.2.148.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/fr/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/fr/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.148.1
diff -u -r1.2 -r1.2.148.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/fr/default.xml	24 Feb 2005 17:13:39 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/fr/default.xml	6 Jul 2005 11:33:04 -0000	1.2.148.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: source/svdraw/svdograf.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/svdraw/svdograf.cxx,v
retrieving revision 1.65
retrieving revision 1.65.380.1
diff -u -r1.65 -r1.65.380.1
--- openoffice.org.orig/svx/source/svdraw/svdograf.cxx	11 Jan 2005 13:03:26 -0000	1.65
+++ openoffice.org/svx/source/svdraw/svdograf.cxx	6 Jul 2005 16:00:41 -0000	1.65.380.1
@@ -940,6 +940,21 @@
 				// get BitmapEx
 				Graphic aTempGraphic = GetTransformedGraphic();
 				Size aPixelSize(aSnapRectPixel.GetSize());
+
+				// #i48495#
+				// When this is done on a very fine resolution OutputDevice (e.g. PDF export) it may lead
+				// to problems since huge pixel bitmaps may be created. Sizes need to be cropped here. Later
+				// it may be nice to have the quadratic pixel size configurable somewhere.
+				const sal_uInt32 nMaxBitmapPixels(800L * 800L);
+				const sal_uInt32 nAllPixels(aPixelSize.getWidth() * aPixelSize.getHeight());
+
+				if(nAllPixels > nMaxBitmapPixels)
+				{
+					const double fScale(sqrt((double)nMaxBitmapPixels) / sqrt((double)nAllPixels));
+					aPixelSize.setWidth(FRound(aPixelSize.getWidth() * fScale));
+					aPixelSize.setHeight(FRound(aPixelSize.getHeight() * fScale));
+				}
+
 				BitmapEx aTempBitmapEx = aTempGraphic.GetBitmapEx(&aPixelSize);
 
 				// paint


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]