summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
Diffstat (limited to 'sot')
-rw-r--r--sot/source/base/formats.cxx51
1 files changed, 18 insertions, 33 deletions
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 78fa3c629748..fafee57472df 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1,35 +1,30 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: formats.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: hr $ $Date: 2007-06-27 22:49:13 $
+ * $RCSfile: formats.cxx,v $
+ * $Revision: 1.24 $
*
- * 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.
*
************************************************************************/
@@ -37,13 +32,8 @@
#include "precompiled_sot.hxx"
#define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS
-
-#ifndef _DEBUG_HXX
#include <tools/debug.hxx>
-#endif
-#ifndef _SOLAR_H
#include <tools/solar.h>
-#endif
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
@@ -51,13 +41,8 @@
#include "clsids.hxx"
#include <tools/globname.hxx>
-
-#ifndef _COM_SUN_STAR_DATATRANSFER_DATAFLAVOR_HPP_
#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DATATRANSFER_XTRANSFERABLE_HPP_
#include <com/sun/star/datatransfer/XTransferable.hpp>
-#endif
using namespace::com::sun::star::uno;
using namespace::com::sun::star::datatransfer;