diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 14:49:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 14:49:04 +0000 |
| commit | d9a984ff330425ee7f3e8e7881def2994bbd1bd3 (patch) | |
| tree | 9cc07627f33742c331c0827903e88549503c32a4 /sd/source/ui/dlg/docprev.cxx | |
| parent | 4809708abb9673f621f930465bc1210044dce86e (diff) | |
INTEGRATION: CWS interop12 (1.7.92); FILE MERGED
2004/02/13 22:19:25 cl 1.7.92.3: RESYNC: (1.8-1.9); FILE MERGED
2003/12/09 23:27:37 cl 1.7.92.2: RESYNC: (1.7-1.8); FILE MERGED
2003/11/07 09:13:16 cl 1.7.92.1: #i20949# added header&footer support for impress
Diffstat (limited to 'sd/source/ui/dlg/docprev.cxx')
| -rw-r--r-- | sd/source/ui/dlg/docprev.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index f81f81b02e94..009bc69d4bd2 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docprev.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2004-01-20 10:44:20 $ + * last change: $Author: rt $ $Date: 2004-03-30 15:49:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,19 +126,10 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage IMPL_LINK( SdDocPreviewWin, PaintProc, SdrPaintProcRec *, pRecord ) { SdrObject* pObj = pRecord->pObj; - if( !pObj->IsEmptyPresObj() ) + if( pObj->GetPage() && pObj->GetPage()->checkVisibility( pRecord, false ) ) { pObj->SingleObjectPainter( pRecord->rOut, pRecord->rInfoRec ); // #110094#-17 } - else - { - // sad but true, background shapes are also empty presentation objects - // so we need to check if this is one - if( pObj->GetPage()->IsMasterPage() && (pObj->GetPage() == pObj->GetObjList()) && (pObj->GetOrdNum() == 0) && pObj->ISA( SdrRectObj ) ) - { - pObj->SingleObjectPainter( pRecord->rOut, pRecord->rInfoRec ); // #110094#-17 - } - } return 0; } |