INTEGRATION: CWS impress1 (1.1.1.1.262); FILE MERGED

2003/09/16 13:36:04 af 1.1.1.1.262.1: #111996# Introduction of namespace sd. Use of sub-shells.

1 files changed, 22 insertions, 16 deletions

diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx
index f91a9f52a79b..70e2bf077ec8 100644
--- a/sd/source/ui/inc/fuprobjs.hxx
+++ b/sd/source/ui/inc/fuprobjs.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuprobjs.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:39 $
+ *  last change: $Author: obo $ $Date: 2004-01-20 12:09:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,33 +59,39 @@
  *
  ************************************************************************/
 
-#ifndef _SD_FUPROBJS_HXX
-#define _SD_FUPROBJS_HXX
+#ifndef SD_FU_PRESENTATION_OBJECTS_HXX
+#define SD_FU_PRESENTATION_OBJECTS_HXX
 
-#ifndef _SD_FUPOOR_HXX
+#ifndef SD_FU_POOR_HXX
 #include "fupoor.hxx"
 #endif
 
-class SdView;
-class SdViewShell;
-class SdWindow;
 class SdDrawDocument;
 class SfxRequest;
 
+namespace sd {
+
+class View;
+class ViewShell;
+class Window;
 
-class FuPresentationObjects : public FuPoor
-{
 
+class FuPresentationObjects
+    : public FuPoor
+{
 public:
     TYPEINFO();
 
-    FuPresentationObjects(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
-                            SdDrawDocument* pDoc, SfxRequest& rReq);
-    virtual ~FuPresentationObjects();
-
+    FuPresentationObjects (
+        ViewShell* pViewSh,
+        ::sd::Window* pWin,
+        ::sd::View* pView,
+        SdDrawDocument* pDoc,
+        SfxRequest& rReq);
+    virtual ~FuPresentationObjects (void);
 };
 
+} // end of namespace sd
 
-
-#endif      // _SD_FUPROBJS_HXX
+#endif