[Libreoffice-commits] help.git: Branch 'libreoffice-5-1' - source/text

[Laurent Balland-Poirier]

 source/text/shared/01/05020301.xhp |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 0caa881976b2213448b33fa5c31741759a5e4458
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Tue Jan 26 22:34:23 2016 +0100

    tdf#40517 Update for '?' in decimal number format
    
    Add help to use '?' in user defined number format
    Correction of ordered list
    
    Reviewed-on: https://gerrit.libreoffice.org/21827
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit ed8d3d936d9008a34a1f59baee2c241157588dba)
    
    Change-Id: Ia14a34cbc0d2d9cff4601a0bd19b392a3aaae268
    Reviewed-on: https://gerrit.libreoffice.org/21844
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/source/text/shared/01/05020301.xhp b/source/text/shared/01/05020301.xhp
index 7ff73d1..17ecac1 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -47,14 +47,12 @@
 <listitem>
 <paragraph role="listitem" id="par_id3158442" xml-lang="en-US" l10n="CHG" oldref="109">In a number format code with three sections, the first section applies to positive values, the second section to negative values, and the third section to the value zero.</paragraph>
 </listitem>
-</list>
-<list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="110">You can also assign conditions to the three sections, so that the format is only applied if a condition is met.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="2" l10n="U" oldref="229">Decimal Places and Significant Digits</paragraph>
-<paragraph role="paragraph" id="par_id3153624" xml-lang="en-US" l10n="U" oldref="3">Use zero (0) or the number sign (#) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeroes if there are fewer digits in the number than in the number format.</paragraph>
+<paragraph id="par_id3153624" role="paragraph" xml-lang="en-US">Use zero (0), the number sign (#) or the question mark (?) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeroes if there are fewer digits in the number than in the number format. The (?) works as the (#) but adds a space character to keep decimal alignment if there is a hidden non-significant zero.</paragraph>
 <paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U" oldref="107">Use question marks (?) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers.</paragraph>
 <paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="4">If a number contains more digits to the right of the decimal delimiter than there are placeholders in the format, the number is rounded accordingly. If a number contains more digits to the left of the decimal delimiter than there are placeholders in the format, the entire number is displayed. Use the following list as a guide for using placeholders when you create a number format code:</paragraph>
 <table id="tbl_id3149760">
@@ -76,6 +74,14 @@
 </tablerow>
 <tablerow>
 <tablecell>
+<paragraph id="par_id3152802" role="code" localize="false" xml-lang="en-US">?</paragraph>
+</tablecell>
+<tablecell>
+<paragraph id="par_id3145091" role="tablecontent" xml-lang="en-US">Displays space characters instead of extra zeros.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
 <paragraph role="code" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="7">0 (Zero)</paragraph>
 </tablecell>
 <tablecell>
@@ -134,6 +140,14 @@
 <paragraph role="code" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="20">0.##</paragraph>
 </tablecell>
 </tablerow>
+<tablerow>
+<tablecell>
+<paragraph id="par_id3156153" role="tablecontent" xml-lang="en-US">.5 as 0.5   (with two extra spaces at the end)</paragraph>
+</tablecell>
+<tablecell>
+<paragraph id="par_id3149763" role="code"xml-lang="en-US">0.???</paragraph>
+</tablecell>
+</tablerow>
 </table>
 
 <paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="230">Thousands Separator</paragraph>