INTEGRATION: CWS aw033 (1.53.20); FILE MERGED

2008/07/11 11:46:25 aw 1.53.20.6: RESYNC: (1.57-1.58); FILE MERGED
2008/06/25 13:14:31 aw 1.53.20.5: RESYNC: (1.56-1.57); FILE MERGED
2008/05/14 15:24:06 aw 1.53.20.4: RESYNC: (1.55-1.56); FILE MERGED
2008/03/14 14:46:40 cl 1.53.20.3: RESYNC: (1.54-1.55); FILE MERGED
2008/02/12 11:38:37 aw 1.53.20.2: RESYNC: (1.53-1.54); FILE MERGED
2008/01/22 12:13:49 aw 1.53.20.1: adaptions and 1st stripping

1 files changed, 15 insertions, 49 deletions

diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 5bd68aa93..2963ab78b 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: printfun.cxx,v $
- * $Revision: 1.58 $
+ * $Revision: 1.59 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -597,13 +597,9 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
     if (!bMetaFile && pViewData)
         pDev->SetMapMode(pViewData->GetLogicMode(pViewData->GetActivePart()));
 
-    // #109985#
-    // Use a PaintMode which paints all SDRPAINTMODE_SC_ flags
-    sal_uInt16 nAllPaintMode(0);
-
     // #i72502#
     const Point aMMOffset(aOutputData.PrePrintDrawingLayer(nLogStX, nLogStY));
-    aOutputData.PrintDrawingLayer(SC_LAYER_BACK, nAllPaintMode, aMMOffset);
+    aOutputData.PrintDrawingLayer(SC_LAYER_BACK, aMMOffset);
 
     if (!bMetaFile && pViewData)
         pDev->SetMapMode(aMode);
@@ -658,9 +654,8 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
     }
 
     // #i72502#
-    // USe a paint mode which draws all SDRPAINTMODE_SC_ flags
-    aOutputData.PrintDrawingLayer(SC_LAYER_FRONT, nAllPaintMode, aMMOffset);
-    aOutputData.PrintDrawingLayer(SC_LAYER_INTERN, nAllPaintMode, aMMOffset);
+    aOutputData.PrintDrawingLayer(SC_LAYER_FRONT, aMMOffset);
+    aOutputData.PrintDrawingLayer(SC_LAYER_INTERN, aMMOffset);
     aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768#
 
     // #114135#
@@ -1666,19 +1661,17 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
     // #114135#
     aOutputData.SetDrawView( pDrawView );
 
-    // #109985#
     // test if all paint parts are hidden, then a paint is not necessary at all
-    //if (nObjectFlags)
-    const sal_uInt16 nPaintModeHideAll(SDRPAINTMODE_SC_HIDE_OLE|SDRPAINTMODE_SC_HIDE_CHART|SDRPAINTMODE_SC_HIDE_DRAW);
     const Point aMMOffset(aOutputData.PrePrintDrawingLayer(nLogStX, nLogStY));
+    const bool bHideAllDrawingLayer(pDrawView && pDrawView->getHideOle() && pDrawView->getHideChart() && pDrawView->getHideDraw());
 
-    if(nPaintModeHideAll != (mnPaintMode & nPaintModeHideAll))
+    if(!bHideAllDrawingLayer)
     {
         pDev->SetMapMode(aLogicMode);
         //	hier kein Clipping setzen (Mapmode wird verschoben)
 
         // #i72502#
-        aOutputData.PrintDrawingLayer(SC_LAYER_BACK, mnPaintMode, aMMOffset);
+        aOutputData.PrintDrawingLayer(SC_LAYER_BACK, aMMOffset);
     }
 
     pDev->SetMapMode(aOffsetMode);
@@ -1741,21 +1734,15 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
 
 //	pDev->SetMapMode(aDrawMode);
 
-    // #109985#
     // test if all paint parts are hidden, then a paint is not necessary at all
-    //if (nObjectFlags)
-    if(nPaintModeHideAll != (mnPaintMode & nPaintModeHideAll))
+    if(!bHideAllDrawingLayer)
     {
         // #i72502#
-        aOutputData.PrintDrawingLayer(SC_LAYER_FRONT, mnPaintMode, aMMOffset);
+        aOutputData.PrintDrawingLayer(SC_LAYER_FRONT, aMMOffset);
     }
 
-    // #109985#
-    // Use a PaintMode which paints all SDRPAINTMODE_SC_ flags
-    sal_uInt16 nPaintMode(0);
-
     // #i72502#
-    aOutputData.PrintDrawingLayer(SC_LAYER_INTERN, nPaintMode, aMMOffset);
+    aOutputData.PrintDrawingLayer(SC_LAYER_INTERN, aMMOffset);
     aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768#
 }
 
@@ -2155,35 +2142,14 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
             nY1 = nRepeatEndRow + 1;
     BOOL bDoRepRow = (aAreaParam.bRepeatRow && nY1 > nRepeatEndRow);
 
-    // #109985#
-    mnPaintMode = 0;
-
-    if(!aTableParam.bDrawings)
-    {
-        mnPaintMode |= SDRPAINTMODE_SC_HIDE_DRAW;
-    }
-
-    if(!aTableParam.bObjects)
+    // use new object hide flags in SdrPaintView
+    if(pDrawView)
     {
-        mnPaintMode |= SDRPAINTMODE_SC_HIDE_OLE;
+        pDrawView->setHideOle(!aTableParam.bObjects);
+        pDrawView->setHideChart(!aTableParam.bCharts);
+        pDrawView->setHideDraw(!aTableParam.bDrawings);
     }
 
-    if(!aTableParam.bCharts)
-    {
-        mnPaintMode |= SDRPAINTMODE_SC_HIDE_CHART;
-    }
-
-    /*
-    nObjectFlags = 0;
-    if ( aTableParam.bDrawings )
-        nObjectFlags |= SC_OBJECTS_DRAWING;
-    if ( aTableParam.bObjects )
-        nObjectFlags |= SC_OBJECTS_OLE;
-    if ( aTableParam.bCharts )
-        nObjectFlags |= SC_OBJECTS_CHARTS;
-    */
-
-
     if ( pPrinter && bDoPrint )
         pPrinter->StartPage();