From c5b0f003239677490eb19bf1ceb29cd2f3dcda65 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed, 28 Jun 2006 14:35:15 +0000
Subject: [PATCH] INTEGRATION: CWS hcswriter01 (1.4.6); FILE MERGED 2006/06/13
 12:39:08 ufi 1.4.6.2: final works 2006/06/12 13:44:56 ufi 1.4.6.1:
 border_page.xhp problem

---
 .../source/text/scalc/guide/borders.xhp       | 73 +++++++------------
 1 file changed, 27 insertions(+), 46 deletions(-)

diff --git a/helpcontent2/source/text/scalc/guide/borders.xhp b/helpcontent2/source/text/scalc/guide/borders.xhp
index 1b9bfa310c..2ede7cb7d6 100755
--- a/helpcontent2/source/text/scalc/guide/borders.xhp
+++ b/helpcontent2/source/text/scalc/guide/borders.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: borders.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.5 $
  *
- *  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: ihi $ $Date: 2006-06-28 15:35:15 $
  *
- *  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
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
  *
- *  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.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  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.
+ *    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 Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *    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.
  *
- *  Copyright: 2000 by Sun Microsystems, Inc.
+ *    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
  *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************-->
+ ************************************************************************
+ -->
 	
 <helpdocument version="1.0">
 <meta>
@@ -62,7 +44,7 @@
 </topic>
 <history>
 <created date="2005-11-01T15:03:17">Cell Borders</created>
-<lastedited date="2005-11-04T11:15:27"/>
+<lastedited date="2006-06-13T14:09:32"/>
 </history>
 </meta>
 <body>
@@ -252,11 +234,10 @@
 	</image></paragraph>
 <section id="relatedtopics">
 <switch select="appl">
-<case select="WRITER"><embed href="text/shared/guide/border_page.xhp#border_page"/>
+<case select="WRITER"><embed href="text/swriter/guide/border_page.xhp#border_page"/>
 </case>
 </switch>
 <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-<embed href="text/shared/guide/border_object.xhp#border_object"/>
 </section>
 </body>
 </helpdocument>