strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress1 (1.2.226); FILE MERGED

Browse source 
2003/09/16 13:35:49 af 1.2.226.1: #111996# Introduction of namespace sd. Use of sub-shells.
This commit is contained in:
Oliver Bolte 2004-01-20 10:56:24 +00:00
parent eb41309946
commit 99162e8adf
2 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
sd/source/ui/inc/fucon3d.hxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: fucon3d.hxx,v $ * $RCSfile: fucon3d.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: aw $ $Date: 2002-02-15 17:02:42 $ * last change: $Author: obo $ $Date: 2004-01-20 11:56:02 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -59,35 +59,35 @@
* *
************************************************************************/ ************************************************************************/
#ifndef _SD_FUCON3D_HXX #ifndef SD_FU_CONSTRUCT_3D_OBJECT_HXX
#define _SD_FUCON3D_HXX #define SD_FU_CONSTRUCT_3D_OBJECT_HXX
#ifndef _SD_FUCONSTR_HXX #ifndef SD_FU_CONSTRUCT_HXX
#include "fuconstr.hxx" #include "fuconstr.hxx"
#endif #endif
class E3dCompoundObject;
class E3dScene;
class SdDrawDocument;
class SfxRequest;
/************************************************************************* namespace sd {
|*
|* Rechteck zeichnen
|*
\************************************************************************/
class FuConst3dObj : public FuConstruct class FuConstruct3dObject
: public FuConstruct
{ {
// #97016# public:
void ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene);
E3dCompoundObject* ImpCreateBasic3DShape();
public:
TYPEINFO(); TYPEINFO();
FuConst3dObj(SdViewShell* pViewSh, SdWindow* pWin, FuConstruct3dObject (
SdView* pView, SdDrawDocument* pDoc, ViewShell* pViewSh,
SfxRequest& rReq); ::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SfxRequest& rReq);
virtual ~FuConstruct3dObject (void);
virtual ~FuConst3dObj(); // Mouse- & Key-Events
// Mouse- & Key-Events
virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL KeyInput(const KeyEvent& rKEvt);
virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt);
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
@ -98,9 +98,14 @@ class FuConst3dObj : public FuConstruct
// #97016# // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
private:
// #97016#
void ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene);
E3dCompoundObject* ImpCreateBasic3DShape();
}; };
} // end of namespace sd
#endif
#endif // _SD_FUCON3D_HXX

38
sd/source/ui/inc/fuconarc.hxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: fuconarc.hxx,v $ * $RCSfile: fuconarc.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: aw $ $Date: 2002-02-15 17:02:42 $ * last change: $Author: obo $ $Date: 2004-01-20 11:56:24 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -59,31 +59,31 @@
* *
************************************************************************/ ************************************************************************/
#ifndef _SD_FUCONARC_HXX #ifndef SD_FU_CONSTRUCT_ARC_HXX
#define _SD_FUCONARC_HXX #define SD_FU_CONSTRUCT_ARC_HXX
#ifndef _SD_FUCONSTR_HXX #ifndef SD_FU_CONSTRUCT_HXX
#include "fuconstr.hxx" #include "fuconstr.hxx"
#endif #endif
namespace sd {
/*************************************************************************
|*
|* Rechteck zeichnen
|*
\************************************************************************/
class FuConstArc : public FuConstruct class FuConstructArc
: public FuConstruct
{ {
public: public:
TYPEINFO(); TYPEINFO();
FuConstArc( SdViewShell* pViewSh, SdWindow* pWin, FuConstructArc (
SdView* pView, SdDrawDocument* pDoc, ViewShell* pViewSh,
SfxRequest& rReq); ::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SfxRequest& rReq);
virtual ~FuConstructArc (void);
virtual ~FuConstArc(); // Mouse- & Key-Events
// Mouse- & Key-Events
virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL KeyInput(const KeyEvent& rKEvt);
virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt);
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
@ -96,7 +96,7 @@ class FuConstArc : public FuConstruct
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
}; };
} // end of namespace sd
#endif
#endif // _SD_FUCONARC_HXX