diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 08:49:27 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 08:49:27 +0000 |
commit | c40ebb9022df2b3a603c278f13f486abcb0a4097 (patch) | |
tree | 0cec190838e4b75d42b7e210754f6cd0869218b1 /vcl | |
parent | c3066b86b89f218d4793b02c2b6a2f5afa39817e (diff) |
INTEGRATION: CWS changefileheader (1.12.484); FILE MERGED
2008/04/01 13:01:59 thb 1.12.484.2: #i85898# Stripping all external header guards
2008/03/28 15:45:25 rt 1.12.484.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/source/app/saltimer.cxx | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/source/app/saltimer.cxx index 80f928221820..bf8aa202b066 100644 --- a/vcl/unx/source/app/saltimer.cxx +++ b/vcl/unx/source/app/saltimer.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: saltimer.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.12 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2006-09-17 12:35:56 $ + * $RCSfile: saltimer.cxx,v $ + * $Revision: 1.13 $ * - * 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. * ************************************************************************/ @@ -46,19 +41,10 @@ #include <unistd.h> #include <salunx.h> - -#ifndef _SV_SALDATA_HXX #include <saldata.hxx> -#endif -#ifndef _SV_SALDISP_HXX #include <saldisp.hxx> -#endif -#ifndef _SV_SALTIMER_H #include <saltimer.h> -#endif -#ifndef _SV_SALINST_H #include <salinst.h> -#endif // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= |