diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 10:42:50 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 10:42:50 +0000 |
commit | 3ed943e7105e2ca74e65edf8783b9c9d9bf1a3cb (patch) | |
tree | 53ed949a76d8234937bc7c31cdb983a51bccd452 | |
parent | 7450f2da3667030f7c3ae6c9c796a2db91215c5f (diff) |
INTEGRATION: CWS changefileheader (1.2.280); FILE MERGED
2008/04/01 15:38:33 thb 1.2.280.3: #i85898# Stripping all external header guards
2008/04/01 12:40:38 thb 1.2.280.2: #i85898# Stripping all external header guards
2008/03/31 13:37:57 rt 1.2.280.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | sfx2/inc/sfx2/sfxstatuslistener.hxx | 64 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxuno.hxx | 93 |
2 files changed, 38 insertions, 119 deletions
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index eca3fe90bc..57f3beb7dd 100644 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -1,71 +1,45 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: sfxstatuslistener.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.2 $ + * $RCSfile: sfxstatuslistener.hxx,v $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 21:29:11 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * 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 _SFXSTATUSLISTENER_HXX #define _SFXSTATUSLISTENER_HXX -#ifndef _SAL_CONFIG_H_ #include "sal/config.h" -#endif - -#ifndef INCLUDED_SFX2_DLLAPI_H #include "sfx2/dllapi.h" -#endif - -#ifndef _SFXPOOLITEM_HXX //autogen #include <svtools/poolitem.hxx> -#endif -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif -#ifndef _OSL_CONDITN_HXX_ #include <osl/conditn.hxx> -#endif - -#ifndef _COM_SUN_STAR_FRAME_FEATURESTATEEVENT_HPP_ #include <com/sun/star/frame/FeatureStateEvent.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ #include <com/sun/star/frame/XDispatchProvider.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include <com/sun/star/frame/XStatusListener.hpp> -#endif #include <sfx2/sfxuno.hxx> diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 8ac9e56ffb..2ddce731e6 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -1,117 +1,62 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: sfxuno.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.2 $ + * $RCSfile: sfxuno.hxx,v $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 21:29:37 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * 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 _SFX_SFXUNO_HXX #define _SFX_SFXUNO_HXX -#ifndef _SAL_CONFIG_H_ #include "sal/config.h" -#endif - -#ifndef INCLUDED_SFX2_DLLAPI_H #include "sfx2/dllapi.h" -#endif - -#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP_ #include <com/sun/star/uno/Exception.hpp> -#endif - -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif - -#ifndef _COM_SUN_STAR_UTIL_URL_HPP_ #include <com/sun/star/util/URL.hpp> -#endif - -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif - -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif - -#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ #include <com/sun/star/lang/XTypeProvider.hpp> -#endif - -#ifndef _COM_SUN_STAR_TASK_ERRORCODEIOEXCEPTION_HPP_ #include <com/sun/star/task/ErrorCodeIOException.hpp> -#endif //________________________________________________________________________________________________________________________ // fix uno header //________________________________________________________________________________________________________________________ - -#ifndef _COM_SUN_STAR_UNO_TYPE_H_ #include <com/sun/star/uno/Type.h> -#endif - -#ifndef _COM_SUN_STAR_UNO_ANY_H_ #include <com/sun/star/uno/Any.h> -#endif - -#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> -#endif - -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif - -#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> -#endif - -#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include <cppuhelper/queryinterface.hxx> -#endif - -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif //________________________________________________________________________________________________________________________ // something else ... header //________________________________________________________________________________________________________________________ - -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif #ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> |