AllLangHelp_scalc.mk | 2 + source/text/scalc/01/04060110.xhp | 34 +------------------------ source/text/scalc/01/func_code.xhp | 40 ++++++++++++++++++++++++++++++ source/text/scalc/01/func_concatenate.xhp | 38 ++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 32 deletions(-)
New commits: commit 7b7ddc4bf507d27578f3bf17fd28dc40b95d6586 Author: Pierre F <f...@bger.ch> AuthorDate: Fri Oct 25 15:23:30 2024 +0200 Commit: Olivier Hallot <olivier.hal...@libreoffice.org> CommitDate: Tue Oct 29 12:16:39 2024 +0100 tdf#143846 split CODE() + CONCATENATE() Change-Id: Ic190564f4e7a7884900766cee26322f5ab7dfec9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/175607 Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org> Tested-by: Jenkins diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 66933637e7..756a58e757 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -207,6 +207,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_ceiling \ helpcontent2/source/text/scalc/01/func_countifs \ helpcontent2/source/text/scalc/01/func_color \ + helpcontent2/source/text/scalc/01/func_code \ + helpcontent2/source/text/scalc/01/func_concatenate \ helpcontent2/source/text/scalc/01/func_concat \ helpcontent2/source/text/scalc/01/func_convert \ helpcontent2/source/text/scalc/01/func_date \ diff --git a/source/text/scalc/01/04060110.xhp b/source/text/scalc/01/04060110.xhp index 71276ba4b8..1588ef8454 100644 --- a/source/text/scalc/01/04060110.xhp +++ b/source/text/scalc/01/04060110.xhp @@ -102,39 +102,9 @@ <section id="clean"><embed href="text/scalc/01/func_clean.xhp#func_clean"/></section> -<section id="code"> -<bookmark branch="index" id="bm_id3155498"> - <bookmark_value>CODE function</bookmark_value> -</bookmark> - -<bookmark branch="hid/SC_HID_FUNC_CODE" id="bm_id3159084" localize="false"/> - -<h2 id="hd_id3155498">CODE</h2> -<paragraph id="par_id3152770" role="paragraph"><ahelp hid="HID_FUNC_CODE">Returns a numeric code for the first character in a text string.</ahelp></paragraph> - -<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> -<paragraph id="par_id3149188" role="code">CODE("Text")</paragraph> -<paragraph id="par_id3154383" role="paragraph"> <emph>Text</emph> is the text for which the code of the first character is to be found.</paragraph> -<embed href="text/scalc/00/00000004.xhp#codes"/> - -<embed href="text/scalc/01/common_func.xhp#sectionexample"/> -<paragraph id="par_id3159209" role="paragraph"> <item type="input">=CODE("Hieronymus")</item> returns 72, <item type="input">=CODE("hieroglyphic")</item> returns 104.</paragraph> -<note id="par_id3150280">The code used here does not refer to ASCII, but to the code table currently loaded.</note> -</section> +<section id="code"><embed href="text/scalc/01/func_code.xhp#func_code"/></section> -<section id="concatenate"> -<bookmark branch="index" id="bm_id3149688"> - <bookmark_value>CONCATENATE function</bookmark_value> -</bookmark> -<bookmark branch="hid/SC_HID_FUNC_VERKETTEN" id="bm_id3153084" localize="false"/> -<h2 id="hd_id3149688">CONCATENATE</h2> -<paragraph id="par_id3154524" role="paragraph"><ahelp hid="HID_FUNC_VERKETTEN">Combines several text strings into one string.</ahelp></paragraph> -<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> -<paragraph id="par_id3155954" role="code">CONCATENATE(<embedvar href="text/scalc/01/ful_func.xhp#string255_1" markup="keep"/>)</paragraph> -<paragraph role="paragraph" id="par_id781585222554150"><emph>String 1[; String 2][; … ;[String 255]]</emph> are strings or references to cells containing strings.</paragraph> -<embed href="text/scalc/01/common_func.xhp#sectionexample"/> -<paragraph id="par_id3150008" role="paragraph"> <item type="input">=CONCATENATE("Good ";"Morning ";"Mrs. ";"Doe")</item> returns: Good Morning Mrs. Doe.</paragraph> -</section> +<section id="concatenate"><embed href="text/scalc/01/func_concatenate.xhp#func_concatenate"/></section> <section id="decimal"> <bookmark branch="index" id="bm_id3145166"> diff --git a/source/text/scalc/01/func_code.xhp b/source/text/scalc/01/func_code.xhp new file mode 100644 index 0000000000..66470b57e7 --- /dev/null +++ b/source/text/scalc/01/func_code.xhp @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> + <!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + --> + <meta> + <topic id="calcfunc_code" indexer="include" status="PUBLISH"> + <title id="tit">CODE Function</title> + <filename>/text/scalc/01/func_code.xhp</filename> + </topic> + </meta> + <body> + <bookmark branch="index" id="bm_id3155498"> + <bookmark_value>CODE function</bookmark_value> +</bookmark> + <bookmark branch="hid/SC_HID_FUNC_CODE" id="bm_id3159084" localize="false"/> + <section id="func_code"> + <h1 id="hd_id3155498"> + <variable id="code_h1"> + <link href="text/scalc/01/func_code.xhp">CODE</link> + </variable> + </h1> + <paragraph id="par_id3152770" role="paragraph"> + <ahelp hid="HID_FUNC_CODE">Returns a numeric code for the first character in a text string.</ahelp> + </paragraph> + </section> + <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> + <paragraph id="par_id3149188" role="code">CODE("Text")</paragraph> + <paragraph id="par_id3154383" role="paragraph"> <emph>Text</emph> is the text for which the code of the first character is to be found.</paragraph> + <embed href="text/scalc/00/00000004.xhp#codes"/> + <embed href="text/scalc/01/common_func.xhp#sectionexample"/> + <paragraph id="par_id3159209" role="paragraph"> <item type="input">=CODE("Hieronymus")</item> returns 72, <item type="input">=CODE("hieroglyphic")</item> returns 104.</paragraph> + <note id="par_id3150280">The code used here does not refer to ASCII, but to the code table currently loaded.</note> + </body> +</helpdocument> diff --git a/source/text/scalc/01/func_concatenate.xhp b/source/text/scalc/01/func_concatenate.xhp new file mode 100644 index 0000000000..81de3cfb4e --- /dev/null +++ b/source/text/scalc/01/func_concatenate.xhp @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> + <!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + --> + <meta> + <topic id="calcfunc_concatenate" indexer="include" status="PUBLISH"> + <title id="tit">CONCATENATE Function</title> + <filename>/text/scalc/01/func_concatenate.xhp</filename> + </topic> + </meta> + <body> + <bookmark branch="index" id="bm_id3149688"> + <bookmark_value>CONCATENATE function</bookmark_value> +</bookmark> + <bookmark branch="hid/SC_HID_FUNC_VERKETTEN" id="bm_id3153084" localize="false"/> + <section id="func_concatenate"> + <h1 id="hd_id3149688"> + <variable id="concatenate_h1"> + <link href="text/scalc/01/func_concatenate.xhp">CONCATENATE</link> + </variable> + </h1> + <paragraph id="par_id3154524" role="paragraph"> + <ahelp hid="HID_FUNC_VERKETTEN">Combines several text strings into one string.</ahelp> + </paragraph> + </section> + <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> + <paragraph id="par_id3155954" role="code">CONCATENATE(<embedvar href="text/scalc/01/ful_func.xhp#string255_1" markup="keep"/>)</paragraph> + <paragraph role="paragraph" id="par_id781585222554150"><emph>String 1[; String 2][; … ;[String 255]]</emph> are strings or references to cells containing strings.</paragraph> + <embed href="text/scalc/01/common_func.xhp#sectionexample"/> + <paragraph id="par_id3150008" role="paragraph"> <item type="input">=CONCATENATE("Good ";"Morning ";"Mrs. ";"Doe")</item> returns: Good Morning Mrs. Doe.</paragraph> + </body> +</helpdocument>