source/text/shared/00/00000001.xhp |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit dba79673b5bbf4f7e6f21dc6a1d776e1556c38d7
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 22 12:52:19 2019 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 22 14:51:42 2019 +0100

    Resolves: tdf#122479 no extended tooltips for Reset and Standard buttons
    
    a) in the ahelp HID_TABDLG_STANDARD_BTN hid is used instead of 
SFX2_HID_TABDLG_STANDARD_BTN
    
    b) there are multiple entries for HID_TABDLG_STANDARD_BTN, the second one
    describes some wizard previous buttons and the third one is definitely
    describing an expander button, not standard buttons
    
    c) HID_TABDLG_RESET_BTN likewise is unsed instead of 
SFX2_HID_TABDLG_RESET_BTN
    and appears in two places, the second of which is tagged with "what's this" 
and
    "A confirmation query does not appear. If you confirm the dialog with OK all
    settings in this dialog are reset."
    
    so:
    use a hid of "." which means to apply to all the previously seen bookmarks
    hids since the last ahelp current bookmarks are those within the current
    section
    
    add another bookmark for the "options/more" expander, which isn't currently
    linked to by anything but could be if desirable in the future
    
    drop the second text describing Reset button which has no bookmark in
    its section
    
    Change-Id: I8c89ea7a5588dc22c29ccdd78118b9288a609563
    Reviewed-on: https://gerrit.libreoffice.org/69559
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/source/text/shared/00/00000001.xhp 
b/source/text/shared/00/00000001.xhp
index 17bb2cb75..4cea97322 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -209,19 +209,14 @@
 <section id="zurueck2">
 <bookmark xml-lang="en-US" branch="hid/SFX2_HID_TABDLG_RESET_BTN" 
id="bm_id3151054" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3148755" role="heading" 
level="2">Reset<comment>all tab dialogs</comment></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3149651" role="paragraph"><ahelp 
hid="HID_TABDLG_RESET_BTN">Resets changes made to the current tab to those 
applicable when this dialog was opened. A confirmation query does not appear 
when you close the dialog.</ahelp></paragraph>
-</section>
-<section id="zuruecksetzen">
-<paragraph xml-lang="en-US" id="hd_id3143278" role="heading" 
level="2">Reset<comment>what's this?</comment></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph"><ahelp 
hid="HID_TABDLG_RESET_BTN">Resets modified values back to the default 
values.</ahelp></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154331" role="warning">A confirmation 
query does not appear. If you confirm the dialog with <emph>OK</emph> all 
settings in this dialog are reset.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3149651" role="paragraph"><ahelp 
hid=".">Resets changes made to the current tab to those applicable when this 
dialog was opened. A confirmation query does not appear when you close the 
dialog.</ahelp></paragraph>
 </section>
 <section id="standard">
 <bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_STD_FONT:PB_STANDARD" 
id="bm_id481887" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SFX2_HID_TABDLG_STANDARD_BTN" 
id="bm_id3157322" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/copydlg/default" 
id="bm_id3083280" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145173" role="heading" 
level="2">Standard<comment>e.g. in Format - Para Style</comment><comment>UFI: 
Name is Default on Tools-Options-Writer-Basic Fonts</comment></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154153" role="paragraph"><ahelp 
hid="HID_TABDLG_STANDARD_BTN">Resets the values visible in the dialog back to 
the default installation values.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3154153" role="paragraph"><ahelp 
hid=".">Resets the values visible in the dialog back to the default 
installation values.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_id3154299" role="warning">A confirmation 
does not appear before the defaults are reloaded.</paragraph>
 </section>
 <section id="zurueckautopi">
@@ -234,11 +229,12 @@
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGREPORT_0_CMDPREV" 
id="bm_id3150984" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_LISTWIZARD_PREVIOUS" 
id="bm_id3156155" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3147502" role="heading" 
level="2">Back</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph"><ahelp 
hid="HID_TABDLG_STANDARD_BTN">View the selections in the dialog made in the 
previous step. The current settings remain unchanged.</ahelp> This button can 
only be activated from page two on.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph"><ahelp 
hid=".">View the selections in the dialog made in the previous step. The 
current settings remain unchanged.</ahelp> This button can only be activated 
from page two on.</paragraph>
 </section>
 <section id="zusaetze">
-<paragraph xml-lang="en-US" id="hd_id3147352" role="heading" 
level="2">Options</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3155314" role="paragraph"><ahelp 
hid="HID_TABDLG_STANDARD_BTN">Click the <emph>Options</emph> label to expand 
the dialog to show further options. Click again to restore the 
dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_HID_MOREOPTIONS_BTN" 
id="bm_id3157322" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147353" role="heading" 
level="2">Options</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3155314" role="paragraph"><ahelp 
hid=".">Click the <emph>Options</emph> label to expand the dialog to show 
further options. Click again to restore the dialog.</ahelp></paragraph>
 </section>
 <paragraph xml-lang="en-US" id="par_id3161659" role="paragraph"><variable 
id="siehe">See also the following functions:</variable></paragraph>
 <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph"><variable 
id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" 
name="regular expressions">regular expressions</link>. You can enter "all.*", 
for example to find the first location of "all" followed by any characters. If 
you want to search for a text that is also a regular expression, you must 
precede every character with a "\" character. You can switch the automatic 
evaluation of regular expression on and off in <switchinline 
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - </emph><link 
href="text/shared/optionen/01060500.xhp"><emph>%PRODUCTNAME Calc - 
Calculate</emph></link>.</variable></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to