From c24613c59ff19c9ec1f7ace2856f2be109412ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 11 Apr 2008 06:47:55 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.3.458); FILE MERGED 2008/04/01 15:18:31 thb 1.3.458.3: #i85898# Stripping all external header guards 2008/04/01 10:57:59 thb 1.3.458.2: #i85898# Stripping all external header guards 2008/03/28 15:34:59 rt 1.3.458.1: #i87441# Change license header to LPGL v3. --- .../xml/acceleratorconfigurationwriter.hxx | 58 ++++++------------- framework/inc/xml/acceleratorconst.hxx | 46 ++++++--------- 2 files changed, 36 insertions(+), 68 deletions(-) diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index 915e215a03a5..505fc24d8ed8 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: acceleratorconfigurationwriter.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-09 00:51:22 $ + * $RCSfile: acceleratorconfigurationwriter.hxx,v $ + * $Revision: 1.4 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -39,21 +34,10 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_ #include -#endif - -#ifndef __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_ #include -#endif - -#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ #include -#endif - -#ifndef __FRAMEWORK_GENERAL_H_ #include -#endif //_______________________________________________ // interface includes @@ -64,14 +48,8 @@ //_______________________________________________ // other includes - -#ifndef _SALHELPER_SINGLETONREF_HXX_ #include -#endif - -#ifndef _RTL_USTRING_ #include -#endif namespace framework{ diff --git a/framework/inc/xml/acceleratorconst.hxx b/framework/inc/xml/acceleratorconst.hxx index b3af1e3afcb2..70139a545bc3 100644 --- a/framework/inc/xml/acceleratorconst.hxx +++ b/framework/inc/xml/acceleratorconst.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: acceleratorconst.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-09 00:51:36 $ + * $RCSfile: acceleratorconst.hxx,v $ + * $Revision: 1.4 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -39,19 +34,14 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_GENERAL_H_ #include -#endif //_______________________________________________ // interface includes //_______________________________________________ // other includes - -#ifndef _RTL_USTRING_ #include -#endif namespace framework{