summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/01/securitywarning.xhp
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-08 14:56:38 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-08 14:56:38 +0000
commitd3abbf49bb54e58152ae6341a64476d4d6738118 (patch)
treec95438253397db16ed17070572eb20dd7e6e1617 /helpcontent2/source/text/shared/01/securitywarning.xhp
parentb260eb992669416273422a8fa03ec4771655f5d4 (diff)
INTEGRATION: CWS hc680pb2 (1.3.4); FILE MERGED
2005/02/21 16:40:59 fpe 1.3.4.1: regular update
Diffstat (limited to 'helpcontent2/source/text/shared/01/securitywarning.xhp')
-rw-r--r--helpcontent2/source/text/shared/01/securitywarning.xhp12
1 files changed, 8 insertions, 4 deletions
diff --git a/helpcontent2/source/text/shared/01/securitywarning.xhp b/helpcontent2/source/text/shared/01/securitywarning.xhp
index 7773142a85..a978e37c5c 100644
--- a/helpcontent2/source/text/shared/01/securitywarning.xhp
+++ b/helpcontent2/source/text/shared/01/securitywarning.xhp
@@ -37,8 +37,8 @@
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
@@ -62,18 +62,22 @@
</topic>
<history>
<created date="2004-08-26T12:21:34">UFI: Security Warning dialog on loading untrusted macro</created>
-<lastedited date="2004-09-28T12:22:55">DEDR: Reviewed</lastedited>
+<lastedited date="2005-02-18T13:13:38">DEDR: Reviewed</lastedited>
</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id6499832"><bookmark_value>security;warning dialogs with macros</bookmark_value>
<bookmark_value>macros;security warnings</bookmark_value>
</bookmark>
+<bookmark xml-lang="en-US" branch="hid/HID_WARNING_MACROSDISABLED" id="bm_id7895443" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_WARNING_SECURITY_HYPERLINK" id="bm_id5382854" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_XMLSECDLG_MACROWARN" 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>Tools - Options - %PRODUCTNAME - Security</emph> 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><comment>ask FL whether he means "View Certificate" or "Digital Signatures" dialog</comment></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="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="heading" id="par_idN1059C" xml-lang="en-US" level="2" l10n="NEW">Enable Macros</paragraph>