AllLangHelp_scalc.mk | 2 source/text/scalc/01/04060110.xhp | 47 ++++----------- source/text/scalc/01/func_encodeurl.xhp | 44 ++++++++++++++ source/text/scalc/01/func_filterxml.xhp | 46 +++++++++++++++ source/text/scalc/01/func_webservice.xhp | 92 +++++++------------------------ 5 files changed, 129 insertions(+), 102 deletions(-)
New commits: commit e94c853110b878de73e11df24c0ebeeb4bc248fd Author: Olivier Hallot <olivier.hal...@libreoffice.org> AuthorDate: Wed Jul 16 08:47:35 2025 -0300 Commit: Olivier Hallot <olivier.hal...@libreoffice.org> CommitDate: Wed Jul 16 13:50:20 2025 +0200 tdf#118619 Improve FILTERXML Help page + refactor. + Split webservice.xhp file into individual pages. Change-Id: Ib745569298666c6ac8203747961eb3731fac681b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/187960 Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org> Tested-by: Jenkins diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 2dacbae754..24e705fb17 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -222,6 +222,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_decimal \ helpcontent2/source/text/scalc/01/func_dollar \ helpcontent2/source/text/scalc/01/func_drop \ + helpcontent2/source/text/scalc/01/func_encodeurl \ helpcontent2/source/text/scalc/01/func_exact \ helpcontent2/source/text/scalc/01/func_find \ helpcontent2/source/text/scalc/01/func_fixed \ @@ -234,6 +235,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_error_type \ helpcontent2/source/text/scalc/01/func_expand \ helpcontent2/source/text/scalc/01/func_filter \ + helpcontent2/source/text/scalc/01/func_filterxml \ helpcontent2/source/text/scalc/01/func_findb \ helpcontent2/source/text/scalc/01/func_floor \ helpcontent2/source/text/scalc/01/func_forecastetsadd \ diff --git a/source/text/scalc/01/04060110.xhp b/source/text/scalc/01/04060110.xhp index 5fefe476c3..12632d89da 100644 --- a/source/text/scalc/01/04060110.xhp +++ b/source/text/scalc/01/04060110.xhp @@ -82,21 +82,13 @@ <sort order="asc" descendant="h2"> -<section id="arabic"> - <embed href="text/scalc/01/func_arabic.xhp#func_arabic"/> -</section> +<section id="arabic"><embed href="text/scalc/01/func_arabic.xhp#func_arabic"/></section> -<section id="asc"> - <embed href="text/scalc/01/func_asc.xhp#func_asc"/> -</section> +<section id="asc"><embed href="text/scalc/01/func_asc.xhp#func_asc"/></section> -<section id="bahttext"> - <embed href="text/scalc/01/func_bahttext.xhp#func_bahttext"/> -</section> +<section id="bahttext"><embed href="text/scalc/01/func_bahttext.xhp#func_bahttext"/></section> -<section id="base"> - <embed href="text/scalc/01/func_base.xhp#func_base"/> -</section> +<section id="base"><embed href="text/scalc/01/func_base.xhp#func_base"/></section> <section id="char"><embed href="text/scalc/01/func_char.xhp#func_char"/></section> @@ -110,15 +102,17 @@ <section id="dollar"><embed href="text/scalc/01/func_dollar.xhp#func_dollar"/></section> +<section id="encodeurl"><embed href="text/scalc/01/func_encodeurl.xhp#encodeurlfuncheader"/></section> + <section id="exact"><embed href="text/scalc/01/func_exact.xhp#func_exact"/></section> +<section id="filterxml"><embed href="text/scalc/01/func_filterxml.xhp#filterxmlfuncheader"/></section> + <section id="find"><embed href="text/scalc/01/func_find.xhp#func_find"/></section> <section id="fixed"><embed href="text/scalc/01/func_fixed.xhp#func_fixed"/></section> -<section id="jis"> - <embed href="text/scalc/01/func_jis.xhp#func_jis"/> -</section> +<section id="jis"> <embed href="text/scalc/01/func_jis.xhp#func_jis"/></section> <section id="left"><embed href="text/scalc/01/func_left.xhp#func_left"/></section> @@ -136,9 +130,7 @@ <section id="proper"><embed href="text/scalc/01/func_proper.xhp#func_proper"/></section> -<section id="regex"> -<embed href="text/scalc/01/func_regex.xhp#func_regex"/> -</section> +<section id="regex"><embed href="text/scalc/01/func_regex.xhp#func_regex"/></section> <section id="replace"><embed href="text/scalc/01/func_replace.xhp#func_replace"/></section> @@ -148,9 +140,7 @@ <section id="rightb"><embed href="text/scalc/01/func_rightb.xhp#func_rightb"/></section> -<section id="roman"> - <embed href="text/scalc/01/func_roman.xhp#func_roman"/> -</section> +<section id="roman"> <embed href="text/scalc/01/func_roman.xhp#func_roman"/></section> <section id="search"><embed href="text/scalc/01/func_search.xhp#func_search"/></section> @@ -168,19 +158,10 @@ <section id="upper"><embed href="text/scalc/01/func_upper.xhp#func_upper"/></section> -<section id="value"> -<embed href="text/scalc/01/func_value.xhp#func_value"/> -</section> +<section id="value"><embed href="text/scalc/01/func_value.xhp#func_value"/></section> + +<section id="webservice"><embed href="text/scalc/01/func_webservice.xhp#webservicefuncheader"/></section> -<section id="webservice"> - <embed href="text/scalc/01/func_webservice.xhp#webservicefuncheader"/> -</section> -<section id="filterxml"> - <embed href="text/scalc/01/func_webservice.xhp#filterxmlfuncheader"/> -</section> -<section id="encodeurl"> - <embed href="text/scalc/01/func_webservice.xhp#encodeurlfuncheader"/> -</section> </sort> <section id="relatedtopics"> diff --git a/source/text/scalc/01/func_encodeurl.xhp b/source/text/scalc/01/func_encodeurl.xhp new file mode 100644 index 0000000000..87a39ca57c --- /dev/null +++ b/source/text/scalc/01/func_encodeurl.xhp @@ -0,0 +1,44 @@ +<?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="textscalc01func_encodeurlxhp" indexer="include" status="PUBLISH"> + <title id="tit">ENCODEURL</title> + <filename>/text/scalc/01/func_encodeurl.xhp</filename> + </topic> +</meta> +<body> +<bookmark id="bm_id121517132649769" branch="hid/SC_HID_FUNC_ENCODEURL" localize="false"/> +<bookmark branch="index" id="bm_id811517136840444"> +<bookmark_value>ENCODEURL function</bookmark_value> +</bookmark> +<section id="encodeurlfuncheader"> +<h1 id="hd_id671517132649769"><variable id="encodeurlname"><link href="text/scalc/01/func_encodeurl.xhp">ENCODEURL</link></variable></h1> +<paragraph id="par_id51517132649769" role="paragraph"><ahelp hid="HID_FUNC_ENCODEURL">Returns a URL-encoded string.</ahelp></paragraph> +</section> +<paragraph role="paragraph" id="par_id721517134647880">Use this function to transform text with symbols of national alphabets (for example accented characters, non-ASCII alphabets or Asian words) to a string of URL-standard symbols.</paragraph> +<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> +<paragraph role="code" id="par_id351517132879400">ENCODEURL(Text)</paragraph> +<paragraph role="paragraph" id="par_id921517132924079"><emph>Text</emph>: String to encode to a sequence of URL-standard symbols.</paragraph> +<embed href="text/scalc/01/ful_func.xhp#func_head_example"/> +<paragraph role="paragraph" id="par_id651517132994921">If cell A1 contains the Cyrillic text "автомобиль", <input>=ENCODEURL(A1)</input> returns %D0%B0%D0%B2%D1%82%D0%BE%D0%BC%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C (the word "автомобиль" means car in Russian).</paragraph> +<paragraph role="paragraph" id="par_id991517133057478">If cell B1 contains the text "車", <input>=ENCODEURL(B1)</input> returns %E8%BB%8A ("車" means car in Japanese).</paragraph> +<embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> +<embed href="text/scalc/00/avail_release.xhp#5.0"/> +<embed href="text/scalc/01/common_func.xhp#notODFF"/> +<paragraph role="paragraph" id="par_id301640873986703" localize="false"><literal>COM.MICROSOFT.ENCODEURL</literal></paragraph> +<section id="relatedtopics"> + <paragraph role="paragraph" id="par_id781752665258334" localize="false"><embedvar href="text/scalc/01/func_filterxml.xhp#filterxmlfuncname" markup="ignore"/></paragraph> + <paragraph role="paragraph" id="par_id461752665283166" localize="false"><embedvar href="text/scalc/01/func_webservice.xhp#webservicefuncname" markup="ignore"/></paragraph> + <tip id="par_id631752609367566"><link href="https://wiki.documentfoundation.org/Documentation/Calc_Functions/ENCODEURL">ENCODEURL wiki page</link></tip> +</section> +</body> +</helpdocument> diff --git a/source/text/scalc/01/func_filterxml.xhp b/source/text/scalc/01/func_filterxml.xhp new file mode 100644 index 0000000000..bdf19f43e6 --- /dev/null +++ b/source/text/scalc/01/func_filterxml.xhp @@ -0,0 +1,46 @@ +<?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="textscalc01func_filterxmlxhp" indexer="include" status="PUBLISH"> + <title id="tit">FILTERXML</title> + <filename>/text/scalc/01/func_filterxml.xhp</filename> + </topic> +</meta> +<body> +<bookmark branch="hid/SC_HID_FUNC_FILTERXML" id="bm_id2950028" localize="false"/> +<bookmark branch="index" id="bm_id2949012"> +<bookmark_value>FILTERXML function</bookmark_value> +</bookmark> +<section id="filterxmlfuncheader"> + <h1 id="hd_id2949012"><variable id="filterxmlfuncname"><link href="text/scalc/01/func_filterxml.xhp">FILTERXML</link></variable></h1> + <paragraph role="paragraph" id="par_id2949893"><ahelp hid="HID_FUNC_FILTERXML">Apply a XPath expression to a XML document.</ahelp></paragraph> +</section> +<paragraph role="paragraph" id="par_id861752609832284">XML Path Language (XPath) is a query language that uses path expressions (with a non-XML syntax) to select parts of an XML document.</paragraph> +<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> +<paragraph role="code" id="par_id2954844">FILTERXML(XML Document; XPath expression)</paragraph> +<paragraph role="paragraph" id="par_id2947469"><emph>XML Document (required):</emph> String containing a valid XML stream.</paragraph> +<paragraph role="paragraph" id="par_id2847469"><emph>XPath expression (required):</emph> String containing a valid XPath expression.</paragraph> +<embed href="text/scalc/01/ful_func.xhp#func_head_example"/> +<paragraph role="paragraph" id="par_id2946142"><input>=FILTERXML(WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss");"//lastBuildDate")</input></paragraph> +<paragraph role="paragraph" id="par_id2946143">Returns information <literal>//lastBuildDate</literal> of the XML contents supplied by the WEBSERVICE() function.</paragraph> +<embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> +<embed href="text/scalc/00/avail_release.xhp#4.2"/> +<embed href="text/scalc/01/common_func.xhp#notODFF"/> +<paragraph role="paragraph" id="par_id341600873986703" localize="false"><literal>COM.MICROSOFT.FILTERXML</literal></paragraph> +<section id="relatedtopics"> + <paragraph role="paragraph" id="par_id461752665283166" localize="false"><embedvar href="text/scalc/01/func_webservice.xhp#webservicefuncname" markup="ignore"/></paragraph> + <paragraph role="paragraph" id="par_id841752665371223" localize="false"><embedvar href="text/scalc/01/func_encodeurl.xhp#encodeurlname" markup="ignore"/></paragraph> + <paragraph role="paragraph" id="par_id501752609739950"><link href="https://www.w3schools.com/xml/xml_xpath.asp">W3C XPath web page</link></paragraph> + <tip id="par_id631752609367566"><link href="https://wiki.documentfoundation.org/Documentation/Calc_Functions/FILTERXML">FILTERXML wiki page</link></tip> +</section> +</body> +</helpdocument> diff --git a/source/text/scalc/01/func_webservice.xhp b/source/text/scalc/01/func_webservice.xhp index c3efa3eacb..ef2d490195 100644 --- a/source/text/scalc/01/func_webservice.xhp +++ b/source/text/scalc/01/func_webservice.xhp @@ -15,74 +15,28 @@ </topic> </meta> <body> - <section id="uri_functions"> - <h1 id="hd_id391677019419915"><variable id="h1"><link href="text/scalc/01/func_webservice.xhp">URI Functions</link></variable></h1> - <paragraph id="par_id141677019419921" role="paragraph">These spreadsheet functions are used for inserting data from Universal Resource Identifiers (URI).</paragraph> - </section> - <section id="webservice"> - <bookmark branch="index" id="bm_id3149012"> - <bookmark_value>WEBSERVICE function</bookmark_value> - </bookmark> - <bookmark branch="hid/SC_HID_FUNC_WEBSERVICE" id="bm_id3150028" localize="false"/> - <section id="webservicefuncheader"> - <h2 id="hd_id3149012"><variable id="webservicefuncname"><link href="text/scalc/01/func_webservice.xhp#webservice">WEBSERVICE</link></variable></h2> - <paragraph role="paragraph" id="par_id3149893"><ahelp hid="HID_FUNC_WEBSERVICE">Get some web content from a URI.</ahelp></paragraph> - </section> - <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph role="code" id="par_id3154844">WEBSERVICE(URI)</paragraph> - <paragraph role="paragraph" id="par_id3147469"><emph>URI: </emph> URI text of the web service.</paragraph> - <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> - <paragraph role="paragraph" id="par_id3146142"><item type="input">=WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss")</item></paragraph> - <paragraph role="paragraph" id="par_id3146143">Returns the web page content of "https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss".</paragraph> - <embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> - <embed href="text/scalc/00/avail_release.xhp#4.2"/> - <embed href="text/scalc/01/common_func.xhp#notODFF"/> - <paragraph role="paragraph" id="par_id341640870986703" localize="false"><literal>COM.MICROSOFT.WEBSERVICE</literal></paragraph> - </section> - <section id="filterxml"> - <bookmark branch="hid/SC_HID_FUNC_FILTERXML" id="bm_id2950028" localize="false"/> - <bookmark branch="index" id="bm_id2949012"> - <bookmark_value>FILTERXML function</bookmark_value> - </bookmark> - <section id="filterxmlfuncheader"> - <h2 id="hd_id2949012"><variable id="filterxmlfuncname"><link href="text/scalc/01/func_webservice.xhp#filterxml">FILTERXML</link></variable></h2> - <paragraph role="paragraph" id="par_id2949893"><ahelp hid="HID_FUNC_FILTERXML">Apply a XPath expression to a XML document.</ahelp></paragraph> - </section> - <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph role="code" id="par_id2954844">FILTERXML(XML Document; XPath expression)</paragraph> - <paragraph role="paragraph" id="par_id2947469"><emph>XML Document (required):</emph> String containing a valid XML stream.</paragraph> - <paragraph role="paragraph" id="par_id2847469"><emph>XPath expression (required):</emph> String containing a valid XPath expression.</paragraph> - <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> - <paragraph role="paragraph" id="par_id2946142"><item type="input">=FILTERXML(WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss");"//lastBuildDate")</item></paragraph> - <paragraph role="paragraph" id="par_id2946143"> Returns information on the last build date of the wiki.</paragraph> - <embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> - <embed href="text/scalc/00/avail_release.xhp#4.2"/> - <embed href="text/scalc/01/common_func.xhp#notODFF"/> - <paragraph role="paragraph" id="par_id341600873986703" localize="false"><literal>COM.MICROSOFT.FILTERXML</literal></paragraph> - </section> - <section id="encodeurl"> - <bookmark id="bm_id121517132649769" branch="hid/SC_HID_FUNC_ENCODEURL" localize="false"/> - <bookmark branch="index" id="bm_id811517136840444"> - <bookmark_value>ENCODEURL function</bookmark_value> - </bookmark> - <section id="encodeurlfuncheader"> - <h2 id="hd_id671517132649769"><variable id="encodeurlname"><link href="text/scalc/01/func_webservice.xhp#encodeurl">ENCODEURL</link></variable></h2> - <paragraph id="par_id51517132649769" role="paragraph"><ahelp hid="HID_FUNC_ENCODEURL">Returns a URL-encoded string.</ahelp></paragraph> - </section> - <paragraph role="paragraph" id="par_id721517134647880">Use this function to transform text with symbols of national alphabets (for example accented characters, non-ASCII alphabets or Asian words) to a string of URL-standard symbols.</paragraph> - <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph role="code" id="par_id351517132879400">ENCODEURL(Text)</paragraph> - <paragraph role="paragraph" id="par_id921517132924079"><emph>Text</emph>: String to encode to a sequence of URL-standard symbols.</paragraph> - <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> - <paragraph role="paragraph" id="par_id651517132994921">If cell A1 contains the Cyrillic text "автомобиль", <item type="input">=ENCODEURL(A1)</item> returns %D0%B0%D0%B2%D1%82%D0%BE%D0%BC%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C (the word "автомобиль" means car in Russian).</paragraph> - <paragraph role="paragraph" id="par_id991517133057478">If cell B1 contains the text "車", <item type="input">=ENCODEURL(B1)</item> returns %E8%BB%8A ("車" means car in Japanese).</paragraph> - <embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> - <embed href="text/scalc/00/avail_release.xhp#5.0"/> - <embed href="text/scalc/01/common_func.xhp#notODFF"/> - <paragraph role="paragraph" id="par_id301640873986703" localize="false"><literal>COM.MICROSOFT.ENCODEURL</literal></paragraph> - </section> - <section id="relatedtopics"> - <tip id="par_id781677019731175"><link href="https://wiki.documentfoundation.org/Documentation/Calc_Functions/WEBSERVICE">WEBSERVICE</link>, <link href="https://wiki.documentfoundation.org/Documentation/Calc_Functions/FILTERXML">FILTERXML</link>, <link href="https://wiki.documentfoundation.org/Documentation/Calc_Functions/ENCODEURL">ENCODEURL</link> wiki pages.</tip> - </section> +<bookmark branch="index" id="bm_id3149012"> +<bookmark_value>WEBSERVICE function</bookmark_value> +</bookmark> +<bookmark branch="hid/SC_HID_FUNC_WEBSERVICE" id="bm_id3150028" localize="false"/> +<section id="webservicefuncheader"> + <h1 id="hd_id3149012"><variable id="webservicefuncname"><link href="text/scalc/01/func_webservice.xhp">WEBSERVICE</link></variable></h1> + <paragraph role="paragraph" id="par_id3149893"><ahelp hid="HID_FUNC_WEBSERVICE">Get some web content from a URI.</ahelp></paragraph> +</section> +<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> +<paragraph role="code" id="par_id3154844">WEBSERVICE(URI)</paragraph> +<paragraph role="paragraph" id="par_id3147469"><emph>URI: </emph> URI text of the web service.</paragraph> +<embed href="text/scalc/01/ful_func.xhp#func_head_example"/> +<paragraph role="paragraph" id="par_id3146142"><item type="input">=WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss")</item></paragraph> +<paragraph role="paragraph" id="par_id3146143">Returns the web page content of "https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss".</paragraph> +<embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> +<embed href="text/scalc/00/avail_release.xhp#4.2"/> +<embed href="text/scalc/01/common_func.xhp#notODFF"/> +<paragraph role="paragraph" id="par_id341640870986703" localize="false"><literal>COM.MICROSOFT.WEBSERVICE</literal></paragraph> +<section id="relatedtopics"> + <paragraph role="paragraph" id="par_id781752665258334" localize="false"><embedvar href="text/scalc/01/func_filterxml.xhp#filterxmlfuncname" markup="ignore"/></paragraph> + <paragraph role="paragraph" id="par_id841752665371223" localize="false"><embedvar href="text/scalc/01/func_encodeurl.xhp#encodeurlname" markup="ignore"/></paragraph> + <tip id="par_id781677019731175"><link href="https://wiki.documentfoundation.org/Documentation/Calc_Functions/WEBSERVICE">WEBSERVICE wiki page</link>.</tip> +</section> </body> </helpdocument>