INTEGRATION: CWS hc680fin (1.4.2); FILE MERGED

2005/11/23 08:30:46 ufi 1.4.2.2: *** empty log message ***
2005/11/08 13:48:15 ufi 1.4.2.1: *** empty log message ***

1 files changed, 47 insertions, 33 deletions

diff --git a/helpcontent2/source/text/shared/01/05030100.xhp b/helpcontent2/source/text/shared/01/05030100.xhp
index 620ba649c6..3c8f593ef9 100644
--- a/helpcontent2/source/text/shared/01/05030100.xhp
+++ b/helpcontent2/source/text/shared/01/05030100.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: 05030100.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.6 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: obo $ $Date: 2006-03-28 13:29:09 $
+ *  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-04-13T14:52:49">UFI: fixed #i22750#
+<lastedited date="2005-11-21T11:43:02">UFI: fixed #i22750#
 FPE: fixed #105095#, resolved some switches
 DED: reviewed changes</lastedited>
 </history>
@@ -50,15 +70,13 @@ DED: reviewed changes</lastedited>
 <body>
 <section id="einzuege">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154689"><bookmark_value>indents and spacing in text</bookmark_value>
-<bookmark_value>paragraphs; indents</bookmark_value>
+<bookmark_value>paragraphs; indents and spacing</bookmark_value>
 <bookmark_value>hanging indents in paragraphs</bookmark_value>
 <bookmark_value>text; paragraph indents</bookmark_value>
 <bookmark_value>right indents in paragraphs</bookmark_value>
-<bookmark_value>lines; indents</bookmark_value>
-<bookmark_value>spacing; between paragraphs in footnotes</bookmark_value>
+<bookmark_value>lines of text; indents</bookmark_value>
 <bookmark_value>footnotes; spacing between paragraphs</bookmark_value>
-<bookmark_value>paragraphs; spacing</bookmark_value>
-<bookmark_value>line spacing; paragraph</bookmark_value>
+<bookmark_value>line spacing; paragraphs</bookmark_value>
 <bookmark_value>spacing; lines and paragraphs</bookmark_value>
 <bookmark_value>single line spacing in text</bookmark_value>
 <bookmark_value>one and a half line spacing in text</bookmark_value>
@@ -134,13 +152,11 @@ DED: reviewed changes</lastedited>
 <paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="31"><variable id="einzeiligtext">Applies single line spacing to the current paragraph. This is the default setting. 
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3148500" xml-lang="en-US" level="3" l10n="U" oldref="33">1.5 lines</paragraph>
-<paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="U" oldref="34"><variable id="eineinhalbzeiligtext">Sets the line spacing to one and half lines. This corresponds to a vertical space that is half of the font height. 
+<paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="eineinhalbzeiligtext">Sets the line spacing to 1.5 lines. 
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3149378" xml-lang="en-US" level="3" l10n="U" oldref="36">Double</paragraph>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="37"><variable id="zweizeiligtext">Sets the line spacing to two lines. This corresponds to a vertical space that is equal to the font height. 
+<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="CHG" oldref="37"><variable id="zweizeiligtext">Sets the line spacing to two lines. 
 </variable></paragraph>
-<switch select="appl">
-<case select="WRITER">
 <paragraph role="heading" id="hd_id3151206" xml-lang="en-US" level="3" l10n="U" oldref="39">Proportional</paragraph>
 <paragraph role="paragraph" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="40">Select this option and then enter a percentage value in the box, where 100% corresponds to single line spacing.</paragraph>
 <paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="41">At Least</paragraph>
@@ -148,8 +164,6 @@ DED: reviewed changes</lastedited>
 <paragraph role="tip" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="47">If you use different font sizes within a paragraph, the line spacing is automatically adjusted to the largest font size. If you prefer to have identical spacing for all lines, specify a value in <emph>At least</emph> that corresponds to the largest font size.</paragraph>
 <paragraph role="heading" id="hd_id3153927" xml-lang="en-US" level="3" l10n="U" oldref="43">Leading</paragraph>
 <paragraph role="paragraph" id="par_id3153354" xml-lang="en-US" l10n="U" oldref="44">Sets the height of the vertical space that is inserted between two lines.</paragraph>
-</case>
-</switch>
 <paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3" l10n="U" oldref="54"><switchinline select="appl"><caseinline select="WRITER">Fixed 
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Sets the line spacing to exactly match the value that you enter in the box. This can result in cropped characters.