INTEGRATION: CWS hc680dec (1.4.42); FILE MERGED

2005/12/09 10:00:16 ufi 1.4.42.1: before resync

4 files changed, 191 insertions, 102 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01160100.xhp b/helpcontent2/source/text/shared/optionen/01160100.xhp
index 46f93a9d2a..5baf01e05d 100755
--- a/helpcontent2/source/text/shared/optionen/01160100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160100.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: 01160100.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.4 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 23:44:14 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
  *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  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.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
  *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
  *
  ************************************************************************-->
 	
@@ -42,14 +62,13 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-03-01T15:49:20">converted from old format - fpe</lastedited>
+<lastedited date="2005-12-06T15:25:43">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
 <section id="verbindungen">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154136"><bookmark_value>data sources; settings</bookmark_value>
-<bookmark_value>connections to data sources</bookmark_value>
-<bookmark_value>data sources; connections</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154136"><bookmark_value>connections to data sources (Base)</bookmark_value>
+<bookmark_value>data sources; connection settings (Base)</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/OFFMGR_TABPAGE_RID_OFAPAGE_CONNPOOLOPTIONS" id="bm_id3147261" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DSBROWSER_DISCONNECTING" id="bm_id3149798" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
index e03a1fa50d..63632caed3 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: macrosecurity.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.4 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 23:48:50 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
  *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  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.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
  *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
  *
  ************************************************************************-->
 	
@@ -42,13 +62,13 @@
 </topic>
 <history>
 <created date="2004-08-25T16:37:51">UFI: Macro Security from Security tab page</created>
-<lastedited date="2004-10-05T15:52:13">YJ: checked, but still contains some questions that Uwe may want to answer later</lastedited>
+<lastedited date="2005-12-05T13:00:09">YJ: checked, but still contains some questions that Uwe may want to answer later</lastedited>
 </history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains macros<comment>how many?</comment>.<comment>UFI: sorry, the spec says so on page 70.</comment> You can also call the dialog from the <link href="text/shared/optionen/01030300.xhp"><emph>Tools - Options - %PRODUCTNAME - Security</emph></link> page.</paragraph>
+<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <link href="text/shared/optionen/01030300.xhp"><emph>Tools - Options - %PRODUCTNAME - Security</emph></link> page.</paragraph>
 <paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US" l10n="NEW">
 <embedvar href="text/shared/optionen/macrosecurity_sl.xhp#macrosecurity_sl"/>
 </paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
index bc6453ec82..84937c26ee 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: macrosecurity_sl.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.4 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 23:49:04 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
  *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  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.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
  *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
  *
  ************************************************************************-->
 	
@@ -42,24 +62,28 @@
 </topic>
 <history>
 <created date="2004-08-25T16:37:39">UFI: Macro Security first tab page</created>
-<lastedited date="2004-09-30T09:39:15">YJ: checked</lastedited>
+<lastedited date="2005-12-05T13:11:51">YJ: checked</lastedited>
 </history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity_sl"><link href="text/shared/optionen/macrosecurity_sl.xhp">Security Level</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Select the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> level from one of four options. The options differ according to the security level. Macros that are allowed to run on a higher security level are also allowed to run in all lower levels.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_VERYHIGH" id="bm_id7283547" localize="false"/>
 <paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Very high</paragraph>
 <paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Only macros from trusted file locations are allowed to run. All other macros, regardless of whether they are signed or not, are disabled.<comment>UFI: for each option, the first para is copied from the string table.</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW">Trusted file locations can be set on the <link href="text/shared/optionen/macrosecurity_ts.xhp">Trusted Sources</link> tab page. Any macro from a trusted file location is allowed to run.</paragraph>
+<paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted file locations can be set on the Trusted Sources tab page. Any macro from a trusted file location is allowed to run.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_HIGH" id="bm_id2273934" localize="false"/>
 <paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="2" l10n="NEW">High</paragraph>
 <paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US" l10n="NEW">Only signed macros from trusted sources are allowed to run. Unsigned macros are disabled.</paragraph>
