From 14709436c67eb360e93df0dd9b1c86d3aef780e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 11 Apr 2008 11:22:05 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.8.6); FILE MERGED 2008/04/01 15:02:01 thb 1.8.6.3: #i85898# Stripping all external header guards 2008/04/01 10:48:44 thb 1.8.6.2: #i85898# Stripping all external header guards 2008/03/28 16:07:51 rt 1.8.6.1: #i87441# Change license header to LPGL v3. --- basic/source/uno/dlgcont.cxx | 80 ++++++++---------------------------- 1 file changed, 18 insertions(+), 62 deletions(-) diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 3572ff1fbde9..751e98f091db 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -1,97 +1,53 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: dlgcont.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.8 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-03-06 18:53:30 $ + * $RCSfile: dlgcont.cxx,v $ + * $Revision: 1.9 $ * - * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" - -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UCB_XSIMPLEFILEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_RESOURCE_XSTRINGRESOURCEWITHSTORAGE_HPP_ #include "com/sun/star/resource/XStringResourceWithStorage.hpp" -#endif -#ifndef _COM_SUN_STAR_RESOURCE_XSTRINGRESOURCEWITHLOCATION_HPP_ #include "com/sun/star/resource/XStringResourceWithLocation.hpp" -#endif - -#ifndef BASIC_DIALOGCONTAINER_HXX #include "dlgcont.hxx" -#endif -#ifndef SBMODULE_HXX #include "sbmodule.hxx" -#endif - -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include -#endif -#ifndef _UTL_STREAM_WRAPPER_HXX_ #include -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif #include #include