From 475e205e8bddab9e2750d98a64e088b30d7e19cf Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 20 Jan 2004 10:21:27 +0000
Subject: INTEGRATION: CWS impress1 (1.1.1.1.262); FILE MERGED 2003/09/17
 09:02:40 af 1.1.1.1.262.1: #111996# Transition to stacked sub-shells.
 Introduction of namespace sd.

---
 sd/source/ui/func/futransf.cxx | 20 ++++++++++++++------
 sd/source/ui/func/futxtatt.cxx | 28 ++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'sd/source/ui')

diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 761bd60690c3..0e030347c715 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: futransf.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: obo $ $Date: 2004-01-20 11:20:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,6 +61,8 @@
 
 #pragma hdrstop
 
+#include "futransf.hxx"
+
 #include <svx/dialogs.hrc>
 #include <svx/labdlg.hxx>
 #include <svx/polysc3d.hxx>
@@ -76,12 +78,17 @@
 #endif
 
 #include "strings.hrc"
-#include "viewshel.hxx"
-#include "sdview.hxx"
+#ifndef SD_VIEW_SHELL_HXX
+#include "ViewShell.hxx"
+#endif
+#ifndef SD_VIEW_HXX
+#include "View.hxx"
+#endif
 #include "sdresid.hxx"
-#include "futransf.hxx"
 #include "drawdoc.hxx"
 
+namespace sd {
+
 TYPEINIT1( FuTransform, FuPoor );
 
 /*************************************************************************
@@ -90,7 +97,7 @@ TYPEINIT1( FuTransform, FuPoor );
 |*
 \************************************************************************/
 
-FuTransform::FuTransform(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
+FuTransform::FuTransform(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
                          SdDrawDocument* pDoc, SfxRequest& rReq)
     : FuPoor(pViewSh, pWin, pView, pDoc, rReq)
 {
@@ -244,3 +251,4 @@ Point FuTransform::GetPoint( Rectangle aRect, RECT_POINT eRP )
 }
 
 
+} // end of namespace sd
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index f8bcfa1f5842..c14a61626c7b 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: futxtatt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: obo $ $Date: 2004-01-20 11:21:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,6 +61,8 @@
 
 #pragma hdrstop
 
+#include "futxtatt.hxx"
+
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
@@ -71,11 +73,16 @@
 #include <svx/textattr.hxx>
 #include <svx/textanim.hxx>
 
-#include "sdview.hxx"
-#include "viewshel.hxx"
-#include "futxtatt.hxx"
+#ifndef SD_VIEW_HXX
+#include "View.hxx"
+#endif
+#ifndef SD_VIEW_SHELL_HXX
+#include "ViewShell.hxx"
+#endif
 #include "drawdoc.hxx"
 
+namespace sd {
+
 TYPEINIT1( FuTextAttrDlg, FuPoor );
 
 /*************************************************************************
@@ -84,9 +91,13 @@ TYPEINIT1( FuTextAttrDlg, FuPoor );
 |*
 \************************************************************************/
 
-FuTextAttrDlg::FuTextAttrDlg(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
-                    SdDrawDocument* pDoc, SfxRequest& rReq)
-       : FuPoor(pViewSh, pWin, pView, pDoc, rReq)
+FuTextAttrDlg::FuTextAttrDlg (
+    ViewShell* pViewSh,
+    ::sd::Window* pWin,
+    ::sd::View* pView,
+    SdDrawDocument* pDoc,
+    SfxRequest& rReq)
+    : FuPoor(pViewSh, pWin, pView, pDoc, rReq)
 {
     SfxItemSet aNewAttr( pDoc->GetPool() );
     pView->GetAttributes( aNewAttr );
@@ -122,3 +133,4 @@ FuTextAttrDlg::FuTextAttrDlg(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView
 }
 
 
+} // end of namespace sd
-- 
cgit