INTEGRATION: CWS hc680fin (1.5.14); FILE MERGED

2005/11/23 08:32:20 ufi 1.5.14.2: *** empty log message ***
2005/11/03 12:38:55 ufi 1.5.14.1: *** empty log message ***

1 files changed, 51 insertions, 31 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01070100.xhp b/helpcontent2/source/text/shared/optionen/01070100.xhp
index ffedb91f5c..71fe7c6d2f 100644
--- a/helpcontent2/source/text/shared/optionen/01070100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070100.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: 01070100.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.7 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: obo $ $Date: 2006-03-28 13:29:25 $
+ *  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,7 +62,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-18T13:36:30">converted from old format - fpe</lastedited>
+<lastedited date="2005-11-08T15:28:02">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -50,12 +70,12 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147008"><bookmark_value>images; placeholders in presentations</bookmark_value>
 <bookmark_value>objects; contours in presentations</bookmark_value>
 <bookmark_value>text; placeholders in presentations</bookmark_value>
-<bookmark_value>line contours</bookmark_value>
+<bookmark_value>line contours in presentations</bookmark_value>
 <bookmark_value>rulers; visible in presentations</bookmark_value>
 <bookmark_value>moving; using guide lines in presentations</bookmark_value>
-<bookmark_value>guides; when moving in presentations</bookmark_value>
-<bookmark_value>control points; display in presentations</bookmark_value>
-<bookmark_value>Bézier curves; control points in presentations</bookmark_value>
+<bookmark_value>guides;showing when moving in presentations</bookmark_value>
+<bookmark_value>control points display in presentations</bookmark_value>
+<bookmark_value>Bézier curve display in presentations</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_VIEW" id="bm_id3153323" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_CONTENTS" id="bm_id3109850" localize="false"/>
@@ -65,7 +85,7 @@
 <paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000406.xhp#etopas"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
 <paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="9">Alternative display</paragraph>
 <paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="10">If the graphics elements are very complex, the screen display may build up a little slower than usual. By choosing Alternative display, the information is still available but is not be displayed on the screen.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_GRAPHIC_DRAFT" id="bm_id7953128" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_GRAPHIC_DRAFT" id="bm_id7953128" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:GraphicDraft" id="bm_id3149177" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_EXTERN_GRAPHIC" id="bm_id3153748" localize="false"/>
 <paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="3" l10n="U" oldref="11">Image placeholders</paragraph>
@@ -74,7 +94,7 @@
 <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="19">You can also access this function through the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13200000.xhp" name="icon">icon</link>
 </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13200000.xhp" name="icon">icon</link>
 </caseinline><defaultinline>icon</defaultinline></switchinline><emph>Picture Placeholders</emph> in the <emph>Options</emph> bar, if a presentation or drawing document is open.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FILL_DRAFT" id="bm_id8781765" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_FILL_DRAFT" id="bm_id8781765" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FillDraft" id="bm_id3155135" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_OUTLINEMODE" id="bm_id3155449" localize="false"/>
 <paragraph role="heading" id="hd_id3149415" xml-lang="en-US" level="3" l10n="U" oldref="13">Contour mode</paragraph>
@@ -85,7 +105,7 @@
 </caseinline><defaultinline>
 <emph>Contour Mode</emph></defaultinline></switchinline> icon.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_NOTEXT" id="bm_id3149045" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_TEXT_DRAFT" id="bm_id8506972" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_TEXT_DRAFT" id="bm_id8506972" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TextDraft" id="bm_id3154923" localize="false"/>
 <paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="15">Text placeholders</paragraph>
 <paragraph role="paragraph" id="par_id3147560" xml-lang="en-US" l10n="U" oldref="16"><variable id="textandeut"><ahelp hid=".uno:TextDraft">Specifies whether to display a text window without its text contents.</ahelp>
@@ -94,7 +114,7 @@
 </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13220000.xhp" name="icon">icon</link>
 </caseinline><defaultinline>icon</defaultinline></switchinline> of the same name in the <emph>Options</emph> bar if a presentation or drawing document is open.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HAIRLINEMODE" id="bm_id3151380" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_LINE_DRAFT" id="bm_id5092837" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_LINE_DRAFT" id="bm_id5092837" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:LineDraft" id="bm_id3152922" localize="false"/>
 <paragraph role="heading" id="hd_id3125864" xml-lang="en-US" level="3" l10n="U" oldref="17">Line contour only</paragraph>
 <paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="18"><variable id="haarandeut"><ahelp hid=".uno:LineDraft">Specifies whether to always display lines and contours as fine lines. This display does not depend on the currently used line width.</ahelp>
@@ -106,7 +126,7 @@
 <bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER" id="bm_id3159252" localize="false"/>
 <paragraph role="heading" id="hd_id3155430" xml-lang="en-US" level="3" l10n="U" oldref="25">Rulers visible</paragraph>
 <paragraph role="paragraph" id="par_id3147443" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER">Specifies whether to display the rulers at the top and to the left of the work area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_MOVE" id="bm_id2451068" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_MOVE" id="bm_id2451068" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id3163712" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES" id="bm_id3147213" localize="false"/>
 <paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Guides when moving</paragraph>