summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-11 06:43:49 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-11 06:43:49 +0000
commitd12c0e73ceef327840ed4d7954f16358be7286f8 (patch)
treefa7510fdd8ffb4fbcd3bfdcf74f4aba0ae119441
parent0bd91da052c33c490e710f9f791b9adc52626569 (diff)
INTEGRATION: CWS changefileheader (1.2.320); FILE MERGED
2008/04/01 16:05:19 thb 1.2.320.3: #i85898# Stripping all external header guards 2008/04/01 13:01:11 thb 1.2.320.2: #i85898# Stripping all external header guards 2008/03/28 15:44:14 rt 1.2.320.1: #i87441# Change license header to LPGL v3.
-rw-r--r--vcl/inc/vcl/jobset.h50
-rw-r--r--vcl/inc/vcl/jobset.hxx51
-rw-r--r--vcl/inc/vcl/longcurr.hxx46
-rw-r--r--vcl/inc/vcl/mapmod.hxx56
4 files changed, 72 insertions, 131 deletions
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h
index 6fa9032a23f4..5d08319a7e6c 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/vcl/jobset.h
@@ -1,55 +1,41 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: jobset.h,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 17:58:33 $
+ * $RCSfile: jobset.h,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_JOBSET_H
#define _SV_JOBSET_H
-#ifndef _STRING_HXX
#include <tools/string.hxx>
-#endif
-
-#ifndef _SV_SV_H
#include <vcl/sv.h>
-#endif
-#ifndef _SV_PRNTYPES_HXX
#include <vcl/prntypes.hxx>
-#endif
#include <hash_map>
-#ifndef _RTL_USTRING_
#include <rtl/ustring.hxx>
-#endif
// ------------------
// - JobSetup-Types -
diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx
index 155b2530d8d8..1ace66ddfc12 100644
--- a/vcl/inc/vcl/jobset.hxx
+++ b/vcl/inc/vcl/jobset.hxx
@@ -1,55 +1,40 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: jobset.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 17:58:42 $
+ * $RCSfile: jobset.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_JOBSET_HXX
#define _SV_JOBSET_HXX
-#ifndef _TOOLS_STRING_HXX
#include <tools/string.hxx>
-#endif
-#ifndef _SV_SV_H
#include <vcl/sv.h>
-#endif
-
-#ifndef _VCL_DLLAPI_H
#include <vcl/dllapi.h>
-#endif
-
-#ifndef _SV_PRNTYPES_HXX
#include <vcl/prntypes.hxx>
-#endif
class SvStream;
struct ImplJobSetup;
diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx
index 194944d553cc..f3ba8428ca52 100644
--- a/vcl/inc/vcl/longcurr.hxx
+++ b/vcl/inc/vcl/longcurr.hxx
@@ -1,48 +1,38 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: longcurr.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 17:59:21 $
+ * $RCSfile: longcurr.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 _LONGCURR_HXX
#define _LONGCURR_HXX
-#ifndef _VCL_DLLAPI_H
#include <vcl/dllapi.h>
-#endif
-
-#ifndef _BIGINT_HXX
#include <tools/bigint.hxx>
-#endif
#ifndef _FIELD_HXX
#include <vcl/field.hxx>
#endif
diff --git a/vcl/inc/vcl/mapmod.hxx b/vcl/inc/vcl/mapmod.hxx
index fbdef7cbd2ab..6a7bbb196146 100644
--- a/vcl/inc/vcl/mapmod.hxx
+++ b/vcl/inc/vcl/mapmod.hxx
@@ -1,62 +1,42 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: mapmod.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 17:59:54 $
+ * $RCSfile: mapmod.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_MAPMOD_HXX
#define _SV_MAPMOD_HXX
-#ifndef _GEN_HXX
#include <tools/gen.hxx>
-#endif
-#ifndef _FRACT_HXX
#include <tools/fract.hxx>
-#endif
-
-#ifndef _SV_SV_H
#include <vcl/sv.h>
-#endif
-
-#ifndef _VCL_DLLAPI_H
#include <vcl/dllapi.h>
-#endif
-
-#ifndef _TOOLS_RESID_HXX
#include <tools/resid.hxx>
-#endif
-#ifndef _VCL_MAPUNIT_HXX
#include <vcl/mapunit.hxx>
-#endif
class SvStream;