diff options
| author | Kai Ahrens <ka@openoffice.org> | 2001-08-17 11:00:07 +0000 |
|---|---|---|
| committer | Kai Ahrens <ka@openoffice.org> | 2001-08-17 11:00:07 +0000 |
| commit | 73824204fe648b20e36b3da86dfb30690353bc52 (patch) | |
| tree | 846f0b28a0d6256ee462e5c1cc08cb7abb25f754 | |
| parent | bd3aa2a41cc2bfbfef8708fa0258e66995827bf1 (diff) | |
#78300#: don't show OLE placeholder if SDRPAINTMODE_HIDEDRAFTGRAF is set
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 8b1febd37e80..1c34dedb5274 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdoole2.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: ka $ $Date: 2001-07-30 13:17:08 $ + * last change: $Author: ka $ $Date: 2001-08-17 12:00:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -589,12 +589,19 @@ FASTBOOL SdrOle2Obj::Paint(ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoRe pSdrView->DoConnect(pOle2Obj); } } - pOut->Push( PUSH_CLIPREGION ); - pOut->IntersectClipRegion( aRect ); - (*ppObjRef)->DoDraw(pOut,aRect.TopLeft(),aRect.GetSize(),JobSetup()); - pOut->Pop(); + + + // don't call DoDraw if this s a special object and SDRPAINTMODE_HIDEDRAFTGRAF is set + if( ( ( (*ppObjRef)->GetMiscStatus() & SVOBJ_MISCSTATUS_SPECIALOBJECT ) == 0 ) || + ( ( rInfoRec.nPaintMode & SDRPAINTMODE_HIDEDRAFTGRAF ) == 0 ) ) + { + pOut->Push( PUSH_CLIPREGION ); + pOut->IntersectClipRegion( aRect ); + (*ppObjRef)->DoDraw(pOut,aRect.TopLeft(),aRect.GetSize(),JobSetup()); + pOut->Pop(); + } } - else + else if( ( rInfoRec.nPaintMode & SDRPAINTMODE_HIDEDRAFTGRAF ) == 0 ) { // sonst SDRPAINTMODE_DRAFTGRAF Polygon aPoly(Rect2Poly(aRect,aGeo)); pOut->SetLineColor(Color(COL_BLACK)); |