From d44a043fb34fbf2bfe2aec109abfda9ecf6dbd65 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Tue, 26 Jun 2007 11:01:15 +0000
Subject: INTEGRATION: CWS aw046 (1.2.38); FILE MERGED 2007/05/21 10:31:51 fs
1.2.38.3: #i74769# +FindPatchedPageWindow 2007/05/08 15:44:41 aw 1.2.38.2:
#i74769# 2007/04/24 11:11:50 aw 1.2.38.1: adaptions after resync
---
svx/inc/svx/svdpagv.hxx | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
(limited to 'svx')
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 941ca1785c5a..53a838acc7bb 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: svdpagv.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: vg $ $Date: 2007-04-11 16:26:48 $
+ * last change: $Author: hr $ $Date: 2007-06-26 12:01:15 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -150,6 +150,14 @@ public:
SdrPageWindow* FindPageWindow( const OutputDevice& rOutDev ) const;
SdrPageWindow* GetPageWindow(sal_uInt32 nIndex) const;
+ /** finds the page window whose PaintWindow belongs to the given output device
+
+ In opposite to FindPageWindow, this method also cares possibly patched PaintWindow instances.
+ That is, a SdrPageWindow might have an original, and a patched SdrPaintWindow instance - if
+ this is the case, then the original SdrPaintWindow is examined before the patched one.
+ */
+ const SdrPageWindow* FindPatchedPageWindow( const OutputDevice& rOutDev ) const;
+
void PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) const;
private:
SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow);
@@ -212,8 +220,10 @@ public:
void CompleteRedraw(
SdrPaintWindow& rPaintWindow, const Region& rReg, sal_uInt16 nPaintMode,
::sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
- void BeginDrawLayer(OutputDevice* pGivenTarget, const Region& rReg, sal_Bool bPrepareBuffered);
- void EndDrawLayer(OutputDevice* pGivenTarget);
+
+ // write access to mpPreparedPageWindow
+ void setPreparedPageWindow(SdrPageWindow* pKnownTarget);
+
void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget = 0L, sal_uInt16 nPaintMode = 0, ::sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
void DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor = Color( COL_BLACK ) );
@@ -329,9 +339,6 @@ public:
{
return mpDisplayInfo;
}
-
- // find out if form controls are used by this PageView
- sal_Bool AreFormControlsUsed(SdrPaintWindow& rPaintWindow) const;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
--
cgit