-<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW">Trusted sources can be set on the <link href="text/shared/optionen/macrosecurity_ts.xhp">Trusted Sources</link> tab page. Only signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run.</paragraph>
+<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted sources can be set on the Trusted Sources tab page. Only signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_MEDIUM" id="bm_id7128818" localize="false"/>
 <paragraph role="heading" id="par_idN105BA" xml-lang="en-US" level="2" l10n="NEW">Medium</paragraph>
 <paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW">Confirmation required before executing macros from unknown sources.</paragraph>
-<paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US" l10n="NEW">Trusted sources can be set on the <link href="text/shared/optionen/macrosecurity_ts.xhp">Trusted Sources</link> tab page. Signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run. All other macros require your confirmation.</paragraph>
+<paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted sources can be set on the Trusted Sources tab page. Signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run. All other macros require your confirmation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_LOW" id="bm_id7408978" localize="false"/>
 <paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Low (not recommended)</paragraph>
 <paragraph role="paragraph" id="par_idN105D6" xml-lang="en-US" l10n="NEW">All macros will be executed without confirmation. Use this setting only if you are certain that all documents that will be opened are safe.</paragraph>
-<paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US" l10n="NEW"><comment>UFI: ask developers, then write warning what macros can do and what not.</comment></paragraph>
+<paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A macro can be set to auto-start, and it can perform potentially damaging actions, as for example delete or rename files. This setting is not recommended when you open documents from other authors.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
index d5a2397f6f..4b5ec23af0 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: macrosecurity_ts.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.4 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 23:49:19 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
  *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  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.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
  *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
  *
  ************************************************************************-->
 	
@@ -42,24 +62,30 @@
 </topic>
 <history>
 <created date="2004-08-25T16:37:27">UFI: Macro Security second tab page</created>
-<lastedited date="2004-09-30T09:54:45">YJ: checked</lastedited>
+<lastedited date="2005-12-05T13:17:47">YJ: checked</lastedited>
 </history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity_ts"><link href="text/shared/optionen/macrosecurity_ts.xhp">Trusted Sources</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Specifies the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> settings for trusted certificates and trusted file locations.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_TRUSTSOURCES" id="bm_id3047883" localize="false"/>
 <paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Trusted certificates</paragraph>
-<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Lists the trusted certificates.<comment>UFI: scope - for this doc? for all of SO? for the system?</comment></paragraph>
+<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the trusted certificates.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_VIEW_TRUSTCERT" id="bm_id146183" localize="false"/>
 <paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="3" l10n="NEW">View</paragraph>
-<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog for the selected certificate.</paragraph>
+<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the View Certificate dialog for the selected certificate.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_REMOVE_TRUSTCERT" id="bm_id6915799" localize="false"/>
 <paragraph role="heading" id="par_idN105A6" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN105AA" xml-lang="en-US" l10n="NEW">Removes the selected certificate from the list of trusted certificates.</paragraph>
+<paragraph role="paragraph" id="par_idN105AA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected certificate from the list of trusted certificates.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_ListBox_RID_XMLSECTP_TRUSTSOURCES_LB_TRUSTFILELOC" id="bm_id1044038" localize="false"/>
 <paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="2" l10n="NEW">Trusted file locations</paragraph>
-<paragraph role="paragraph" id="par_idN105B1" xml-lang="en-US" l10n="NEW">Trusted file locations are used only if the security level is set to "very high". With this setting, document macros are only executed if they have been opened from one of the following locations.</paragraph>
+<paragraph role="paragraph" id="par_idN105B1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted file locations are used only if the security level is set to "very high". With this setting, document macros are only executed if they have been opened from one of the following locations.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_FL_ADD_TRUSTFILELOC" id="bm_id1952879" localize="false"/>
 <paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="NEW">Opens a folder selection dialog. Select a folder from which all macros are allowed to execute.</paragraph>
+<paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a folder selection dialog. Select a folder from which all macros are allowed to execute.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_FL_REMOVE_TRUSTFILELOC" id="bm_id6851405" localize="false"/>
 <paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US" l10n="NEW">Removes the selected folder from the list of trusted file locations.</paragraph>
+<paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected folder from the list of trusted file locations.</ahelp></paragraph>
 </body>
 </helpdocument>