summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-04-10 18:49:08 +0000
committerRüdiger Timm <rt@openoffice.org>2008-04-10 18:49:08 +0000
commit47574d754020d12ca97e910bf108e8c33e55d369 (patch)
treece8f7967acdfc7996d9f53d434a7748f31027b35
parent68ea685f945e70819ec2067a6efc311c067f67e4 (diff)
INTEGRATION: CWS changefileheader (1.12.298); FILE MERGED
2008/04/01 15:34:20 thb 1.12.298.2: #i85898# Stripping all external header guards 2008/03/31 13:57:48 rt 1.12.298.1: #i87441# Change license header to LPGL v3.
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx56
1 files changed, 18 insertions, 38 deletions
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index f4f032fde6b2..6d34834ccab9 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.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: morphdlg.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: kz $ $Date: 2006-12-12 17:06:40 $
+ * $RCSfile: morphdlg.cxx,v $
+ * $Revision: 1.13 $
*
- * 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.
*
************************************************************************/
@@ -47,28 +42,13 @@
#include "sdmod.hxx"
#include "sdiocmpt.hxx"
#include "morphdlg.hrc"
-
-#ifndef _CONFIG_HXX
#include <tools/config.hxx>
-#endif
-#ifndef SVX_XFILLIT0_HXX //autogen
#include <svx/xfillit0.hxx>
-#endif
-#ifndef _SVX_XLINEIT0_HXX //autogen
#include <svx/xlineit0.hxx>
-#endif
-#ifndef _XENUM_HXX //autogen
#include <svx/xenum.hxx>
-#endif
-#ifndef _SVDOBJ_HXX //autogen
#include <svx/svdobj.hxx>
-#endif
-#ifndef _SFXITEMSET_HXX //autogen
#include <svtools/itemset.hxx>
-#endif
-#ifndef _SFXITEMPOOL_HXX //autogen
#include <svtools/itempool.hxx>
-#endif
namespace sd {