diff options
| author | obo <obo@openoffice.org> | 2010-06-15 12:54:21 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-15 12:54:21 +0200 |
| commit | a93ecbe1f0f5e65ccc64347ed564d39c923f0dd0 (patch) | |
| tree | e6b624a0d3274882f7e7855f8812a99706b07bb5 /svx/source/svdraw/svdmrkv.cxx | |
| parent | 946651672cd26b5db588005f39deb2eecf82ca8a (diff) | |
| parent | 6e5f7e581dc5b8edcb78dc92a4d0c89d81f2aef9 (diff) | |
CWS-TOOLING: integrate CWS impressbi01
Diffstat (limited to 'svx/source/svdraw/svdmrkv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index a15cf8c8b2ac..fffcac00e46c 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1226,6 +1226,10 @@ void SdrMarkView::CheckMarked() } bRaus=bRaus || pPV->GetLockedLayers().IsSet(nLay) || // Layer gesperrt? !pPV->GetVisibleLayers().IsSet(nLay); // Layer nicht sichtbar? + + if( !bRaus ) + bRaus = !pObj->IsVisible(); // not visible objects can not be marked + if (!bRaus) { // Joe am 9.3.1997: Gruppierte Objekten koennen nun auch // markiert werden. Nach EnterGroup muessen aber die Objekte @@ -1629,7 +1633,7 @@ void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz) #define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const { - if((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) + if(((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible())) { return NULL; } |