INTEGRATION: CWS aw013 (1.3.70); FILE MERGED

2004/06/15 16:25:21 aw 1.3.70.2: #117095#
2004/06/11 16:14:44 aw 1.3.70.1: #114389#, #114394#
This commit is contained in:
Rüdiger Timm 2004-07-12 14:11:39 +00:00
parent d63fc530af
commit f1aeb5a8c8

View file

@ -2,9 +2,9 @@
*
* $RCSfile: drawview.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-03-30 15:52:06 $
* last change: $Author: rt $ $Date: 2004-07-12 15:11:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -81,8 +81,7 @@ class FuSlideShow;
|*
\************************************************************************/
class DrawView
: public ::sd::View
class DrawView : public ::sd::View
{
public:
TYPEINFO();
@ -94,7 +93,7 @@ public:
virtual ~DrawView (void);
virtual void MarkListHasChanged();
void InitRedraw(OutputDevice* pOutDev, const Region& rReg, const Link* pPaintProc=NULL );
void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, ::sdr::contact::ViewObjectContactRedirector* pRedirector = 0L);
virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE);
@ -117,7 +116,6 @@ public:
virtual void HidePage(SdrPageView* pPV);
void PresPaint(const Region& rRegion);
DECL_LINK(PaintProc, SdrPaintProcRec*);
void SetAnimationMode(BOOL bStart);
void HideAndAnimateObject(SdrObject* pObj);
@ -131,6 +129,8 @@ protected:
virtual void ModelHasChanged();
private:
friend class DrawViewRedirector;
DrawDocShell* pDocShell;
DrawViewShell* pDrawViewShell;
VirtualDevice* pVDev;