From fa0f8e1463cbad136cac6202726ccfbcc39fea49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Thu, 10 Apr 2008 19:24:13 +0000
Subject: [PATCH] INTEGRATION: CWS changefileheader (1.5.106); FILE MERGED
 2008/04/01 15:49:38 thb 1.5.106.3: #i85898# Stripping all external header
 guards 2008/04/01 12:46:56 thb 1.5.106.2: #i85898# Stripping all external
 header guards 2008/03/31 14:18:18 rt 1.5.106.1: #i87441# Change license
 header to LPGL v3.

---
 svx/inc/svx/svdpage.hxx | 67 +++++++++++------------------------------
 1 file changed, 18 insertions(+), 49 deletions(-)

diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 1e01dce8d075..6bb4f12ea638 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -1,44 +1,37 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: svdpage.hxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: vg $ $Date: 2008-02-12 16:35:31 $
+ * $RCSfile: svdpage.hxx,v $
+ * $Revision: 1.6 $
  *
- *  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.
  *
  ************************************************************************/
 
 #ifndef _SVDPAGE_HXX
 #define _SVDPAGE_HXX
 
-#ifndef _SV_BITMAP_HXX
 #include <vcl/bitmap.hxx>
-#endif
 
 #ifndef _PRINT_HXX //autogen
 #include <vcl/print.hxx>
@@ -46,47 +39,23 @@
 #ifndef _GDIMTF_HXX //autogen
 #include <vcl/gdimtf.hxx>
 #endif
-
-#ifndef _TOOLS_WEAKBASE_HXX_
 #include <tools/weakbase.hxx>
-#endif
-
-#ifndef _CPPUHELPER_WEAKREF_HXX_
 #include <cppuhelper/weakref.hxx>
-#endif
-
-#ifndef _SVDTYPES_HXX
 #include <svx/svdtypes.hxx>
-#endif
-#ifndef _SVDLAYER_HXX
 #include <svx/svdlayer.hxx>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // sdr::Comment interface
-#ifndef _SDR_COMMENT_HXX
 #include <svx/sdrcomment.hxx>
-#endif
 
 // #111111#
 #include <vector>
-
-#ifndef _SDR_PAGEUSER_HXX
 #include <svx/sdrpageuser.hxx>
-#endif
 
 // StandardCheckVisisbilityRedirector
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
 #include <svx/sdr/contact/viewobjectcontactredirector.hxx>
-#endif
-
-#ifndef _SDR_MASTERPAGEDESCRIPTOR_HXX
 #include <svx/sdrmasterpagedescriptor.hxx>
-#endif
-
-#ifndef INCLUDED_SVXDLLAPI_H
 #include "svx/svxdllapi.h"
-#endif
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <svx/svdobj.hxx>