INTEGRATION: CWS hcshared08 (1.6.86); FILE MERGED

2007/03/05 08:06:59 ufi 1.6.86.1: last commit

1 files changed, 28 insertions, 46 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01040500.xhp b/helpcontent2/source/text/shared/optionen/01040500.xhp
index ffb539452f..5a0660f032 100644
--- a/helpcontent2/source/text/shared/optionen/01040500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040500.xhp
@@ -1,58 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01040500.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.7 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2007-04-02 15:39:57 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    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.
  *
- *  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.
+ *    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.
  *
- *  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.
+ *    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
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************-->
+ ************************************************************************
+ -->
 	
 <helpdocument version="1.0">
 <meta>
@@ -62,7 +44,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-23T15:38:55">converted from old format - fpe</lastedited>
+<lastedited date="2007-02-19T16:37:06">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -141,10 +123,10 @@
 <paragraph role="heading" id="hd_id3155607" xml-lang="en-US" level="4" l10n="U" oldref="13">Column</paragraph>
 <paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLINSERT">Specifies the default value for inserting columns.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3150645" xml-lang="en-US" level="3" l10n="U" oldref="15">Behavior of rows/columns</paragraph>
-<paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="16">Determines the relative effect of rows and columns to adjacent other rows or columns, as well as to the entire table.</paragraph>
+<paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="CHG" oldref="16">Determines the relative effect of rows and columns on adjacent rows or columns, as well as on the entire table.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX" id="bm_id3159238" localize="false"/>
 <paragraph role="heading" id="hd_id3149335" xml-lang="en-US" level="4" l10n="U" oldref="17">Fixed</paragraph>
-<paragraph role="paragraph" id="par_id3151213" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX">Specifies that changes to a row or column only affect corresponding adjacent area.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151213" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX">Specifies that changes to a row or column only affect the corresponding adjacent area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP" id="bm_id3153269" localize="false"/>
 <paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="4" l10n="U" oldref="19">Fixed, proportional</paragraph>
 <paragraph role="paragraph" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP">Specifies that changes to a row or column have an effect on the entire table.</ahelp></paragraph>