diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 08:41:17 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 08:41:17 +0000 |
commit | c6bb7998e300da64a7b521e6e2251faa159ae524 (patch) | |
tree | 9d5693d8d76fd3a7c15c2956ba70b5634fa3c1cb /toolkit/workben | |
parent | b3581dd5c02f542d00ce79750b904251e61ab15b (diff) |
INTEGRATION: CWS changefileheader (1.14.210); FILE MERGED
2008/04/01 16:01:02 thb 1.14.210.3: #i85898# Stripping all external header guards
2008/04/01 12:56:55 thb 1.14.210.2: #i85898# Stripping all external header guards
2008/03/28 15:40:23 rt 1.14.210.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'toolkit/workben')
-rw-r--r-- | toolkit/workben/unodialog.cxx | 63 |
1 files changed, 18 insertions, 45 deletions
diff --git a/toolkit/workben/unodialog.cxx b/toolkit/workben/unodialog.cxx index ad5a787573c8..97f5c62b6ec6 100644 --- a/toolkit/workben/unodialog.cxx +++ b/toolkit/workben/unodialog.cxx @@ -1,69 +1,45 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: unodialog.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2006-09-16 12:24:28 $ + * $RCSfile: unodialog.cxx,v $ + * $Revision: 1.15 $ * - * 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_toolkit.hxx" -#ifndef _SVWIN_H #include <tools/svwin.h> -#endif #include <sal/main.h> - -#ifndef _COM_SUN_STAR_AWT_XTOOLKIT_HPP_ #include <com/sun/star/awt/XToolkit.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XCONTROLMODEL_HPP_ #include <com/sun/star/awt/XControlModel.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XCONTROLCONTAINER_HPP_ #include <com/sun/star/awt/XControlContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XCONTROL_HPP_ #include <com/sun/star/awt/XControl.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XDIALOG_HPP_ #include <com/sun/star/awt/XDialog.hpp> -#endif #include <tools/debug.hxx> @@ -71,10 +47,7 @@ #include <vcl/wrkwin.hxx> #include <svtools/unoiface.hxx> // InitExtToolkit - -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> -#endif #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/bootstrap.hxx> |