Merge commit 'ooo/DEV300_m106' into integration/dev300_m106

Conflicts:
avmedia/source/gstreamer/gstframegrabber.cxx
avmedia/source/gstreamer/gstplayer.cxx
avmedia/source/gstreamer/gstplayer.hxx
basic/inc/basic/sbxdef.hxx
basic/source/classes/sbxmod.cxx
basic/source/comp/makefile.mk
basic/source/comp/sbcomp.cxx
basic/source/inc/namecont.hxx
basic/source/inc/scriptcont.hxx
basic/source/runtime/methods.cxx
basic/source/runtime/runtime.cxx
basic/source/runtime/stdobj.cxx
basic/source/runtime/step1.cxx
basic/source/uno/namecont.cxx
basic/util/makefile.mk
connectivity/source/commontools/predicateinput.cxx
connectivity/source/drivers/dbase/DNoException.cxx
connectivity/source/drivers/dbase/DTable.cxx
connectivity/source/drivers/file/fcomp.cxx
connectivity/source/drivers/jdbc/JConnection.cxx
connectivity/source/drivers/odbcbase/OResultSet.cxx
connectivity/source/drivers/odbcbase/OStatement.cxx
connectivity/source/parse/sqlnode.cxx
desktop/source/app/app.cxx
drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
drawinglayer/source/processor2d/vclprocessor2d.cxx
formula/inc/formula/token.hxx
formula/source/core/api/token.cxx
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
fpicker/source/win32/filepicker/platform_vista.h
framework/source/helper/persistentwindowstate.cxx
framework/source/uielement/menubarmanager.cxx
oovbaapi/ooo/vba/XFoundFiles.idl
oovbaapi/ooo/vba/excel/XApplication.idl
oovbaapi/ooo/vba/msforms/XCheckBox.idl
oovbaapi/ooo/vba/msforms/XComboBox.idl
oovbaapi/ooo/vba/msforms/XControl.idl
oovbaapi/ooo/vba/msforms/XGroupBox.idl
oovbaapi/ooo/vba/msforms/XLabel.idl
oovbaapi/ooo/vba/msforms/XListBox.idl
oovbaapi/ooo/vba/msforms/XNewFont.idl
oovbaapi/ooo/vba/msforms/XRadioButton.idl
oovbaapi/ooo/vba/msforms/XTextBox.idl
oovbaapi/ooo/vba/msforms/XToggleButton.idl
scripting/source/dlgprov/dlgevtatt.cxx
sfx2/source/control/unoctitm.cxx
sfx2/source/doc/objstor.cxx
sfx2/source/doc/objxtor.cxx
svx/inc/svx/svdograf.hxx
svx/source/form/fmpage.cxx
svx/source/form/fmpgeimp.cxx
svx/source/svdraw/svdedtv.cxx
svx/source/svdraw/svdfmtf.cxx
svx/source/svdraw/svdograf.cxx
svx/source/svdraw/svdouno.cxx
svx/source/xml/xmlgrhlp.cxx
uui/source/iahndl-ssl.cxx
vbahelper/Library_msforms.mk
vbahelper/Library_vbahelper.mk
vbahelper/inc/vbahelper/vbahelper.hxx
vbahelper/prj/build.lst
vbahelper/source/msforms/vbacombobox.cxx
vbahelper/source/msforms/vbacontrol.cxx
vbahelper/source/msforms/vbacontrols.cxx
vbahelper/source/msforms/vbaframe.cxx
vbahelper/source/msforms/vbaframe.hxx
vbahelper/source/msforms/vbalabel.cxx
vbahelper/source/msforms/vbalabel.hxx
vbahelper/source/msforms/vbalistbox.cxx
vbahelper/source/msforms/vbalistbox.hxx
vbahelper/source/msforms/vbamultipage.cxx
vbahelper/source/msforms/vbatogglebutton.cxx
vbahelper/source/msforms/vbauserform.cxx
vbahelper/source/vbahelper/vbacommandbar.cxx
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
vbahelper/source/vbahelper/vbahelper.cxx
vbahelper/source/vbahelper/vbawindowbase.cxx
xmloff/source/meta/xmlmetai.cxx
xmloff/source/style/PageMasterExportPropMapper.cxx
xmloff/source/style/PageMasterStyleMap.cxx
xmloff/source/text/txtexppr.cxx
xmloff/source/text/txtprmap.cxx

3 files changed, 31 insertions, 33 deletions

