summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-04-11 02:00:21 +0000
committerRüdiger Timm <rt@openoffice.org>2008-04-11 02:00:21 +0000
commit8d8f1ae2d1392e31e5c645f29bf52c0e2a19a911 (patch)
treebe40f21e25920b8233dd081b532a5e87912e9504 /svx/source/svdraw
parentee7a178913339b6099863e27bdc2207aa828a0dc (diff)
INTEGRATION: CWS changefileheader (1.16.50); FILE MERGED
2008/04/01 15:51:39 thb 1.16.50.3: #i85898# Stripping all external header guards 2008/04/01 12:49:55 thb 1.16.50.2: #i85898# Stripping all external header guards 2008/03/31 14:23:31 rt 1.16.50.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdmark.cxx53
1 files changed, 18 insertions, 35 deletions
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 2de5de96b9cf..d2e70af1eeb7 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.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: svdmark.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: kz $ $Date: 2008-03-07 14:46:46 $
+ * $RCSfile: svdmark.cxx,v $
+ * $Revision: 1.17 $
*
- * 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.
*
************************************************************************/
@@ -51,22 +46,10 @@
#include "svdglob.hxx" // StringCache
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifndef _E3D_OBJ3D_HXX //autogen
#include <svx/obj3d.hxx>
-#endif
-
-#ifndef _E3D_SCENE3D_HXX
#include <svx/scene3d.hxx>
-#endif
-
-#ifndef _SFXBRDCST_HXX //autogen
#include <svtools/brdcst.hxx>
-#endif
-
-#ifndef _SVDOEDGE_HXX
#include <svx/svdoedge.hxx>
-#endif
////////////////////////////////////////////////////////////////////////////////////////////////////