diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:01:11 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:01:11 +0000 |
| commit | 7e9a368ab00185bea96c2a1d7980df0df41076cb (patch) | |
| tree | cac5b0cdd3acc19277aca8966b1c0fc9846527c4 | |
| parent | c7f145457fb9c330c6008cf696ad60a4cc354bad (diff) | |
INTEGRATION: CWS calc29 (1.6.168); FILE MERGED
2005/02/11 09:39:15 jmarmion 1.6.168.1: #i33764# - support resize and edit for new notes.
| -rw-r--r-- | sc/source/ui/drawfunc/fusel2.cxx | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index bc844dfea525..4478593ededd 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusel2.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2004-09-08 13:54:27 $ + * last change: $Author: vg $ $Date: 2005-02-21 16:01:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,13 +178,30 @@ BOOL FuSelection::TestComment( SdrPageView* pPV, const Point& rPos ) // Leave the internal note object unlocked - re-lock in ScDrawView::MarkListHasChanged() pLockLayer = pDrDoc->GetLayerAdmin().GetLayerPerID(SC_LAYER_INTERN); - if (pLockLayer) + if (pLockLayer && pView->IsLayerLocked(pLockLayer->GetName())) pView->SetLayerLocked( pLockLayer->GetName(), FALSE ); } return (pFoundObj != NULL); } +void FuSelection::ActivateNoteHandles(SdrObject* pObject) const +{ + if(!pObject && !pView) + return; + if ( pObject->GetLayer() == SC_LAYER_INTERN && pObject->ISA(SdrCaptionObj)) + { + SdrLayer* pLockLayer = NULL; + + // Leave the internal note object unlocked - re-lock in ScDrawView::MarkListHasChanged() + pLockLayer = pDrDoc->GetLayerAdmin().GetLayerPerID(SC_LAYER_INTERN); + if (pLockLayer && pView->IsLayerLocked(pLockLayer->GetName())) + pView->SetLayerLocked( pLockLayer->GetName(), FALSE ); + SdrPageView* pPV = pView->GetPageViewPvNum(0); + pView->MarkObj(pObject, pPV); + } +} + //================================================================== |