diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-27 09:06:16 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-27 09:06:16 +0000 |
| commit | 1e5646a4199e4cdad7b663daa2f6e2a822603f16 (patch) | |
| tree | 2597ab24da6d1997b351bc9244dc90059138af4c /sc/source/ui/drawfunc/drawsh2.cxx | |
| parent | 4fb73fa4ee8b6ffc7eb5cf64d67d522b22b518cc (diff) | |
INTEGRATION: CWS swa11y203 (1.18.122); FILE MERGED
2006/03/15 10:50:11 nn 1.18.122.1: #i51351# allow renaming of any type of shapes
Diffstat (limited to 'sc/source/ui/drawfunc/drawsh2.cxx')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 923d8c91dbd2..161e9db48cfe 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drawsh2.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2005-09-28 12:10:14 $ + * last change: $Author: obo $ $Date: 2006-03-27 10:06:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -211,11 +211,13 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl BOOL bCanRename = FALSE; if ( nMarkCount == 1 ) { - UINT16 nObjType = rMarkList.GetMark( 0 )->GetObj()->GetObjIdentifier(); - if ( nObjType == OBJ_OLE2 || nObjType == OBJ_GRAF || nObjType == OBJ_GRUP ) - bCanRename = TRUE; + SdrObject* pObj = rMarkList.GetMark( 0 )->GetObj(); + SdrLayerID nLayerID = pObj->GetLayer(); + if ( nLayerID != SC_LAYER_INTERN ) + bCanRename = TRUE; // #i51351# anything except internal objects can be renamed // #91929#; don't show original size entry if not possible + UINT16 nObjType = pObj->GetObjIdentifier(); if ( nObjType == OBJ_OLE2 ) { SdrOle2Obj* pOleObj = static_cast<SdrOle2Obj*>(rMarkList.GetMark( 0 )->GetObj()); @@ -226,8 +228,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl } else if ( nObjType == OBJ_CAPTION ) { - SdrObject* pObj = rMarkList.GetMark( 0 )->GetObj(); - if( pObj && pObj->GetLayer() == SC_LAYER_INTERN) + if ( nLayerID == SC_LAYER_INTERN ) { // SdrCaptionObj() Notes cannot be cut/copy in isolation from // their cells. |