diff --git a/readlicense_oo/docs/readme.xsl b/readlicense_oo/docs/readme.xsl
index 4e77fa522c3d..e63e319cf502 100755
--- a/readlicense_oo/docs/readme.xsl
+++ b/readlicense_oo/docs/readme.xsl
@@ -34,6 +34,13 @@
 		</xsl:if>
 	</xsl:param>
 	
+	<xsl:param name="lf">
+		<xsl:choose>
+			<xsl:when test="$platform='WIN'"><xsl:text>&#xD;&#xA;</xsl:text></xsl:when>
+			<xsl:otherwise><xsl:text>&#xA;</xsl:text></xsl:otherwise>
+		</xsl:choose>
+	</xsl:param>
+	
 	<xsl:template match="/">
 		<xsl:choose>
 			<xsl:when test="$type='html'">
@@ -115,59 +122,50 @@
 				<xsl:apply-templates/>
 			</xsl:when>
 			<xsl:when test="name(.)='li'">
-				<xsl:text>
-</xsl:text>* <xsl:apply-templates/>
+				<xsl:value-of select="$lf"/>* <xsl:apply-templates/>
 			</xsl:when>
 			<xsl:when test="name(.)='ul'">
-				<xsl:text>
-</xsl:text>
+				<xsl:value-of select="$lf"/>
 				<xsl:apply-templates/>
 			</xsl:when>
 			<xsl:when test="name(.)='ol'">
-				<xsl:text>
-</xsl:text>
+				<xsl:value-of select="$lf"/>
 				<xsl:apply-templates/>
 			</xsl:when>
 			<xsl:when test="name(.)='p'">
 				<xsl:if test="(not(name(..)='li') and (count(a) = 0))">
-					<xsl:text>
-
-</xsl:text>
+					<xsl:value-of select="$lf"/>
+					<xsl:value-of select="$lf"/>
 				</xsl:if>
 				<xsl:apply-templates/>
 			</xsl:when>
 			<xsl:when test="name(.)='h1'">
-				<xsl:text>
-			
-======================================================================
-</xsl:text>
+				<xsl:value-of select="$lf"/>
+				<xsl:text>======================================================================</xsl:text>
+				<xsl:value-of select="$lf"/>
 				<xsl:apply-templates/>
-				<xsl:text>
-======================================================================</xsl:text>
+				<xsl:value-of select="$lf"/>
+				<xsl:text>======================================================================</xsl:text>
+				<xsl:value-of select="$lf"/>
 			</xsl:when>
 			<xsl:when test="name(.)='h2'">
-				<xsl:text>
-			
-----------------------------------------------------------------------
-</xsl:text>
+				<xsl:value-of select="$lf"/>
+				<xsl:value-of select="$lf"/>
+				<xsl:text>----------------------------------------------------------------------</xsl:text>
+				<xsl:value-of select="$lf"/>
 				<xsl:apply-templates/>
-				<xsl:text>
-----------------------------------------------------------------------</xsl:text>
-			
+				<xsl:value-of select="$lf"/>
+				<xsl:text>----------------------------------------------------------------------</xsl:text>
 			</xsl:when>
 			<xsl:when test="name(.)='h3'">
-				<xsl:text>
-			
-</xsl:text>
+				<xsl:value-of select="$lf"/>
+				<xsl:value-of select="$lf"/>
 				<xsl:apply-templates/>
-				<xsl:text>
-----------------------------------------------------------------------</xsl:text>
-			
+				<xsl:value-of select="$lf"/>
+				<xsl:text>----------------------------------------------------------------------</xsl:text>
 			</xsl:when>
 		</xsl:choose>
 	</xsl:if>
 	</xsl:template>
-			
-	
 
 </xsl:stylesheet>
diff --git a/readlicense_oo/docs/readme/eval.xsl b/readlicense_oo/docs/readme/eval.xsl
index e8830d43015c..613e61d673f9 100755
--- a/readlicense_oo/docs/readme/eval.xsl
+++ b/readlicense_oo/docs/readme/eval.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="html" />
+  <xsl:output method="text" />
 	<xsl:template match="/Readme">
 	<html>
 	<head>
diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm
index a760bffdf2a8..8bcf7ca698e8 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
@@ -30,6 +29,7 @@
 
 		<div id="Installation">
 			<h2 id="rr3fgf42r" xml:lang="en-US">Notes on Installation</h2>
+			<p class="note" id="javaneeded" xml:lang="en-US">${PRODUCTNAME} requires a recent version of JAVA for full functionality which is part of the ${PRODUCTNAME} installation package.</p>
 			<h3 id="sdfsdfgf42r" xml:lang="en-US">System Requirements</h3>
 			<div class="MAC" id="SystemRequirements_OSX">
 				<ul>