diff options
| author | Olivier Hallot <olivier.hallot@edx.srv.br> | 2015-06-05 16:37:28 -0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-08 11:49:07 +0000 |
| commit | fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f (patch) | |
| tree | c99359117f3a0ad67e4905f5602e6f70dc7f8e5e | |
| parent | f36f2883973e4ba6d59ee8d0d9b3e98273aa1c44 (diff) | |
Promote ODF Formula standard in Calc function help
Insert ODF Formula standard citation in Calc functions where it applies. In this example, function TIMEVALUE is a standard ODF Formula 1.2 function.
Many other functions qualify to be a ODFF function. But since Excel is changing its function names, not every Calc function is and ODFF funciton.
Change-Id: Ib764d780f9f66c8a7adaba8954d91fc9b4d70410
Reviewed-on: https://gerrit.libreoffice.org/16110
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | AllLangHelp_scalc.mk | 1 | ||||
| -rw-r--r-- | source/text/scalc/01/ODFF.xhp | 35 | ||||
| -rw-r--r-- | source/text/scalc/01/func_timevalue.xhp | 85 |
3 files changed, 76 insertions, 45 deletions
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 49434caa10..998715159a 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -210,6 +210,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/solver_options \ helpcontent2/source/text/scalc/01/statistics \ helpcontent2/source/text/scalc/01/stat_data \ + helpcontent2/source/text/scalc/01/ODFF \ helpcontent2/source/text/scalc/01/text2columns \ helpcontent2/source/text/scalc/02/02130000 \ helpcontent2/source/text/scalc/02/02140000 \ diff --git a/source/text/scalc/01/ODFF.xhp b/source/text/scalc/01/ODFF.xhp new file mode 100644 index 0000000000..85aebf96f0 --- /dev/null +++ b/source/text/scalc/01/ODFF.xhp @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<helpdocument version="1.0"> +<!--*********************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + ***********************************************************--> + +<meta> +<topic id="topic_0506201512363995"> +<title xml-lang="en-US" id="tit">ODFF</title> +<filename>text/scalc/01/ODFF.xhp</filename> +</topic> +</meta> +<body> +<section id="odff"> +<paragraph id="hd_id1000010" role="note" xml-lang="en-US">This function is a standard Open Document Formula version 1.2 function.</paragraph> +</section> +</body> +</helpdocument>
\ No newline at end of file diff --git a/source/text/scalc/01/func_timevalue.xhp b/source/text/scalc/01/func_timevalue.xhp index 97f35db8d0..d986cafe25 100644 --- a/source/text/scalc/01/func_timevalue.xhp +++ b/source/text/scalc/01/func_timevalue.xhp @@ -1,51 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> +<!--*********************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + ***********************************************************--> - <meta> - <topic id="textscalc01func_timevaluexml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">TIMEVALUE </title> - <filename>/text/scalc/01/func_timevalue.xhp</filename> - </topic> - </meta> - <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3146755"><bookmark_value>TIMEVALUE function</bookmark_value> +<topic id="topic_0506201512165345" status="PUBLISH"> +<title xml-lang="en-US" id="tit">TIMEVALUE </title> +<filename>file:///home/tdf/git/core/helpcontent2/source/text/scalc/01/func_timevalue.xhp</filename> +</topic> +</meta> +<body> +<bookmark xml-lang="en-US" branch="index" id="bm_id3146755"> +<bookmark_value>TIMEVALUE function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ZEITWERT" id="bm_id3146767" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3146755" role="heading" level="2" l10n="U" - oldref="160"><variable id="timevalue"><link href="text/scalc/01/func_timevalue.xhp">TIMEVALUE</link> -</variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3148502" role="paragraph" l10n="U" oldref="161"><ahelp hid="HID_FUNC_ZEITWERT">TIMEVALUE returns the internal time number from a text enclosed by quotes and which may show a possible time entry format.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="par_id3150794" role="paragraph" l10n="U" oldref="162">The internal number indicated as a decimal is the result of the date system used under $[officename] to calculate date entries.</paragraph> - <paragraph xml-lang="en-US" id="par_id011920090347118" role="paragraph" l10n="NEW">If the text string also includes a year, month, or day, TIMEVALUE only returns the fractional part of the conversion.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3150810" role="heading" level="3" l10n="U" - oldref="163">Syntax</paragraph> - <paragraph xml-lang="en-US" id="par_id3150823" role="code" l10n="U" oldref="164">TIMEVALUE("Text")</paragraph> - <paragraph xml-lang="en-US" id="par_id3152556" role="paragraph" l10n="U" oldref="165"> - <emph>Text</emph> is a valid time expression and must be entered in quotation marks.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3146815" role="heading" level="3" l10n="U" - oldref="166">Examples</paragraph> - <paragraph xml-lang="en-US" id="par_id3146829" role="paragraph" l10n="U" oldref="167"> - <item type="input">=TIMEVALUE("4PM")</item> returns 0.67. When formatting in time format HH:MM:SS, you then get 16:00:00.</paragraph> - <paragraph xml-lang="en-US" id="par_id3153632" role="paragraph" l10n="U" oldref="168"> - <item type="input">=TIMEVALUE("24:00")</item> returns 1. If you use the HH:MM:SS time format, the value is 00:00:00.</paragraph> - </body> +<paragraph id="hd_id3146755" role="heading" xml-lang="en-US" level="2"><variable id="timevalue"><link href="text/scalc/01/func_timevalue.xhp">TIMEVALUE</link></variable></paragraph> +<paragraph id="par_id3148502" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ZEITWERT">TIMEVALUE returns the internal time number from a text enclosed by quotes and which may show a possible time entry format.</ahelp></paragraph><embed href="text/scalc/01/ODFF.xhp#odff"/> +<paragraph id="par_id3150794" role="paragraph" xml-lang="en-US">The internal number indicated as a decimal is the result of the date system used under $[officename] to calculate date entries.</paragraph> +<paragraph id="par_id011920090347118" role="paragraph" xml-lang="en-US">If the text string also includes a year, month, or day, TIMEVALUE only returns the fractional part of the conversion.</paragraph> +<paragraph id="hd_id3150810" role="heading" xml-lang="en-US" level="3">Syntax</paragraph> +<paragraph id="par_id3150823" role="code" xml-lang="en-US">TIMEVALUE("Text")</paragraph> +<paragraph id="par_id3152556" role="paragraph" xml-lang="en-US"><emph>Text</emph> is a valid time expression and must be entered in quotation marks.</paragraph> +<paragraph id="hd_id3146815" role="heading" xml-lang="en-US" level="3">Examples</paragraph> +<paragraph id="par_id3146829" role="paragraph" xml-lang="en-US"><item type="input">=TIMEVALUE("4PM")</item> returns 0.67. When formatting in time format HH:MM:SS, you then get 16:00:00.</paragraph> +<paragraph id="par_id3153632" role="paragraph" xml-lang="en-US"><item type="input">=TIMEVALUE("24:00")</item> returns 1. If you use the HH:MM:SS time format, the value is 00:00:00.</paragraph> +</body> </helpdocument>
\ No newline at end of file |