INTEGRATION: CWS impressfunctions (1.4.40); FILE MERGED

2005/10/28 10:56:40 cl 1.4.40.1: #125341# reworked FuPoor classes to use refcounting

3 files changed, 35 insertions, 27 deletions

diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx
index 63ce08632..0f8b3f39e 100644
--- a/sd/source/ui/inc/fucon3d.hxx
+++ b/sd/source/ui/inc/fucon3d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fucon3d.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 05:30:17 $
+ *  last change: $Author: rt $ $Date: 2005-12-14 17:08:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,13 +53,8 @@ class FuConstruct3dObject
 public:
     TYPEINFO();
 
-    FuConstruct3dObject (
-        ViewShell* pViewSh, 
-        ::sd::Window* pWin,
-        ::sd::View* pView, 
-        SdDrawDocument* pDoc,
-        SfxRequest& rReq);
-    virtual ~FuConstruct3dObject (void);
+    static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
+    virtual void DoExecute( SfxRequest& rReq );
 
     // Mouse- & Key-Events
     virtual BOOL KeyInput(const KeyEvent& rKEvt);
@@ -74,6 +69,13 @@ public:
     virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
 
 private:
+    FuConstruct3dObject (
+        ViewShell* pViewSh, 
+        ::sd::Window* pWin,
+        ::sd::View* pView, 
+        SdDrawDocument* pDoc,
+        SfxRequest& rReq);
+
     // #97016#
     void ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene);
     E3dCompoundObject* ImpCreateBasic3DShape();
diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx
index 084e5efaf..9158dc97c 100644
--- a/sd/source/ui/inc/fuconarc.hxx
+++ b/sd/source/ui/inc/fuconarc.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fuconarc.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 05:30:31 $
+ *  last change: $Author: rt $ $Date: 2005-12-14 17:08:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -49,13 +49,8 @@ class FuConstructArc
 public:
     TYPEINFO();
 
-    FuConstructArc (
-        ViewShell* pViewSh, 
-        ::sd::Window* pWin,
-        ::sd::View* pView, 
-        SdDrawDocument* pDoc,
-        SfxRequest& rReq);
-    virtual ~FuConstructArc (void);
+    static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
+    virtual void DoExecute( SfxRequest& rReq );
 
     // Mouse- & Key-Events
     virtual BOOL KeyInput(const KeyEvent& rKEvt);
@@ -68,6 +63,15 @@ public:
 
     // #97016#
     virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
+
+protected:
+    FuConstructArc (
+        ViewShell* pViewSh, 
+        ::sd::Window* pWin,
+        ::sd::View* pView, 
+        SdDrawDocument* pDoc,
+        SfxRequest& rReq);
+
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 9609c868e..ac98b32b9 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fuconbez.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 05:30:45 $
+ *  last change: $Author: rt $ $Date: 2005-12-14 17:08:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,13 +55,8 @@ class FuConstructBezierPolygon
 public:
     TYPEINFO();
 
-    FuConstructBezierPolygon (
-        ViewShell* pViewSh, 
-        ::sd::Window* pWin, 
-        ::sd::View* pView,
-        SdDrawDocument* pDoc, 
-        SfxRequest& rReq);
-    virtual ~FuConstructBezierPolygon (void);
+    static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
+    virtual void DoExecute( SfxRequest& rReq );
 
     // Mouse- & Key-Events
     virtual BOOL KeyInput(const KeyEvent& rKEvt);
@@ -81,6 +76,13 @@ public:
     virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
 
 protected:
+    FuConstructBezierPolygon (
+        ViewShell* pViewSh, 
+        ::sd::Window* pWin, 
+        ::sd::View* pView,
+        SdDrawDocument* pDoc, 
+        SfxRequest& rReq);
+
     USHORT      nEditMode;
 };