[Libreoffice-commits] help.git: source/text

Mon Feb 26 13:59:03 UTC 2018

source/text/scalc/01/05120000.xhp |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d61e726350bf12c34ea9942f4ece1e30ba0e6bb0
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Fri Jan 5 21:10:35 2018 +0100

    tdf#114525 Fix Conditional Format dialog bookmarks and ahelps
    
    Change-Id: I3274aaaebe4c7cd35370ba7d4e5569c4f44eec39
    Reviewed-on: https://gerrit.libreoffice.org/50316
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/scalc/01/05120000.xhp b/source/text/scalc/01/05120000.xhp
index bcc2e7a00..2e396135b 100644
--- a/source/text/scalc/01/05120000.xhp
+++ b/source/text/scalc/01/05120000.xhp
@@ -28,9 +28,10 @@
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatDialog" id="bm_id5008046" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatMenu" id="bm_id5008047" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog" id="bm_id3152518" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="1">Conditional Formatting</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph"><variable id="bedingtetext"><ahelp hid=".uno:ConditionalFormatDialog">Choose <emph>Conditional Formatting</emph> to define format styles depending on certain conditions.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph"><variable id="bedingtetext"><ahelp hid=".">Choose <emph>Conditional Formatting</emph> to define format styles depending on certain conditions.</ahelp>
 </variable> If a style was already assigned to a cell, it remains unchanged. The style entered here is then evaluated. There are several types of conditional formatting that can be used.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3163711" role="paragraph">You can enter several conditions that query the contents of cell values or formulas. The conditions are evaluated from the first to the last. If the condition 1 matches the condition, the defined style will be used. Otherwise, condition 2 is evaluated, and its defined style is used. If this style does not match, then the next condition is evaluated and so on.</paragraph>
       <section id="howtoget">
@@ -127,9 +128,9 @@ Apply a color scale to a range consist of displaying a bicolor or tricolor gradi
 </listitem>
 </list>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatdialog/CondFormatDialog" id="bm_id3152598" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/CondFormatManager" id="bm_id3152598" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153384" role="heading" level="2">Manage Conditional Formatting</paragraph>
-<paragraph xml-lang="en-US" id="par_id3155906" role="paragraph">This dialog allows you to see all the conditional formatting defined in the spreadsheet.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155906" role="paragraph"><ahelp hid=".">This dialog allows you to see all the conditional formatting defined in the spreadsheet.<ahelp></paragraph>
 
       <section id="howtoget">
          <paragraph role="paragraph" id="par_id31546818" xml-lang="en-US">Choose <emph>Format - Conditional Formatting - Manage</emph></paragraph>
