diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:21:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:21:03 +0000 |
| commit | 2573e503fee96e23a04113e56f94b19c67af422d (patch) | |
| tree | f5e284fc2438738741bee3738230712b79538597 /sd/source/ui/view/drawview.cxx | |
| parent | eec9f89050ab3bf83638774cdc5001b86c7c3b9d (diff) | |
INTEGRATION: CWS aw033 (1.45.28); FILE MERGED
2008/07/10 12:56:28 aw 1.45.28.6: #i39532# XOutputDevice removed, PrepareDelete removed
2008/06/25 13:04:51 aw 1.45.28.5: RESYNC: (1.50-1.51); FILE MERGED
2008/05/14 14:52:22 aw 1.45.28.4: RESYNC: (1.47-1.50); FILE MERGED
2008/03/14 14:02:48 cl 1.45.28.3: RESYNC: (1.45-1.47); FILE MERGED
2008/01/29 10:34:22 aw 1.45.28.2: updated refresh for ActionChanged(), diverse removals
2008/01/22 12:16:42 aw 1.45.28.1: adaptions and 1st stripping
Diffstat (limited to 'sd/source/ui/view/drawview.cxx')
| -rw-r--r-- | sd/source/ui/view/drawview.cxx | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index ffc4c7c07f92..a3b38e391583 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drawview.cxx,v $ - * $Revision: 1.51 $ + * $Revision: 1.52 $ * * This file is part of OpenOffice.org. * @@ -44,7 +44,6 @@ #ifndef _SVXIDS_HRC //autogen #include <svx/svxids.hrc> #endif -#include <svx/xoutx.hxx> #include <svx/svdotext.hxx> #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> @@ -495,7 +494,7 @@ BOOL DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAtt |* \************************************************************************/ -void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, USHORT nPaintMode, ::sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) +void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) { if( mpVDev ) { @@ -523,49 +522,12 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, USHORT if(bStandardPaint) { - ::sd::View::CompleteRedraw(pOutDev, rReg, nPaintMode, pRedirector); + ::sd::View::CompleteRedraw(pOutDev, rReg, pRedirector); } } /************************************************************************* |* -|* Paint-Proc filtert fuer die Praesentation Objekte heraus, die unsichtbar -|* sind oder anders dargestellt werden muessen. -|* -\************************************************************************/ - -class DrawViewRedirector : public ::sdr::contact::ViewObjectContactRedirector -{ - DrawView& mrDrawView; - -public: - DrawViewRedirector(DrawView& rDrawView); - virtual ~DrawViewRedirector(); - - // all default implementations just call the same methods at the original. To do something - // different, overload the method and at least do what the method does. - virtual void PaintObject(::sdr::contact::ViewObjectContact& rOriginal, ::sdr::contact::DisplayInfo& rDisplayInfo); -}; - -DrawViewRedirector::DrawViewRedirector(DrawView& rDrawView) -: mrDrawView(rDrawView) -{ -} - -DrawViewRedirector::~DrawViewRedirector() -{ -} - -// all default implementations just call the same methods at the original. To do something -// different, overload the method and at least do what the method does. -void DrawViewRedirector::PaintObject(::sdr::contact::ViewObjectContact& rOriginal, ::sdr::contact::DisplayInfo& rDisplayInfo) -{ - // not an object, maybe a page - rOriginal.PaintObject(rDisplayInfo); -} - -/************************************************************************* -|* |* Paint-Event during running slide show |* \************************************************************************/ |