diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 11:42:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 11:42:40 +0000 |
| commit | 919ddc7f35975e38ce82dc5c826c1c7ae713fe45 (patch) | |
| tree | 21a24c74e27ca7db1b39470cd3cd8c202bd5aeb9 /sc/source/ui/drawfunc/drawsh2.cxx | |
| parent | a50a9bbbee33f1dd2ef506ff1603a1910cadfbd4 (diff) | |
INTEGRATION: CWS dr55 (1.23.140); FILE MERGED
2007/06/28 13:58:01 dr 1.23.140.2: #i66550# disabled
2007/06/15 15:41:20 dr 1.23.140.1: #i66550# add hyperlinks to shapes, patch by npower, reviewed by dr
Diffstat (limited to 'sc/source/ui/drawfunc/drawsh2.cxx')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index cefdea42e85c..be73c92a27b0 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.23 $ + * $Revision: 1.24 $ * - * last change: $Author: ihi $ $Date: 2006-12-19 17:33:56 $ + * last change: $Author: rt $ $Date: 2007-07-06 12:42:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" - - //------------------------------------------------------------------ #ifndef _COM_SUN_STAR_EMBED_EMBEDMISC_HPP_ #include <com/sun/star/embed/EmbedMisc.hpp> @@ -67,7 +65,8 @@ #include "viewdata.hxx" #include "sc.hrc" #include "tabvwsh.hxx" - +#include "drwlayer.hxx" +#include "userdat.hxx" #ifndef _SVDOOLE2_HXX #include <svx/svdoole2.hxx> @@ -208,9 +207,26 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl } BOOL bCanRename = FALSE; - if ( nMarkCount == 1 ) + if ( nMarkCount > 1 ) + { +#ifdef ISSUE66550_HLINK_FOR_SHAPES + // no hypelink options for a selected group + rSet.DisableItem( SID_DRAW_HLINK_EDIT ); + rSet.DisableItem( SID_DRAW_HLINK_DELETE ); + rSet.DisableItem( SID_OPEN_HYPERLINK ); +#endif + } + else if ( nMarkCount == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); +#ifdef ISSUE66550_HLINK_FOR_SHAPES + ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj ); + if ( !pInfo || (pInfo->GetHlink().getLength() == 0) ) + { + rSet.DisableItem( SID_DRAW_HLINK_DELETE ); + rSet.DisableItem( SID_OPEN_HYPERLINK ); + } +#endif SdrLayerID nLayerID = pObj->GetLayer(); if ( nLayerID != SC_LAYER_INTERN ) bCanRename = TRUE; // #i51351# anything except internal objects can be renamed |