strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS fwk37 (1.2.88); FILE MERGED

Browse source 
2006/03/28 08:11:41 as 1.2.88.1: #i61619# remove SISSL
This commit is contained in:
Kurt Zenker 2006-04-26 13:20:48 +00:00
parent 74398d7de1
commit c41498b473
2 changed files with 42 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
framework/inc/uiconfiguration/globalsettings.hxx
View file

@ -1,22 +1,20 @@
/************************************************************************* /*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: globalsettings.hxx,v $ * $RCSfile: globalsettings.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: rt $ $Date: 2005-11-11 12:03:55 $ * last change: $Author: kz $ $Date: 2006-04-26 14:20:37 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to
* either of the following licenses * the terms of GNU Lesser General Public License Version 2.1.
* *
* - 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 2000 by Sun Microsystems, Inc. * Copyright 2005 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
@ -33,30 +31,6 @@
* 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 __FRAMEWORK_UICONFIGURATION_GLOBALSETTINGS_HXX_ #ifndef __FRAMEWORK_UICONFIGURATION_GLOBALSETTINGS_HXX_

40
framework/source/dispatch/systemexec.cxx
View file

@ -1,22 +1,20 @@
/************************************************************************* /*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: systemexec.cxx,v $ * $RCSfile: systemexec.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kz $ $Date: 2005-11-11 14:13:34 $ * last change: $Author: kz $ $Date: 2006-04-26 14:20:48 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to
* either of the following licenses * the terms of GNU Lesser General Public License Version 2.1.
* *
* - 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 2000 by Sun Microsystems, Inc. * Copyright 2005 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
@ -33,30 +31,6 @@
* 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): _______________________________________
*
*
************************************************************************/ ************************************************************************/
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________