1 files changed, 15 insertions, 15 deletions

diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index a1e2d450f0..309a9448fe 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -51,7 +51,7 @@
 #include "viewimp.hxx"
 #include "dflyobj.hxx"
 #include "viewopt.hxx"
-#include "swprtopt.hxx"
+#include "printdata.hxx"
 #include "dcontact.hxx"
 #include "dview.hxx"
 #include "flyfrm.hxx"
@@ -89,7 +89,7 @@ void SwViewImp::LockPaint()
     }
     else
     {
-        bResetHdlHiddenPaint = FALSE;
+        bResetHdlHiddenPaint = sal_False;
     }
 }
 
@@ -100,7 +100,7 @@ void SwViewImp::UnlockPaint()
 }
 
 void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
-                            const SwPrtOptions * _pPrintData,
+                            SwPrintData const*const pPrintData,
                             const SwRect& ,
                             const Color* _pPageBackgrdColor,
                             const bool _bIsPageRightToLeft ) const
@@ -109,7 +109,7 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
     {
         //change the draw mode in high contrast mode
         OutputDevice* pOutDev = GetShell()->GetOut();
-        ULONG nOldDrawMode = pOutDev->GetDrawMode();
+        sal_uLong nOldDrawMode = pOutDev->GetDrawMode();
         if( GetShell()->GetWin() &&
             Application::GetSettings().GetStyleSettings().GetHighContrastMode() &&
             (!GetShell()->IsPreView()||SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews()))
@@ -144,11 +144,11 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
         }
 
         pOutDev->Push( PUSH_LINECOLOR ); // #114231#
-        if (_pPrintData)
+        if (pPrintData)
         {
             // hide drawings but not form controls (form controls are handled elsewhere)
             SdrView &rSdrView = const_cast< SdrView & >(GetPageView()->GetView());
-            rSdrView.setHideDraw( !_pPrintData->IsPrintDraw() );
+            rSdrView.setHideDraw( !pPrintData->IsPrintDraw() );
         }
         GetPageView()->DrawLayer(_nLayerID, pOutDev);
         pOutDev->Pop();
@@ -168,23 +168,23 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
 
 #define WIEDUWILLST 400
 
-BOOL SwViewImp::IsDragPossible( const Point &rPoint )
+sal_Bool SwViewImp::IsDragPossible( const Point &rPoint )
 {
     if ( !HasDrawView() )
-        return FALSE;
+        return sal_False;
 
     const SdrMarkList &rMrkList = GetDrawView()->GetMarkedObjectList();
 
     if( !rMrkList.GetMarkCount() )
-        return FALSE;
+        return sal_False;
 
     SdrObject *pO = rMrkList.GetMark(rMrkList.GetMarkCount()-1)->GetMarkedSdrObj();
 
     SwRect aRect;
-    if( ::CalcClipRect( pO, aRect, FALSE ) )
+    if( ::CalcClipRect( pO, aRect, sal_False ) )
     {
         SwRect aTmp;
-        ::CalcClipRect( pO, aTmp, TRUE );
+        ::CalcClipRect( pO, aTmp, sal_True );
         aRect.Union( aTmp );
     }
     else
@@ -207,11 +207,11 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
 
     const Rectangle aRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz );
     const Rectangle &rOldWork = GetDrawView()->GetWorkArea();
-    BOOL bCheckDrawObjs = FALSE;
+    sal_Bool bCheckDrawObjs = sal_False;
     if ( aRect != rOldWork )
     {
         if ( rOldWork.Bottom() > aRect.Bottom() || rOldWork.Right() > aRect.Right())
-            bCheckDrawObjs = TRUE;
+            bCheckDrawObjs = sal_True;
         GetDrawView()->SetWorkArea( aRect );
     }
     if ( !bCheckDrawObjs )
@@ -219,8 +219,8 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
 
     OSL_ENSURE( pSh->getIDocumentDrawModelAccess()->GetDrawModel(), "NotifySizeChg without DrawModel" );
     SdrPage* pPage = pSh->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 );
-    const ULONG nObjs = pPage->GetObjCount();
-    for( ULONG nObj = 0; nObj < nObjs; ++nObj )
+    const sal_uLong nObjs = pPage->GetObjCount();
+    for( sal_uLong nObj = 0; nObj < nObjs; ++nObj )
     {
         SdrObject *pObj = pPage->GetObj( nObj );
         if( !pObj->ISA(SwVirtFlyDrawObj) )