diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 10:48:15 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 10:48:15 +0000 |
commit | 8d8d6fe6948d402d56e78e6b8a1b7267e50d6147 (patch) | |
tree | 37c8faf5514adabb844b0c3c43bf89aee59f2a04 | |
parent | 963cc86b72ee399e0549b5c503b55549d6a3a6e3 (diff) |
INTEGRATION: CWS changefileheader (1.2.222); FILE MERGED
2008/04/01 15:15:24 thb 1.2.222.3: #i85898# Stripping all external header guards
2008/04/01 12:29:59 thb 1.2.222.2: #i85898# Stripping all external header guards
2008/03/31 12:32:18 rt 1.2.222.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | extensions/source/update/feed/test/updatefeedtest.cxx | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index 91bc8e58d2de..df56649fd6c0 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -1,44 +1,36 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: updatefeedtest.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2006-12-13 15:19:19 $ + * $RCSfile: updatefeedtest.cxx,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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" - -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> -#endif #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/bootstrap.hxx> @@ -46,9 +38,7 @@ #include <com/sun/star/lang/XInitialization.hpp> -#ifndef _COM_SUN_STAR_DEPLOYMENT_UPDATEINFORMATIONPROVIDER_HPP_ #include <com/sun/star/deployment/UpdateInformationProvider.hpp> -#endif #include <sal/main.h> #include <osl/process.h> |