diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 10:59:30 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 10:59:30 +0000 |
commit | f4a6336b6f1fa4325a525d4973ff64cd674eb5bf (patch) | |
tree | c93fb519558f780db09b60733ba8dfc62738c52e | |
parent | 24cf527c7def862b83d585002f9b88dfea67daac (diff) |
INTEGRATION: CWS changefileheader (1.4.56); FILE MERGED
2008/04/01 15:04:46 thb 1.4.56.2: #i85898# Stripping all external header guards
2008/03/31 07:22:51 rt 1.4.56.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | codemaker/inc/codemaker/dependencies.hxx | 43 | ||||
-rw-r--r-- | codemaker/inc/codemaker/generatedtypeset.hxx | 43 |
2 files changed, 36 insertions, 50 deletions
diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx index f56b73b969dd..fe87451ddbdb 100644 --- a/codemaker/inc/codemaker/dependencies.hxx +++ b/codemaker/inc/codemaker/dependencies.hxx @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: dependencies.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: vg $ $Date: 2006-03-15 09:09:57 $ + * $RCSfile: dependencies.hxx,v $ + * $Revision: 1.5 $ * - * 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 INCLUDED_CODEMAKER_DEPENDENCIES_HXX #define INCLUDED_CODEMAKER_DEPENDENCIES_HXX -#ifndef _RTL_STRING_HXX_ #include "rtl/string.hxx" -#endif #include <hash_map> diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx index d92675d1da91..330df93862f3 100644 --- a/codemaker/inc/codemaker/generatedtypeset.hxx +++ b/codemaker/inc/codemaker/generatedtypeset.hxx @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: generatedtypeset.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: vg $ $Date: 2006-03-15 09:10:27 $ + * $RCSfile: generatedtypeset.hxx,v $ + * $Revision: 1.5 $ * - * 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 INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX #define INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX -#ifndef _RTL_STRING_HXX_ #include "rtl/string.hxx" -#endif #include <hash_set> |