diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-23 09:12:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-23 09:12:23 +0000 |
| commit | 050bb4233064caa013cb5cf1422aeac99e17f64a (patch) | |
| tree | b76faa1ea45ed964fc129f80bdc336aa6fac9881 /svx/source/svdraw/svdviter.cxx | |
| parent | a865868c47adfa7bd0ffc01b896753ef8aad6ae8 (diff) | |
#100000# merge fixes
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 820f5785e040..6df2da372b93 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdviter.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2006-11-21 16:57:14 $ + * last change: $Author: vg $ $Date: 2006-11-23 10:11:56 $ * * 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; - pObject->getMergedHierarchyLayerSet(aObjLay); + mpObject->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; - pObject->getMergedHierarchyLayerSet(aObjLay); + mpObject->getMergedHierarchyLayerSet(aObjLay); aObjLay &= pPV->GetVisibleLayers(); aObjLay &= pPg->TRG_GetMasterPageVisibleLayers(); |