help3xsl/online_transform.xsl     |    3 
 source/text/scalc/01/05120200.xhp |    1 
 source/text/scalc/01/05120300.xhp |    2 
 source/text/scalc/01/05120400.xhp |  115 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 115 insertions(+), 6 deletions(-)

New commits:
commit 7c924256f4ea9c328d7b384b2cff31829399decd
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Sat Sep 17 16:25:34 2022 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sat Sep 17 22:35:55 2022 +0200

    tdf119421 - More on conditional formatting/Icon sets
    
    + Housekeeping
    + handle icon images in the XSLT
    + Fill missing information on Icon Sets.
    
    Change-Id: Iaab3e1231ad4a2212adfc1d353a593cc116c7978
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/140108
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index fa28ad0ff..6176574c3 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -1182,6 +1182,9 @@
             <xsl:when test="starts-with(@src,'media/screenshots/')">
                 <xsl:value-of select="'screenshot'"/>
             </xsl:when>
+            <xsl:when test="starts-with(@src,'media/icon-themes/')">
+                <xsl:value-of select="'iconimage'"/>
+            </xsl:when>
             <xsl:when test="starts-with(@src,'media/')">
                 <xsl:value-of select="'genericimage'"/>
             </xsl:when>
diff --git a/source/text/scalc/01/05120200.xhp 
b/source/text/scalc/01/05120200.xhp
index 90c9c5d15..0ca166372 100644
--- a/source/text/scalc/01/05120200.xhp
+++ b/source/text/scalc/01/05120200.xhp
@@ -16,7 +16,6 @@
     </topic>
 </meta>
 <body>
-<bookmark id="bm_id221662936567368" xml-lang="en-US" branch="hid/zzzz" 
localize="false"/>
 <section id="formulais">
     <h1 id="hd_id471662936567369"><variable id="h1"><link 
href="text/scalc/01/05120200.xhp" name="Formula is">Condition - Formula 
is</link></variable></h1>
     <paragraph xml-lang="en-US" id="par_id31494139" role="paragraph">Applies 
the selected style to the cell when the formula expression in the text box in 
the right is <emph>not</emph> zero.</paragraph>
diff --git a/source/text/scalc/01/05120300.xhp 
b/source/text/scalc/01/05120300.xhp
index 7e2327e7b..451cd0995 100644
--- a/source/text/scalc/01/05120300.xhp
+++ b/source/text/scalc/01/05120300.xhp
@@ -16,7 +16,6 @@
         </topic>
     </meta>
     <body>
-    <bookmark id="bm_id691662936831681" xml-lang="en-US" branch="hid/zzzz" 
localize="false"/>
     <section id="dateis">
         <h1 id="hd_id321662936831682"><variable id="h1"><link 
href="text/scalc/01/05120300.xhp" name="Date is">Condition - Date 
is</link></variable></h1>
         <paragraph role="paragraph" id="par_id31662934883939">Applies the 
selected style to the cell when the cell contents is formatted as date and the 
condition is one of the available date interval in the dropdown 
list.</paragraph>
@@ -46,6 +45,5 @@
             <paragraph id="par_id461662934605639"  role="listitem"><emph>This 
year, Last year and Next year</emph>: applies the cell style if the cell date 
contents is in this year, last year and next year respectively.</paragraph>
         </listitem>
     </list>
-
 </body>
 </helpdocument>
diff --git a/source/text/scalc/01/05120400.xhp 
b/source/text/scalc/01/05120400.xhp
index c6136ed96..ab288871e 100644
--- a/source/text/scalc/01/05120400.xhp
+++ b/source/text/scalc/01/05120400.xhp
@@ -45,35 +45,144 @@
     </list>
 
     <h2 id="hd_id3153709">Icon Set</h2>
-    <paragraph xml-lang="en-US" id="par_id3153764" role="paragraph">It is 
desired to plot the position of a value relative to the thresholds. The set of 
icons will help to indicate the thresholds and choose the type of icons. 
Available icon sets are:</paragraph>
+    <paragraph xml-lang="en-US" id="par_id3153764" role="paragraph">Add an 
icon to the cell based on the value relative to the specified thresholds. 
Several icon sets are available.</paragraph>
+    <h3 id="hd_id191663440362309">Available Icon Sets</h3>
     <list type="unordered">
         <listitem>
             <paragraph xml-lang="en-US" id="par_id31494140" role="listitem">3, 
