diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 15:57:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 15:57:14 +0000 |
| commit | c0a201f3d6561e1ef675905aaa21849ca53d4376 (patch) | |
| tree | d366338a66c3129d67ffef9351bbaff87048abad /svx/source/svdraw/svdviter.cxx | |
| parent | afe7fd1a08225afb4c54b4772d46c7724b2ac7db (diff) | |
INTEGRATION: CWS aw036 (1.5.48); FILE MERGED
2006/10/26 15:57:19 aw 1.5.48.1: #i61284#: BurnInStyleSheetAttributes for text corrected; #i70852#: Set/GetLayer cleanup and implementation for FmFormObj
Diffstat (limited to 'svx/source/svdraw/svdviter.cxx')
| -rw-r--r-- | svx/source/svdraw/svdviter.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index 6a4ffe3d0ee4..820f5785e040 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdviter.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 13:51:06 $ + * last change: $Author: vg $ $Date: 2006-11-21 16:57:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,7 +117,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const // Objekt gewuenscht? Na dann erstmal sehen, ob // das Obj in dieser PageView auch sichtbar ist. SetOfByte aObjLay; - mpObject->GetLayerSet(aObjLay); + pObject->getMergedHierarchyLayerSet(aObjLay); aObjLay &= pPV->GetVisibleLayers(); return !aObjLay.IsEmpty(); } @@ -142,7 +142,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const // Objekt gewuenscht? Na dann erstmal sehen, ob // das Obj in dieser PageView auch sichtbar ist. SetOfByte aObjLay; - mpObject->GetLayerSet(aObjLay); + pObject->getMergedHierarchyLayerSet(aObjLay); aObjLay &= pPV->GetVisibleLayers(); aObjLay &= pPg->TRG_GetMasterPageVisibleLayers(); |