diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:20 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:20 +0200 |
| commit | 9df8682ced86258da76a730ecf354c788fffc1f2 (patch) | |
| tree | 590af31bfe3d5cfd0d4de4812a0bd696b9415d2b /readlicense_oo | |
| parent | b41941a81473b48e895ab3a30905986b029facc4 (diff) | |
| parent | a79c69155ec42ce6817980b6c875f9b39041d2d4 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/inc/runtime.hxx
basic/source/runtime/step1.cxx
desktop/source/deployment/dp_services.cxx
drawinglayer/prj/d.lst
drawinglayer/source/primitive2d/makefile.mk
sfx2/source/appl/appinit.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/inc/appdata.hxx
sfx2/source/view/viewfrm.cxx
svx/source/fmcomp/gridctrl.cxx
vbahelper/source/vbahelper/vbahelper.cxx
Diffstat (limited to 'readlicense_oo')
| -rwxr-xr-x | readlicense_oo/docs/readme.xsl | 58 | ||||
| -rwxr-xr-x | readlicense_oo/docs/readme/eval.xsl | 2 | ||||
| -rwxr-xr-x | readlicense_oo/docs/readme/readme.xrm | 4 |
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>
</xsl:text></xsl:when> + <xsl:otherwise><xsl:text>
</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> |