From 6886fc9650bb1677b67799dde6068b551cd248fa Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Mon, 27 Mar 2006 11:30:17 +0000
Subject: INTEGRATION: CWS hc680fin (1.4.14); FILE MERGED 2005/11/23 08:32:43
 ufi 1.4.14.1: *** empty log message ***

---
 helpcontent2/source/text/swriter/01/05150000.xhp | 66 +++++++++++++--------
 helpcontent2/source/text/swriter/01/05150101.xhp | 73 +++++++++++++++---------
 2 files changed, 89 insertions(+), 50 deletions(-)

(limited to 'helpcontent2/source/text')

diff --git a/helpcontent2/source/text/swriter/01/05150000.xhp b/helpcontent2/source/text/swriter/01/05150000.xhp
index 75c15b07aa..0d24873432 100755
--- a/helpcontent2/source/text/swriter/01/05150000.xhp
+++ b/helpcontent2/source/text/swriter/01/05150000.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: 05150000.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-08 01:56:28 $
+ *  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="2004-09-20T15:22:57">converted from old format - fpe</lastedited>
+<lastedited date="2005-11-14T15:29:24">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -56,6 +76,6 @@
 <embed href="text/swriter/01/05150100.xhp#eingabe"/>
 <embed href="text/swriter/01/05150200.xhp#dokument"/>
 <embed href="text/swriter/01/05150300.xhp#ananbe"/>
-<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="U" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Format - AutoFormat</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="CHG" oldref="3">To open the <link href="text/swriter/01/05150101.xhp" name="AutoFormat for Tables">AutoFormat for Tables</link> dialog, click in a table cell, and then choose <emph>Tables - AutoFormat</emph>.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05150101.xhp b/helpcontent2/source/text/swriter/01/05150101.xhp
index 479203fedb..5fdaa9fff4 100644
--- a/helpcontent2/source/text/swriter/01/05150101.xhp
+++ b/helpcontent2/source/text/swriter/01/05150101.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: 05150101.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-08 01:56:56 $
+ *  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,11 +62,11 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-17T15:19:16">converted from old format - fpe</lastedited>
+<lastedited date="2005-11-14T15:32:21">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/SID_AUTOFORMAT" id="bm_id4963785" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_AUTOFORMAT" id="bm_id4963785" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id3150343" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_AUTOFMT_TABLE" id="bm_id3150249" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2655415"><bookmark_value>tables;AutoFormat function</bookmark_value>
@@ -63,8 +83,7 @@
 <paragraph role="listitem" id="par_id3145828" xml-lang="en-US" l10n="U" oldref="4">Click in a table cell, or select the cells that you want to format.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3153006" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Format -</emph>
-<emph>AutoFormat</emph>, and then click the format that you to want to apply.</paragraph>
+<paragraph role="listitem" id="par_id3153006" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Table - AutoFormat</emph>, and then click the format that you to want to apply.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3145585" xml-lang="en-US" l10n="U" oldref="30">Click <emph>OK</emph>.</paragraph>
@@ -81,7 +100,7 @@
 <paragraph role="listitem" id="par_id3154646" xml-lang="en-US" l10n="U" oldref="12">Format a table in your document.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3156320" xml-lang="en-US" l10n="U" oldref="13">Select the table, and then choose <emph>Format - AutoFormat</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3156320" xml-lang="en-US" l10n="CHG" oldref="13">Select the table, and then choose <emph>Table - AutoFormat</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3153156" xml-lang="en-US" l10n="U" oldref="14">Click <emph>Add</emph>.</paragraph>
@@ -115,6 +134,6 @@
 <paragraph role="paragraph" id="par_id3151325" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_PATTERN">Includes background styles in the selected table style.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME" id="bm_id3149483" localize="false"/>
 <paragraph role="heading" id="hd_id3149302" xml-lang="en-US" level="2" l10n="U" oldref="28">Rename</paragraph>
-<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME">Changes the name of the selected table style.</ahelp> You cannot rename the "Standard" table style.</paragraph>
+<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME">Changes the name of the selected table style. You cannot rename the "Standard" table style.</ahelp></paragraph>
 </body>
 </helpdocument>
-- 
cgit