diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 04:03:08 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 04:03:08 +0000 |
commit | ec77c1954484cbebbbdb6801b2afc980428dab91 (patch) | |
tree | 620e99d7c176761ae8a56b7842af234389cad2b2 /embeddedobj | |
parent | 0268e3965ebcb8e7ea8d94c156bcadfc68a7b551 (diff) |
INTEGRATION: CWS changefileheader (1.11.26); FILE MERGED
2008/04/01 15:13:51 thb 1.11.26.3: #i85898# Stripping all external header guards
2008/04/01 12:28:53 thb 1.11.26.2: #i85898# Stripping all external header guards
2008/03/31 13:33:21 rt 1.11.26.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'embeddedobj')
-rw-r--r-- | embeddedobj/source/msole/xdialogcreator.cxx | 61 |
1 files changed, 19 insertions, 42 deletions
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index c4a7fcfceb..56199216cc 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -1,62 +1,41 @@ /************************************************************************* * - * 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: xdialogcreator.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.11 $ + * $RCSfile: xdialogcreator.cxx,v $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2007-07-06 10:11:44 $ + * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_embeddedobj.hxx" - -#ifndef _COM_SUN_STAR_EMBED_XEMBEDOBJECTCREATOR_HPP_ #include <com/sun/star/embed/XEmbedObjectCreator.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ #include <com/sun/star/embed/XEmbeddedObject.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_ENTRYINITMODES_HPP_ #include <com/sun/star/embed/EntryInitModes.hpp> -#endif - -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif - -#ifndef _COM_SUN_STAR_DATATRANSFER_DATAFLAVOR_HPP_ #include <com/sun/star/datatransfer/DataFlavor.hpp> -#endif - -#ifndef _COM_SUN_STAR_UCB_COMMANDABORTEDEXCEPTION_HPP_ #include <com/sun/star/ucb/CommandAbortedException.hpp> -#endif #include <osl/thread.h> @@ -65,9 +44,7 @@ #include <comphelper/classids.hxx> #include "platform.h" -#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ #include <comphelper/mimeconfighelper.hxx> -#endif #include "xdialogcreator.hxx" #include "oleembobj.hxx" |