INTEGRATION: CWS hc680fin (1.5.2); FILE MERGED

2005/11/23 08:32:42 ufi 1.5.2.1: *** empty log message ***

1 files changed, 44 insertions, 24 deletions

diff --git a/helpcontent2/source/text/swriter/01/05060100.xhp b/helpcontent2/source/text/swriter/01/05060100.xhp
index 68ac880211..145b6e5398 100644
--- a/helpcontent2/source/text/swriter/01/05060100.xhp
+++ b/helpcontent2/source/text/swriter/01/05060100.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: 05060100.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.5 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: kz $ $Date: 2005-10-05 14:27:21 $
+ *  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-07-15T15:40:54">UFI: sw.feature "Enhanced Writer fly frame positioning and alignment"   news://staroffice-news:119/openoffice.sw.features-6195447.1075794225974.JavaMail.root@so; dedr: reviewed
+<lastedited date="2005-11-10T10:27:55">UFI: sw.feature "Enhanced Writer fly frame positioning and alignment"   news://staroffice-news:119/openoffice.sw.features-6195447.1075794225974.JavaMail.root@so; dedr: reviewed
 -web3.Germany.Sun.COM
 YJ:checked</lastedited>
 </history>
@@ -61,14 +81,14 @@ YJ:checked</lastedited>
 <paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_WIDTH">Enter the width that you want for the selected object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_REL_WIDTH" id="bm_id3151177" localize="false"/>
 <paragraph role="heading" id="hd_id3154646" xml-lang="en-US" level="3" l10n="U" oldref="7">Relative</paragraph>
-<paragraph role="paragraph" id="par_id3145413" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_WIDTH">Calculates the width of the selected object as a percentage of the width of the page print area.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145413" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_WIDTH">Calculates the width of the selected object as a percentage of the width of the page text area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_FRM_STD:ED_HEIGHT" id="bm_id3152948" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_HEIGHT" id="bm_id9007232" localize="false"/>
 <paragraph role="heading" id="hd_id3147516" xml-lang="en-US" level="3" l10n="U" oldref="9">Height</paragraph>
 <paragraph role="paragraph" id="par_id3154099" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FRM_STD:ED_HEIGHT">Enter the height that you want for the selected object.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_REL_HEIGHT" id="bm_id3153535" localize="false"/>
 <paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="11">Relative</paragraph>
-<paragraph role="paragraph" id="par_id3154563" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_HEIGHT">Calculates the height of the selected object as a percentage of the height of the page print area.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154563" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_FRM_STD:CB_REL_HEIGHT">Calculates the height of the selected object as a percentage of the height of the page text area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_STD:CB_FIXEDRATIO" id="bm_id3153668" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_KEEPRATIO" id="bm_id7496566" localize="false"/>
 <paragraph role="heading" id="hd_id3151313" xml-lang="en-US" level="3" l10n="U" oldref="13">Keep ratio</paragraph>