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

[Caolán McNamara]

 helpers/help_hid.lst                      |    3 ---
 source/text/shared/01/securitywarning.xhp |   12 ++++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 63b93ef85a0c7f0081cabb2a69d707ca67bd7cea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 18 15:11:50 2014 +0100

    update help ids for macro warning message .ui conversion
    
    Change-Id: I527e0426ffffa158563722a8a25f6d3919b51bb6

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index bd465ae..845a227 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3174,7 +3174,6 @@ HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE,38126,
 HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT,38125,
 HID_XFORMS_TOOLBOX_ITEM_EDIT,38127,
 HID_XFORMS_TOOLBOX_ITEM_REMOVE,38128,
-HID_XMLSECDLG_MACROWARN,35847,
 HID_XMLSEC_CALL,40016,
 HID_XMLSEC_CTRL_ELEMENTS,43079,
 HID_XMLSEC_DLG_CERTCHOOSER,43077,
@@ -5939,7 +5938,6 @@ tab_PushButton_TP_LICENSE_PB_LICENSE_DOWN,545182215,
 tab_PushButton_TP_PURCHASE_PB_PURCHASE_GET,545116676,
 uui_CheckBox_DLG_UUI_LOGIN_CB_LOGIN_SAVEPASSWORD,1311343648,
 uui_CheckBox_DLG_UUI_LOGIN_CB_LOGIN_USESYSCREDS,1311343650,
-uui_CheckBox_RID_XMLSECDLG_MACROWARN_CB_ALWAYSTRUST,1311802374,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_ACCOUNT,1311344671,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PASSWORD,1311344669,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PATH,1311344662,
@@ -5950,7 +5948,6 @@ uui_PushButton_DLG_COOKIES_BTN_COOKIES_CANCEL,1311363614,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_OK,1311363615,
 uui_PushButton_DLG_UUI_LOGIN_BTN_LOGIN_PATH,1311347224,
 uui_PushButton_RID_DLG_NEWER_VERSION_WARNING_PB_UPDATE,1312182797,
-uui_PushButton_RID_XMLSECDLG_MACROWARN_PB_VIEWSIGNS,1311805956,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_IGNORE,1311359509,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_INTERACTIVE,1311359510,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_SEND,1311359508,
diff --git a/source/text/shared/01/securitywarning.xhp b/source/text/shared/01/securitywarning.xhp
index dac9af0..cd8d190 100644
--- a/source/text/shared/01/securitywarning.xhp
+++ b/source/text/shared/01/securitywarning.xhp
@@ -37,18 +37,18 @@
 <bookmark_value>macros;security warning dialog</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SFX2_HID_WARNING_SECURITY_HYPERLINK" id="bm_id5382854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/UUI_HID_XMLSECDLG_MACROWARN" id="bm_id7777947" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui/ui/macrowarnmedium/MacroWarnMedium" id="bm_id7777947" localize="false"/>
 <paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="securitywarning"><link href="text/shared/01/securitywarning.xhp">Security Warning</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW">When you open a document that contains an unsigned macro, or a signed macro from an unknown source, the <emph>Security Warning</emph> dialog opens.</paragraph>
-<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>%PRODUCTNAME - Security</emph> in the Options dialog box to set the options.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid="">Enable or disable the macros. Choose <emph>%PRODUCTNAME - Security</emph> in the Options dialog box to set the options.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="2" l10n="NEW">View Signature</paragraph>
-<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can view the signature.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid="uui/ui/macrowarnmedium/viewSignsButton">Opens a dialog where you can view the signature.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="2" l10n="NEW">Always trust macros from this source</paragraph>
-<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the current macro source to the list of <link href="text/shared/optionen/macrosecurity_ts.xhp">trusted sources</link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><ahelp hid="uui/ui/macrowarnmedium/alwaysTrustCheckbutton">Adds the current macro source to the list of <link href="text/shared/optionen/macrosecurity_ts.xhp">trusted sources</link>.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="2" l10n="NEW">Enable Macros</paragraph>
-<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Allows macros in the document to run.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid="uui/ui/macrowarnmedium/ok">Allows macros in the document to run.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105A3" xml-lang="en-US" level="2" l10n="NEW">Disable Macros</paragraph>
-<paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Does not allow macros in the document to run.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US" l10n="NEW"><ahelp hid="uui/ui/macrowarnmedium/cancel">Does not allow macros in the document to run.</ahelp></paragraph>
 </body>
 </helpdocument>