diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 08:28:38 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 08:28:38 +0000 |
commit | e3f4e60863f14df612463e103036e549ec9b3aa6 (patch) | |
tree | 4b3b66a8433c31d481eb054e1d07b1e8394b572e | |
parent | 06b34eced8c09f1e2bd13b9b8272c8b9401066b2 (diff) |
INTEGRATION: CWS changefileheader (1.11.14); FILE MERGED
2008/04/01 15:15:01 thb 1.11.14.3: #i85898# Stripping all external header guards
2008/04/01 12:29:40 thb 1.11.14.2: #i85898# Stripping all external header guards
2008/03/31 12:31:21 rt 1.11.14.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.hxx | 47 | ||||
-rw-r--r-- | extensions/source/abpilot/unodialogabp.cxx | 52 |
2 files changed, 36 insertions, 63 deletions
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index 604b8df1013b..66fb449657fd 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -1,50 +1,39 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: typeselectionpage.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-03-06 18:39:43 $ + * $RCSfile: typeselectionpage.hxx,v $ + * $Revision: 1.12 $ * - * 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 EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX #define EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX -#ifndef EXTENSIONS_ABP_ABSPAGE_HXX #include "abspage.hxx" -#endif -#ifndef EXTENSIONS_ABP_ADDRESSSETTINGS_HXX #include "addresssettings.hxx" -#endif -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif //......................................................................... namespace abp diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index a6069badae97..8d4efe8e635e 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -1,56 +1,40 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: unodialogabp.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-03-06 18:39:56 $ + * $RCSfile: unodialogabp.cxx,v $ + * $Revision: 1.12 $ * - * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" - -#ifndef EXTENSIONS_ABP_UNODIALOG_HXX #include "unodialogabp.hxx" -#endif -#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> -#endif -#ifndef EXTENSIONS_ABSPILOT_HXX #include "abspilot.hxx" -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno() { |