diff options
-rw-r--r-- | Package_html_media.mk | 1 | ||||
-rw-r--r-- | help3xsl/help2.js | 2 | ||||
-rw-r--r-- | help3xsl/index2.html | 4 | ||||
-rw-r--r-- | help3xsl/online_transform.xsl | 73 | ||||
-rw-r--r-- | source/auxiliary/scalc.tree | 2 |
5 files changed, 46 insertions, 36 deletions
diff --git a/Package_html_media.mk b/Package_html_media.mk index 66cd339f1a..353a73e2ab 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -16,6 +16,7 @@ $(eval $(call gb_Package_Package,helpcontent2_html_media,$(SRCDIR)/helpcontent2/ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \ files/scalc/imtrigon.ods \ + files/scalc/function_fourier.ods \ files/scalc/pivot.ods \ files/scalc/trigon.ods \ files/scalc/functions_ifs.ods \ diff --git a/help3xsl/help2.js b/help3xsl/help2.js index f40492afb1..2c55d774ce 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -115,7 +115,7 @@ function fixURL(module, system) { if ((DisplayArea = document.getElementById("DisplayArea")) === null) return; var itemlink = DisplayArea.getElementsByTagName("a"); var pSystem = (system === null) ? getSystem() : system; - var pAppl = (module === null) ? "WRITER" : module; + var pAppl = (module === null) ? "SHARED" : module; var n = itemlink.length; for (var i = 0; i < n; i++) { if (itemlink[i].getAttribute("class") != "objectfiles") { diff --git a/help3xsl/index2.html b/help3xsl/index2.html index f0585c8b8f..c08335e08c 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -38,7 +38,7 @@ case "smath": {defaultFile='text/smath/main0000.html';module="MATH";break;} case "sdatabase": {defaultFile='text/sdatabase/main.html';module="BASE";break;} case "sbasic": {defaultFile='text/sbasic/shared/main0601.html';module="BASIC";break;} - default: {defaultFile='text/shared/05/new_help.html';module="WRITER";break;} + default: {defaultFile='text/shared/05/new_help.html';module="SHARED";break;} } //Special case of application F1 or menu Help -> LibreOffice Help if (target.indexOf('.uno:HelpIndex') != -1) { @@ -66,7 +66,7 @@ var system = 'WIN'; if (navigator.userAgent.indexOf("Mac") != -1) system = 'MAC'; if (navigator.userAgent.indexOf("Linux") != -1) system = 'UNIX'; - window.location.replace(existingLang(navigator.language) + '/text/shared/05/new_help.html?&DbPAR=WRITER&System=' + system); + window.location.replace(existingLang(navigator.language) + '/text/shared/05/new_help.html?&DbPAR=SHARED&System=' + system); } }); </script> diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 7ccb97b766..31b32d3b02 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -658,16 +658,17 @@ <!-- SWITCH --> <xsl:template match="switch"> + <xsl:variable name="idsw"> + <xsl:value-of select="//meta/topic/@id" /><xsl:number level="any" count="switch|switchinline" format="_1"/> + </xsl:variable> <xsl:choose> <xsl:when test ="@select = 'sys'"> - <xsl:variable name="idsw" select="concat('swlnsys',generate-id())"/> - <span id="{$idsw}" class="switch"> + <span id="swlnsys{$idsw}" class="switch"> <xsl:apply-templates /> </span> </xsl:when> <xsl:when test ="@select = 'appl'"> - <xsl:variable name="idsw" select="concat('swlnappl',generate-id())"/> - <span id="{$idsw}" class="switch"> + <span id="swlnappl{$idsw}" class="switch"> <xsl:apply-templates /> </span> </xsl:when> @@ -677,16 +678,17 @@ </xsl:choose> </xsl:template> <xsl:template match="switch" mode="embedded"> + <xsl:variable name="idsw"> + <xsl:value-of select="//meta/topic/@id" /><xsl:number level="any" count="switch|switchinline" format="_1"/> + </xsl:variable> <xsl:choose> <xsl:when test ="@select = 'sys'"> - <xsl:variable name="idsw" select="concat('swlnsys',generate-id())"/> - <span id="{$idsw}" class="switch"> + <span id="swlnsys{$idsw}" class="switch"> <xsl:apply-templates mode="embedded"/> </span> </xsl:when> <xsl:when test ="@select = 'appl'"> - <xsl:variable name="idsw" select="concat('swlnappl',generate-id())"/> - <span id="{$idsw}" class="switch"> + <span id="swlnappl{$idsw}" class="switch"> <xsl:apply-templates mode="embedded"/> </span> </xsl:when> @@ -698,16 +700,17 @@ <!-- SWITCHINLINE --> <xsl:template match="switchinline"> + <xsl:variable name="idsw"> + <xsl:value-of select="//meta/topic/@id" /><xsl:number level="any" count="switch|switchinline" format="_1"/> + </xsl:variable> <xsl:choose> <xsl:when test ="@select = 'sys'"> - <xsl:variable name="idsw" select="concat('swlnsys',generate-id())"/> - <span id="{$idsw}" class="switchinline"> + <span id="swlnsys{$idsw}" class="switchinline"> <xsl:apply-templates /> </span> </xsl:when> <xsl:when test ="@select = 'appl'"> - <xsl:variable name="idsw" select="concat('swlnappl',generate-id())"/> - <span id="{$idsw}" class="switchinline"> + <span id="swlnappl{$idsw}" class="switchinline"> <xsl:apply-templates /> </span> </xsl:when> @@ -717,16 +720,17 @@ </xsl:choose> </xsl:template> <xsl:template match="switchinline" mode="embedded"> + <xsl:variable name="idsw"> + <xsl:value-of select="//meta/topic/@id" /><xsl:number level="any" count="switch|switchinline" format="_1"/> + </xsl:variable> <xsl:choose> <xsl:when test ="@select = 'sys'"> - <xsl:variable name="idsw" select="concat('swlnsys',generate-id())"/> - <span id="{$idsw}" class="switchinline"> + <span id="swlnsys{$idsw}" class="switchinline"> <xsl:apply-templates mode="embedded"/> </span> </xsl:when> <xsl:when test ="@select = 'appl'"> - <xsl:variable name="idsw" select="concat('swlnappl',generate-id())"/> - <span id="{$idsw}" class="switchinline"> + <span id="swln{@select}_{$idsw}" class="switchinline"> <xsl:apply-templates mode="embedded"/> </span> </xsl:when> @@ -1093,13 +1097,15 @@ <!-- Evaluate a case or caseinline switch --> <xsl:template name="insertcase"> <xsl:param name="embedded" /> - <xsl:variable name="auxID" select="concat(@select,generate-id())"/> + <xsl:variable name="auxID"> + <xsl:value-of select="//meta/topic/@id" /><xsl:number level="any" count="switch|switchinline" format="_1"/> + </xsl:variable> <xsl:choose> <xsl:when test="$embedded = 'yes'"> - <span hidden="true" id="{$auxID}" class="{@select}"><xsl:apply-templates mode="embedded"/></span> + <span hidden="true" id="{@select}{$auxID}" class="{@select}"><xsl:apply-templates mode="embedded"/></span> </xsl:when> <xsl:otherwise> - <span hidden="true" id="{$auxID}" class="{@select}"><xsl:apply-templates/></span> + <span hidden="true" id="{@select}{$auxID}" class="{@select}"><xsl:apply-templates/></span> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -1107,26 +1113,27 @@ <!-- Evaluate a default or defaultinline switch --> <xsl:template name="insertdefault"> <xsl:param name="embedded" /> + <xsl:variable name="auxID"> + <xsl:value-of select="//meta/topic/@id" /><xsl:number level="any" count="switch|switchinline" format="_1"/> + </xsl:variable> <xsl:choose> <xsl:when test="parent::switch[@select='sys'] or parent::switchinline[@select='sys']"> - <xsl:variable name="auxID" select="concat('default',generate-id())"/> <xsl:choose> <xsl:when test="$embedded = 'yes'"> - <span hidden="true" id="{$auxID}"><xsl:apply-templates mode="embedded"/></span> + <span hidden="true" id="default{$auxID}"><xsl:apply-templates mode="embedded"/></span> </xsl:when> <xsl:otherwise> - <span hidden="true" id="{$auxID}"><xsl:apply-templates /></span> + <span hidden="true" id="default{$auxID}"><xsl:apply-templates /></span> </xsl:otherwise> </xsl:choose> </xsl:when> <xsl:when test="parent::switch[@select='appl'] or parent::switchinline[@select='appl']"> - <xsl:variable name="auxID" select="concat('default',generate-id())"/> <xsl:choose> <xsl:when test="$embedded = 'yes'"> - <span hidden="true" id="{$auxID}"><xsl:apply-templates mode="embedded"/></span> + <span hidden="true" id="default{$auxID}"><xsl:apply-templates mode="embedded"/></span> </xsl:when> <xsl:otherwise> - <span hidden="true" id="{$auxID}"><xsl:apply-templates /></span> + <span hidden="true" id="default{$auxID}"><xsl:apply-templates /></span> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -1262,6 +1269,9 @@ <!-- Insert an object --> <xsl:template name="insertobject"> + <xsl:variable name="auxID"> + <xsl:value-of select="//meta/topic/@id" /><xsl:number level="any" count="object" format="_1"/> + </xsl:variable> <xsl:variable name="tmp_href"><xsl:value-of select="concat($urlpre,'text/shared/00/00000004.xhp')"/></xsl:variable> <xsl:variable name="tmp_doc" select="document($tmp_href)"/> <xsl:variable name="data"> @@ -1274,7 +1284,6 @@ <xsl:variable name="height"> <xsl:call-template name="convert2px"><xsl:with-param name="value" select="@height"/></xsl:call-template> </xsl:variable> - <xsl:variable name="auxID" select="concat('obj',generate-id())"/> <xsl:choose> <xsl:when test="starts-with(@type,'video/youtube')"> <div id="mediadiv"> @@ -1297,7 +1306,7 @@ <xsl:with-param name="string" select="@data"/> </xsl:call-template> </xsl:variable> - <div class="samplefilesection" id="{$auxID}"> + <div class="samplefilesection" id="obj{$auxID}"> <h3><xsl:apply-templates select="$tmp_doc//variable[@id='samplefile']"/></h3> <a class="objectfiles" href="{$src}"><img src="media/navigation/libo-calc.svg" width="25px" height="30px"></img></a> </div> @@ -1308,7 +1317,7 @@ <xsl:with-param name="string" select="@data"/> </xsl:call-template> </xsl:variable> - <div class="samplefilesection" id="{$auxID}"> + <div class="samplefilesection" id="obj{$auxID}"> <h3><xsl:apply-templates select="$tmp_doc//variable[@id='samplefile']"/></h3> <a class="objectfiles" href="{$src}"><img src="media/navigation/libo-writer.svg" width="25px" height="30px"></img></a> </div> @@ -1319,7 +1328,7 @@ <xsl:with-param name="string" select="@data"/> </xsl:call-template> </xsl:variable> - <div class="samplefilesection" id="{$auxID}"> + <div class="samplefilesection" id="obj{$auxID}"> <h3><xsl:apply-templates select="$tmp_doc//variable[@id='samplefile']"/></h3> <a class="objectfiles" href="{$src}"><img src="media/navigation/libo-impress.svg" width="25px" height="30px"></img></a> </div> @@ -1330,7 +1339,7 @@ <xsl:with-param name="string" select="@data"/> </xsl:call-template> </xsl:variable> - <div class="samplefilesection" id="{$auxID}"> + <div class="samplefilesection" id="obj{$auxID}"> <h3><xsl:apply-templates select="$tmp_doc//variable[@id='samplefile']"/></h3> <a class="objectfiles" href="{$src}"><img src="media/navigation/libo-draw.svg" width="25px" height="30px"></img></a> </div> @@ -1341,7 +1350,7 @@ <xsl:with-param name="string" select="@data"/> </xsl:call-template> </xsl:variable> - <div class="samplefilesection" id="{$auxID}"> + <div class="samplefilesection" id="obj{$auxID}"> <h3><xsl:apply-templates select="$tmp_doc//variable[@id='samplefile']"/></h3> <a class="objectfiles" href="{$src}"><img src="media/navigation/libo-math.svg" width="25px" height="30px"></img></a> </div> @@ -1352,7 +1361,7 @@ <xsl:with-param name="string" select="@data"/> </xsl:call-template> </xsl:variable> - <div class="samplefilesection" id="{$auxID}"> + <div class="samplefilesection" id="obj{$auxID}"> <h3><xsl:apply-templates select="$tmp_doc//variable[@id='samplefile']"/></h3> <a class="objectfiles" href="{$src}"><img src="media/navigation/libo-base.svg" width="25px" height="30px"></img></a> </div> diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index 97a11ee049..8d5baac357 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -192,7 +192,7 @@ <topic id="sbasic/text/sbasic/guide/read_write_values.xhp">Reading and Writing values to Ranges</topic> <topic id="sbasic/text/sbasic/guide/calc_borders.xhp">Formatting Borders in Calc with Macros</topic> </node> - <node id="0815" title="Miscellaneous"> + <node id="0816" title="Miscellaneous"> <topic id="scalc/text/scalc/guide/auto_off.xhp">Deactivating Automatic Changes</topic> <topic id="scalc/text/scalc/guide/consolidate.xhp">Consolidating Data</topic> <topic id="scalc/text/scalc/guide/goalseek.xhp">Applying Goal Seek</topic> |