INTEGRATION: CWS aw024 (1.25.198); FILE MERGED

2006/09/22 01:32:00 aw 1.25.198.10: RESYNC: (1.30-1.31); FILE MERGED
2006/09/08 20:10:32 aw 1.25.198.9: RESYNC: (1.29-1.30); FILE MERGED
2006/08/14 17:35:41 aw 1.25.198.8: #i68597# prepare SW for fully buffered Overlay
2006/08/03 17:01:56 aw 1.25.198.7: RESYNC: (1.28-1.29); FILE MERGED
2006/05/12 21:38:51 aw 1.25.198.6: RESYNC: (1.27-1.28); FILE MERGED
2005/09/17 19:47:54 aw 1.25.198.5: RESYNC: (1.26-1.27); FILE MERGED
2005/05/26 11:30:37 aw 1.25.198.4: #i39531#
2005/05/19 12:15:21 aw 1.25.198.3: #i39529#
2005/05/13 15:15:08 aw 1.25.198.2: RESYNC: (1.25-1.26); FILE MERGED
2005/05/12 16:49:34 aw 1.25.198.1: #i39529#

sw/source/core/view/viewimp.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: viewimp.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 22:02:46 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:12:47 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -98,7 +98,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
         if ( pRoot->GetDrawPage()->GetSize() != pRoot->Frm().SSize() )
             pRoot->GetDrawPage()->SetSize( pRoot->Frm().SSize() );
 
-        pSdrPageView = pDrawView->ShowPage( pRoot->GetDrawPage(), Point());
+        pSdrPageView = pDrawView->ShowSdrPage( pRoot->GetDrawPage());
         // OD 26.06.2003 #108784# - notify drawing page view about invisible
         // layers.
         pIDDMA->NotifyInvisibleLayers( *pSdrPageView );
@@ -112,7 +112,6 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
             ( rSz.Width() ? rSz.Width() /Max(short(1),pNewOpt->GetDivisionX()):0,
               rSz.Height()? rSz.Height()/Max(short(1),pNewOpt->GetDivisionY()):0);
      pDrawView->SetGridFine( aFSize );
-     pDrawView->SetSnapGrid( aFSize );
     Fraction aSnGrWdtX(rSz.Width(), pNewOpt->GetDivisionX() + 1);
     Fraction aSnGrWdtY(rSz.Height(), pNewOpt->GetDivisionY() + 1);
     pDrawView->SetSnapGridWidth( aSnGrWdtX, aSnGrWdtY );
@@ -162,7 +161,8 @@ SwViewImp::SwViewImp( ViewShell *pParent ) :
     pAccMap( 0 ),
     pSdrObjCached(NULL)
 {
-    bResetXorVisibility = bShowHdlPaint =
+    //bResetXorVisibility =
+    bShowHdlPaint =
     bResetHdlHiddenPaint = bScrolled =
     bPaintInScroll = bSmoothUpdate = bStopSmooth = bStopPrt = FALSE;
     bFirstPageInvalid = bScroll = bNextScroll = TRUE;
@@ -188,9 +188,9 @@ SwViewImp::~SwViewImp()
     // OD 12.12.2002 #103492#
     delete mpPgPrevwLayout;
 
-    //JP 29.03.96: nach ShowPage muss auch HidePage gemacht werden!!!
+    //JP 29.03.96: nach ShowSdrPage muss auch HideSdrPage gemacht werden!!!
     if( pDrawView )
-         pDrawView->HidePage( pSdrPageView );
+         pDrawView->HideSdrPage();
 
     delete pDrawView;
 
@@ -343,9 +343,21 @@ void SwViewImp::MakeDrawView()
                                         GetShell()->GetWin() :
                                         (OutputDevice*)GetShell()->getIDocumentDeviceAccess()->getPrinter( false ) );
         }
+
         GetDrawView()->SetActiveLayer( XubString::CreateFromAscii(
                             RTL_CONSTASCII_STRINGPARAM( "Heaven" ) ) );
         Init( GetShell()->GetViewOptions() );
+
+        // #i68597# Init overlay buffer when destination is a window. This is necessary as long
+        // as DrawingLayer is created on demand to start fully buffered overlay correctly.
+        if(pDrawView && GetShell() && GetShell()->GetWin())
+        {
+            const Rectangle aRectLogic(Point(), GetShell()->GetWin()->PixelToLogic(GetShell()->GetWin()->GetOutputSizePixel()));
+            const Region aRegionLogic(aRectLogic);
+            ViewShell &rSh = *GetShell();
+            rSh.DLPreOutsidePaint(aRegionLogic);
+            rSh.DLPostOutsidePaint(aRegionLogic);
+        }
     }
 }