4 or 5 - arrows</paragraph>
+            <paragraph role="paragraph" id="par_id91663429174806" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-colorarrows-up.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id81663429174808">Color arrow up</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-colorarrows-slightly-up.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id81663529174808">Color arrow slightly up</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-colorarrows-same.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id81663529174808">Color arrow same</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-colorarrows-slightly-down.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id81663729174808">Color arrow slightly down</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-colorarrows-down.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id81663329174808">Color arrow down</alt></image>
+            </paragraph>
         </listitem>
         <listitem>
             <paragraph xml-lang="en-US" id="par_id31494141" role="listitem">3, 
4 or 5 - gray arrows</paragraph>
+            <paragraph role="paragraph" id="par_id91661429174806" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-grayarrows-up.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Gray arrow up</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-grayarrows-slightly-up.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Gray arrow slightly up</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-grayarrows-same.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Gray arrow same</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-grayarrows-slightly-down.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663729174808">Gray arrow slightly down</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-grayarrows-down.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663329174808">Gray arrow down</alt></image>
+            </paragraph>
         </listitem>
         <listitem>
             <paragraph xml-lang="en-US" id="par_id31494142" role="listitem">3 
- flags</paragraph>
+            <paragraph role="paragraph" id="par_id101663433624185" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-flags-yellow.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Yellow flag</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-flags-red.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Red flag</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-flags-green.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Green flag</alt></image>
+            </paragraph>
         </listitem>
         <listitem>
             <paragraph xml-lang="en-US" id="par_id31494143" role="listitem">3 
- traffic lights 1 and 2 (two different designs)</paragraph>
+            <paragraph role="paragraph" id="par_id721663433917655" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-circles1-yellow.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Yellow traffic light 1</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-circles1-red.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Red traffic light 1</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-circles1-green.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Green traffic light 1</alt></image>
+            </paragraph>
+            <paragraph role="paragraph" id="par_id501663433925207" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-trafficlights-yellow.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Yellow traffic light 2</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-trafficlights-red.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Red traffic light 2</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-trafficlights-green.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Green traffic light 2</alt></image>
+            </paragraph>
         </listitem>
         <listitem>
-            <paragraph xml-lang="en-US" id="par_id31494144" role="listitem">3 
- symbols (square, triangle, circle)</paragraph>
+            <paragraph id="par_id701663438522480"  role="listitem">3 - Smileys 
1 and 2</paragraph>
+            <paragraph role="paragraph" id="par_id991663438568052">
+                <image 
src="media/icon-themes/sc/res/icon-set-positive-yellow-smilie.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Yellow positive smiley</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-neutral-yellow-smilie.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Yellow neutral smiley</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-negative-yellow-smilie.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Yellow negative smiley</alt></image>
+            </paragraph>
+            <paragraph role="paragraph" id="par_id991663438966721" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-positive-green-smilie.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Green positive smiley</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-neutral-yellow-smilie.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Yellow neutral smiley</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-negative-red-smilie.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Red negative smiley</alt></image>
+            </paragraph>
+        </listitem>
+        <listitem>
+            <paragraph xml-lang="en-US" id="par_id31494144" role="listitem">3 
- symbols </paragraph>
+            <paragraph role="paragraph" id="par_id421663434453517" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-shapes-triangle.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Shape triangle</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-shapes-diamond.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Shape diamond</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-shapes-circle.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Shape circle</alt></image>
+            </paragraph>
+            <paragraph role="paragraph" id="par_id961663439450424" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-symbols1-exclamation-mark.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Exclamation mark</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-symbols1-cross.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Cross</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-symbols1-check.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Check mark</alt></image>
+            </paragraph>
+            <paragraph role="paragraph" id="par_id1001663439805133" 
xml-lang="en-US">
+                <image src="media/icon-themes/sc/res/icon-set-stars-empty.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Empty star</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-stars-half.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Half star</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-stars-full.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Full star</alt></image>
+            </paragraph>
+            <paragraph role="paragraph" id="par_id171663440020964" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-triangles-up.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Triangle up</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-triangles-same.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Same</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-triangles-down.svg" 
id="img_id261663429176807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663529174808">Triangle down</alt></image>
+            </paragraph>
         </listitem>
         <listitem>
             <paragraph xml-lang="en-US" id="par_id31494145" role="listitem">4 
