From efc57cfdab35fdb273cdee1b4fedec227b67370e Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Mon, 22 Jan 2007 14:10:09 +0000
Subject: INTEGRATION: CWS aw039 (1.51.34); FILE MERGED 2007/01/05 15:47:22 aw
 1.51.34.2: #i72754# new methods for Begin/EndDLPaint and members for handling
 added 2006/12/22 15:04:46 aw 1.51.34.1: #i72809# possible fix for wrongly
 initialized DrawingLayer views

---
 sw/inc/viewsh.hxx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 34d50e737f07..4614ca5f523b 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: viewsh.hxx,v $
  *
- *  $Revision: 1.51 $
+ *  $Revision: 1.52 $
  *
- *  last change: $Author: ihi $ $Date: 2006-11-14 15:07:32 $
+ *  last change: $Author: obo $ $Date: 2007-01-22 15:10:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -246,11 +246,15 @@ public:
 
     void InvalidateWindows( const SwRect &rRect );
 
-    // #i68597# paint pre- and post-processing
-    void DLPrePaint(const Region& rRegion);
-    void DLPostPaint(const Region& rRegion);
-    void DLPreOutsidePaint(const Region& rRegion);
-    void DLPostOutsidePaint(const Region& rRegion);
+    //////////////////////////////////////////////////////////////////////////////
+    // #i72754# set of Pre/PostPaints with lock counter and initial target OutDev
+protected:
+    sal_uInt32              mnPrePostPaintCount;
+    OutputDevice*           mpPrePostOutDev;
+public:
+    void DLPrePaint2(const Region& rRegion);
+    void DLPostPaint2();
+    //////////////////////////////////////////////////////////////////////////////
 
     virtual void Paint(const Rectangle &rRect);
     sal_Bool IsPaintInProgress() const { return bPaintInProgress; }
-- 
cgit