diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
| commit | dd19343634909cc3ee030087f1d0e84731853d68 (patch) | |
| tree | 4baf8405ad2df703a69c028dfe672428c76b4547 /sw/source/core/view/vdraw.cxx | |
| parent | 35933081fda3551db61a81c9af5ac393fb5fc80e (diff) | |
| parent | fdde737ea0caf7450a6676f46651f78ee05321ab (diff) | |
merge DEV300_m70
Diffstat (limited to 'sw/source/core/view/vdraw.cxx')
| -rw-r--r-- | sw/source/core/view/vdraw.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 2e25913611a8..55d929497837 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -45,7 +45,7 @@ /// include <svx/svdoutl.hxx> #include <svx/svdoutl.hxx> -#ifndef PRODUCT +#ifdef DBG_UTIL #include <svx/fmglob.hxx> #endif @@ -55,6 +55,7 @@ #include "viewimp.hxx" #include "dflyobj.hxx" #include "viewopt.hxx" +#include "swprtopt.hxx" #include "dcontact.hxx" #include "dview.hxx" #include "flyfrm.hxx" @@ -181,6 +182,7 @@ void SwViewImp::UnlockPaint() // outliner of the draw view for painting layers <hell> and <heaven>. // OD 25.06.2003 #108784# - correct type of 1st parameter void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, + const SwPrtOptions * _pPrintData, const SwRect& , const Color* _pPageBackgrdColor, const bool _bIsPageRightToLeft ) const @@ -227,6 +229,12 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, } pOutDev->Push( PUSH_LINECOLOR ); // #114231# + if (_pPrintData) + { + // hide drawings but not form controls (form controls are handled elsewhere) + SdrView &rSdrView = const_cast< SdrView & >(GetPageView()->GetView()); + rSdrView.setHideDraw( !_pPrintData->IsPrintDraw() ); + } GetPageView()->DrawLayer(_nLayerID, pOutDev); pOutDev->Pop(); |