INTEGRATION: CWS hc680fin (1.4.14); FILE MERGED

2005/11/23 08:32:44 ufi 1.4.14.1: *** empty log message ***

2 files changed, 91 insertions, 53 deletions

diff --git a/helpcontent2/source/text/swriter/01/06100000.xhp b/helpcontent2/source/text/swriter/01/06100000.xhp
index 21772a052a..f067313921 100644
--- a/helpcontent2/source/text/swriter/01/06100000.xhp
+++ b/helpcontent2/source/text/swriter/01/06100000.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: 06100000.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 02:01:04 $
+ *  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,22 +62,20 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-01T14:25:23">converted from old format - fpe
+<lastedited date="2005-11-21T11:49:06">converted from old format - fpe
 UFI: included note for asian languages into AVIS text.
 DEDR: reviewed</lastedited>
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3149353"><bookmark_value>sorting; text</bookmark_value>
-<bookmark_value>tables;sorting</bookmark_value>
-<bookmark_value>sorting;table rows</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149353"><bookmark_value>tables;sorting</bookmark_value>
+<bookmark_value>sorting;paragraphs and table rows</bookmark_value>
 <bookmark_value>text; sorting</bookmark_value>
-<bookmark_value>lines; sorting</bookmark_value>
-<bookmark_value>sorting; paragraphs</bookmark_value>
+<bookmark_value>lines of text; sorting</bookmark_value>
 <bookmark_value>sorting;Asian languages</bookmark_value>
 <bookmark_value>Asian languages;sorting</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/FN_SORTING_DLG" id="bm_id849221" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_SORTING_DLG" id="bm_id849221" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SortDialog" id="bm_id3145829" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/FN_TABLE_SORT_DIALOG" id="bm_id1702932" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TableSort" id="bm_id6670125" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/02/18120000.xhp b/helpcontent2/source/text/swriter/02/18120000.xhp
index 0a951b6205..4cf941f9aa 100644
--- a/helpcontent2/source/text/swriter/02/18120000.xhp
+++ b/helpcontent2/source/text/swriter/02/18120000.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: 18120000.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 02:24:27 $
+ *  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,26 +62,26 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-09T08:59:10">converted from old format - fpe</lastedited>
+<lastedited date="2005-11-22T11:10:10">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
 <section id="grafikenaus">
-<bookmark xml-lang="en-US" branch="hid/FN_VIEW_GRAPHIC" id="bm_id1021216" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_VIEW_GRAPHIC" id="bm_id1021216" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Graphic" id="bm_id3155625" localize="false"/>
 <paragraph role="heading" id="hd_id3148568" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/18120000.xhp" name="Graphics On/Off">Graphics On/Off</link></paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147167"><bookmark_value>graphics;do not show</bookmark_value>
 <bookmark_value>images;do not show</bookmark_value>
 <bookmark_value>pictures;do not show</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid=".uno:Graphic">If the<emph> Graphics On/Off </emph>icon is activated, no graphics are displayed - only empty frames as placeholders.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid=".uno:Graphic">If the<emph> Graphics On/Off </emph>icon on the <emph>Tools</emph> bar is activated, no graphics are displayed - only empty frames as placeholders.</ahelp></paragraph>
 </section>
 <section id="sygrafikenaus">
 <table id="tbl_id3151180">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="E">
-<image id="img_id3156379" src="res/commandimagelist/sc_graphic.png" width="5.64mm" height="5.64mm"><alt id="alt_id3156379" xml-lang="en-US">Icon</alt>
+<image id="img_id3156379" src="res/commandimagelist/sc_graphic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156379" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">