- circles from red to black</paragraph>
+            <paragraph role="paragraph" id="par_id481663434995022" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-circles2-dark-red.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Dark red</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-circles2-light-red.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Light red</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-circles2-light-gray.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Light gray</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-circles2-dark-gray.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Dark gray</alt></image>
+            </paragraph>
         </listitem>
         <listitem>
             <paragraph xml-lang="en-US" id="par_id31494146" role="listitem">4 
or 5 - ratings</paragraph>
+            <paragraph role="paragraph" id="par_id631663435728155" 
xml-lang="en-US">
+                <image src="media/icon-themes/sc/res/icon-set-bars-empty.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Empty bars</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-bars-one-quarter.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">One quarters bars</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-bars-half.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Half bars</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-bars-three-quarters.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Three quarters bars</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-bars-full.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Full bars</alt></image>
+            </paragraph>
         </listitem>
         <listitem>
             <paragraph xml-lang="en-US" id="par_id31494147" role="ilistitem">5 
- quarters</paragraph>
+            <paragraph role="paragraph" id="par_id741663436015689" 
xml-lang="en-US">
+                <image src="media/icon-themes/sc/res/icon-set-pies-empty.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Empty</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-pies-one-quarter.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">One quarter</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-pies-half.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Half</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-pies-three-quarters.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Three quarters</alt></image>
+                <image src="media/icon-themes/sc/res/icon-set-pies-full.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Full</alt></image>
+            </paragraph>
+        </listitem>
+        <listitem>
+            <paragraph id="par_id821663436639070"  role="listitem">5 - 
boxes</paragraph>
+            <paragraph role="paragraph" id="par_id811663438472751" 
xml-lang="en-US">
+                <image 
src="media/icon-themes/sc/res/icon-set-squares-empty.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Empty</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-squares-one-quarter.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">One quarter</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-squares-half.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Half</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-squares-three-quarters.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Three quarters</alt></image>
+                <image 
src="media/icon-themes/sc/res/icon-set-squares-full.svg" 
id="img_id261663429174807" width="1cm" height="1cm"><alt xml-lang="en-US" 
id="alt_id91663429174808">Full</alt></image>
+            </paragraph>
         </listitem>
     </list>
-    <paragraph xml-lang="en-US" id="par_id3153765" role="paragraph">Conditions 
to display each icon can be specified relative to a value (Value), a percentage 
of the number of values in the range (Percentage) as a percentage of range 
values (Percentile) or formula (Formula).</paragraph>
+    <h3 id="hd_id621663440395987">Conditions</h3>
+    <paragraph xml-lang="en-US" id="par_id3153765" role="paragraph">Conditions 
to set the thresholds for each icon can be specified as</paragraph>
 
+    <list type="unordered">
+        <listitem>
+            <paragraph id="par_id321663440728295"  
role="listitem"><emph>Value</emph>: a fixed value. Enter the value in the text 
box on the left.</paragraph>
+        </listitem>
+        <listitem>
+            <paragraph id="par_id611663440697270"  
role="listitem"><emph>Percentile</emph>: A percentile is each of the 99 values 
which divide the sorted data in 100 equal parts, so that each part represents 
1/100 of the sample population. A percentile return the value for a data series 
going from the smallest to the largest value in a set of data. For P = 25, the 
percentile means the first quartile. P = 50 is also the MEDIAN of the data set. 
Enter the percentile value in the text box on the left. Valid values are from 0 
to 100.</paragraph>
+        </listitem>
+
+        <listitem>
+            <paragraph id="par_id211663440834104"  
role="listitem"><emph>Percent</emph>: a fixed value representing the percentage 
of the minimum (maximum) of the length defined by minimum and maximum values in 
the range. A minimum of 10% selects the values below 10% of the segment 
[Min,Max]. A maximum of 80% select values above 80% of the segment [Min,Max]. 
Valid values are from 0 (zero) to 100. Do not enter a percent (%) 
sign.</paragraph>
+        </listitem>
+        <listitem>
+            <paragraph id="par_id961663440848168"  
role="listitem"><emph>Formula</emph>: A formula expression starting with the 
equal sign (=) that calculates the numeric value for the threshold. Values can 
be numbers, dates or time. Enter the formula expression in the text box on the 
left.</paragraph>
+        </listitem>
+    </list>
     <section id="relatedtopics">
     <paragraph xml-lang="en-US" id="par_id3155606" role="paragraph"><link 
href="https://wiki.documentfoundation.org/Faq/Calc/141";>How to use Icon Set 
Conditional Formatting page</link> in TDF Wiki.</paragraph>
     </section>

Reply via email to