diff options
Diffstat (limited to 'sd/source/ui/view/drviews7.cxx')
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index bbdb31adf460..983033be7b8c 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -210,7 +210,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper SfxBindings& rBindings = GetViewFrame()->GetBindings(); rBindings.Invalidate( SID_PASTE ); - rBindings.Invalidate( SID_PASTE2 ); + rBindings.Invalidate( SID_PASTE_SPECIAL ); rBindings.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS ); } return 0; @@ -570,7 +570,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // clipboard (paste) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE ) || - SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE2 ) || + SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE_SPECIAL ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) ) { if ( !mpClipEvtLstnr ) @@ -596,7 +596,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( !mbPastePossible ) { rSet.DisableItem( SID_PASTE ); - rSet.DisableItem( SID_PASTE2 ); + rSet.DisableItem( SID_PASTE_SPECIAL ); rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS ); } else if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) ) @@ -1017,7 +1017,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SD_MOD()->GetWaterCan() ) { rSet.DisableItem( SID_PASTE ); - rSet.DisableItem( SID_PASTE2 ); + rSet.DisableItem( SID_PASTE_SPECIAL ); rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS ); rSet.DisableItem( SID_INSERT_FLD_DATE_FIX ); @@ -1328,6 +1328,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } + // #i102735# discussed with CL: removed for performance reasons + #if 0 if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_SOUND ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_VIDEO ) ) { @@ -1340,6 +1342,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (!SvxPluginFileDlg::IsAvailable (SID_INSERT_VIDEO)) rSet.DisableItem (SID_INSERT_VIDEO); } + #endif /////////////////////////////////////////////////////////////////////// // Menuoption: Change->Convert->To Bitmap, Change->Convert->To Metafile |