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

INTEGRATION: CWS changefileheader (1.2.320); FILE MERGED

Browse source 
2008/04/01 16:05:22 thb 1.2.320.3: #i85898# Stripping all external header guards
2008/04/01 13:01:15 thb 1.2.320.2: #i85898# Stripping all external header guards
2008/03/28 15:44:17 rt 1.2.320.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm 2008-04-11 06:57:38 +00:00
parent 7790dec7fe
commit 6b9605b6cd
2 changed files with 36 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
vcl/inc/vcl/salogl.hxx
View file

@ -1,35 +1,30 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* $RCSfile: salogl.hxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.2 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: vg $ $Date: 2007-04-11 18:07:55 $
* $RCSfile: salogl.hxx,v $
* $Revision: 1.3 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
* OpenOffice.org 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 version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* 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
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
@ -38,22 +33,12 @@
#define _OPENGL_EXT
#ifndef _GEN_HXX
#include <tools/gen.hxx>
#endif
#define _SVUNX_H
#ifndef _SV_SV_H
#include <vcl/sv.h>
#endif
#ifndef _VCL_DLLAPI_H
#include <vcl/dllapi.h>
#endif
#ifndef _SV_SALOTYPE_HXX
#include <vcl/salotype.hxx>
#endif
// -----------------
// - State defines -

49
vcl/inc/vcl/salsys.hxx
View file

@ -1,52 +1,39 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* $RCSfile: salsys.hxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.2 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: vg $ $Date: 2007-04-11 18:09:07 $
* $RCSfile: salsys.hxx,v $
* $Revision: 1.3 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
* OpenOffice.org 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 version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* 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
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _SV_SALSYS_HXX
#define _SV_SALSYS_HXX
#ifndef _STRING_HXX
#include <tools/string.hxx>
#endif
#ifndef _GEN_HXX
#include <tools/gen.hxx>
#endif
#ifndef _VCL_DLLAPI_H
#include <vcl/dllapi.h>
#endif
/* Button combinations for ShowNativeMessageBox