diff options
author | sj <sj@openoffice.org> | 2010-11-15 17:45:29 +0100 |
---|---|---|
committer | sj <sj@openoffice.org> | 2010-11-15 17:45:29 +0100 |
commit | b13c9e2cf6c2d838181eab770e2c27407f647ca9 (patch) | |
tree | 0c7082227be999f0db021f14653b27bfb39819f6 /sd/source/ui/view/drviews7.cxx | |
parent | impress202: merging (diff) | |
parent | CWS-TOOLING: integrate CWS dba34a (diff) | |
download | core-b13c9e2cf6c2d838181eab770e2c27407f647ca9.tar.gz core-b13c9e2cf6c2d838181eab770e2c27407f647ca9.zip |
impress202: rebasing
Diffstat (limited to 'sd/source/ui/view/drviews7.cxx')
-rwxr-xr-x | sd/source/ui/view/drviews7.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 5b58b2623df0..ab70090c5263 100755 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -971,11 +971,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_PLUGIN ); rSet.DisableItem( SID_INSERT_SOUND ); rSet.DisableItem( SID_INSERT_VIDEO ); - rSet.DisableItem( SID_INSERT_APPLET ); rSet.DisableItem( SID_INSERT_FLOATINGFRAME ); -#ifdef STARIMAGE_AVAILABLE - rSet.DisableItem( SID_INSERT_IMAGE ); -#endif rSet.DisableItem( SID_INSERT_MATH ); rSet.DisableItem( SID_INSERT_DIAGRAM ); rSet.DisableItem( SID_ATTR_TABLE ); @@ -984,7 +980,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_SIZE_ALL ); rSet.DisableItem( SID_SIZE_PAGE_WIDTH ); rSet.DisableItem( SID_SIZE_PAGE ); -// rSet.DisableItem( SID_INSERTPAGE ); rSet.DisableItem( SID_DUPLICATE_PAGE ); rSet.DisableItem( SID_ZOOM_TOOLBOX ); } @@ -1075,12 +1070,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_PLUGIN ); rSet.DisableItem( SID_INSERT_SOUND ); rSet.DisableItem( SID_INSERT_VIDEO ); - rSet.DisableItem( SID_INSERT_APPLET ); rSet.DisableItem( SID_INSERT_FLOATINGFRAME ); -#ifdef STARIMAGE_AVAILABLE - rSet.DisableItem( SID_INSERT_IMAGE ); -#endif rSet.DisableItem( SID_INSERT_MATH ); rSet.DisableItem( SID_INSERT_FRAME ); rSet.DisableItem( SID_INSERTFILE ); @@ -1587,11 +1578,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } #endif -// Fuer Win16 -#ifndef SOLAR_JAVA - rSet.DisableItem( SID_INSERT_APPLET ); -#endif - // Set the state of two entries in the 'Slide' context sub-menu // concerning the visibility of master page background and master page // shapes. |