From 2992c3fb2c31e77f46bf597e1b446123cbcbbfbb Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Mon, 2 Jun 2008 20:31:11 +0000
Subject: INTEGRATION: CWS hcshared18 (1.10.2); FILE MERGED 2008/05/28 18:13:17
 fpe 1.10.2.4: remove DOCTYPE headers from source files to avoid performance
 problems in installed help 2008/05/27 13:20:05 ufi 1.10.2.3: vor final build
 2008/05/23 11:08:00 ufi 1.10.2.2: building Sol 2008/05/21 09:10:27 ufi
 1.10.2.1: vor testbuild

---
 helpcontent2/source/text/scalc/guide/text_wrap.xhp | 66 ++++++++++++----------
 1 file changed, 35 insertions(+), 31 deletions(-)

(limited to 'helpcontent2/source/text/scalc')

diff --git a/helpcontent2/source/text/scalc/guide/text_wrap.xhp b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
index a298a3799a..7d6fa456a1 100755
--- a/helpcontent2/source/text/scalc/guide/text_wrap.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
@@ -1,46 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+
+<helpdocument version="1.0">
+	
+<!--
+ ***********************************************************************
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ *  $RCSfile: text_wrap.xhp,v $fileonly,v $
  *
- * $RCSfile: text_wrap.xhp,v $
- * $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- * This file is part of OpenOffice.org.
+ *  last change: $Author: vg $ $Date: 2008-06-02 21:31:11 $
  *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, 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.
+ *
+ *    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
+ *
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
 <topic id="textscalcguidetext_wrapxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Writing Multi-line Text</title>
 <filename>/text/scalc/guide/text_wrap.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T14:58:55">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154346"><bookmark_value>text in cells; multi-line</bookmark_value>
@@ -51,9 +55,9 @@
 <paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="1" l10n="U" oldref="42"><variable id="text_wrap"><link href="text/scalc/guide/text_wrap.xhp" name="Writing Multi-line Text">Writing Multi-line Text</link>
 </variable></paragraph>
 <section id="wraptext">
-<list type="unordered">
+<list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="41">Pressing the <switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="listitem" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="41">Pressing the <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys inserts a manual line break. This shortcut only works directly in the cell, not in the input line.</paragraph>
 </listitem>
 </list>
@@ -63,7 +67,7 @@
 <paragraph role="listitem" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="44">Select all the cells where you want the text to break at the right border.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="45">In <emph>Format - Cells - Alignment</emph>, mark the <emph>Automatic line break</emph> option and click OK.</paragraph>
+<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="CHG" oldref="45">In <emph>Format - Cells - Alignment</emph>, mark the <emph>Wrap text automatically</emph> option and click OK.</paragraph>
 </listitem>
 </list>
 </section>
-- 
cgit