From eb4130994669cd228a92ee4c4348d7d28250e9f8 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 20 Jan 2004 10:55:36 +0000
Subject: [PATCH] INTEGRATION: CWS impress1 (1.1.1.1.262); FILE MERGED
 2003/09/16 13:35:48 af 1.1.1.1.262.1: #111996# Introduction of namespace sd.
 Use of sub-shells.

---
 sd/source/ui/inc/fuarea.hxx   | 33 ++++++++++++++++++++-------------
 sd/source/ui/inc/fubullet.hxx | 31 ++++++++++++++++++++-----------
 sd/source/ui/inc/fuchar.hxx   | 31 ++++++++++++++++++++-----------
 3 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx
index 08248027bee4..fed955ab7068 100644
--- a/sd/source/ui/inc/fuarea.hxx
+++ b/sd/source/ui/inc/fuarea.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuarea.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:38 $
+ *  last change: $Author: obo $ $Date: 2004-01-20 11:54:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,27 +59,34 @@
  *
  ************************************************************************/
 
+#ifndef SD_FU_AREA_HXX
+#define SD_FU_AREA_HXX
 
-#ifndef _SD_FUAREA_HXX
-#define _SD_FUAREA_HXX
-
-#ifndef _SD_FUPOOR_HXX
+#ifndef SD_FU_POOR_HXX
 #include "fupoor.hxx"
 #endif
 
-class FuArea : public FuPoor
+namespace sd {
+
+class FuArea
+    : public FuPoor
 {
- public:
+public:
     TYPEINFO();
 
-    FuArea(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
-           SdDrawDocument* pDoc, SfxRequest& rReq);
-
-    virtual ~FuArea() {}
+    FuArea (
+        ViewShell* pViewSh,
+        ::sd::Window* pWin,
+        ::sd::View* pView,
+        SdDrawDocument* pDoc,
+        SfxRequest& rReq);
+    virtual ~FuArea (void) {}
 
     virtual void Activate() {}
     virtual void Deactivate() {}
 };
 
-#endif      // _SD_FUAREA_HXX
+} // end of namespace sd
+
+#endif
 
diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx
index 2c1101aba303..cc5f412dc39c 100644
--- a/sd/source/ui/inc/fubullet.hxx
+++ b/sd/source/ui/inc/fubullet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fubullet.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:38 $
+ *  last change: $Author: obo $ $Date: 2004-01-20 11:55:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,22 +59,31 @@
  *
  ************************************************************************/
 
-#ifndef _SD_FUBULLET_HXX
-#define _SD_FUBULLET_HXX
+#ifndef SD_FU_BULLET_HXX
+#define SD_FU_BULLET_HXX
 
-#ifndef _SD_FUPOOR_HXX
+#ifndef SD_FU_POOR_HXX
 #include "fupoor.hxx"
 #endif
 
-class FuBullet : public FuPoor
+namespace sd {
+
+class FuBullet
+    : public FuPoor
 {
- public:
+public:
     TYPEINFO();
 
-    FuBullet( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
-            SdDrawDocument* pDoc, SfxRequest& rReq);
-    virtual ~FuBullet() {}
+    FuBullet (
+        ViewShell* pViewSh,
+        ::sd::Window* pWin,
+        ::sd::View* pView,
+        SdDrawDocument* pDoc,
+        SfxRequest& rReq);
+    virtual ~FuBullet (void) {}
 };
 
-#endif      // _SD_FUBULLET_HXX
+} // end of namespace sd
+
+#endif
 
diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx
index 4b9f64d395d8..da6719d57d16 100644
--- a/sd/source/ui/inc/fuchar.hxx
+++ b/sd/source/ui/inc/fuchar.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuchar.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:38 $
+ *  last change: $Author: obo $ $Date: 2004-01-20 11:55:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,25 +59,34 @@
  *
  ************************************************************************/
 
-#ifndef _SD_FUCHAR_HXX
-#define _SD_FUCHAR_HXX
+#ifndef SD_FU_CHAR_HXX
+#define SD_FU_CHAR_HXX
 
-#ifndef _SD_FUPOOR_HXX
+#ifndef SD_FU_POOR_HXX
 #include "fupoor.hxx"
 #endif
 
-class FuChar : public FuPoor
+namespace sd {
+
+class FuChar
+    : public FuPoor
 {
- public:
+public:
     TYPEINFO();
 
-    FuChar(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
-            SdDrawDocument* pDoc, SfxRequest& rReq);
-    ~FuChar() {}
+    FuChar (
+        ViewShell* pViewSh,
+        ::sd::Window* pWin,
+        ::sd::View* pView,
+        SdDrawDocument* pDoc,
+        SfxRequest& rReq);
+    virtual ~FuChar (void) {}
 
     virtual void Activate() {}         // Function aktivieren
     virtual void Deactivate() {}           // Function deaktivieren
 };
 
-#endif // _SD_FUCHAR_HXX
+} // end of namespace sd
+
+#endif