INTEGRATION: CWS ab17fixes (1.4.254); FILE MERGED

This commit is contained in:
Jens-Heiner Rechtien
2005-09-29 11:36:37 +00:00
parent 9662ca62b1
commit b4026d4fd0

View File

@@ -1,20 +1,22 @@
/************************************************************************* /*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: textedit.hxx,v $ * $RCSfile: textedit.hxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 21:22:00 $ * last change: $Author: hr $ $Date: 2005-09-29 12:36:37 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to the terms of
* the terms of GNU Lesser General Public License Version 2.1. * either of the following licenses
* *
* - GNU Lesser General Public License Version 2.1
* - Sun Industry Standards Source License Version 1.1
*
* Sun Microsystems Inc., October, 2000
* *
* GNU Lesser General Public License Version 2.1 * GNU Lesser General Public License Version 2.1
* ============================================= * =============================================
* Copyright 2005 by Sun Microsystems, Inc. * Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 901 San Antonio Road, Palo Alto, CA 94303, USA
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -31,6 +33,30 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
*
* 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 EXPRESSED 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): _______________________________________
*
*
************************************************************************/ ************************************************************************/
#ifndef _TEXTEDIT_HXX #ifndef _TEXTEDIT_HXX