summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view')
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews5.cxx14
-rwxr-xr-xsd/source/ui/view/drviews7.cxx14
-rwxr-xr-xsd/source/ui/view/drviews8.cxx1
-rwxr-xr-xsd/source/ui/view/drviewsa.cxx17
-rw-r--r--sd/source/ui/view/drviewsb.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsc.cxx4
-rwxr-xr-xsd/source/ui/view/outlnvsh.cxx6
7 files changed, 22 insertions, 40 deletions
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 18ff686fc612..433a4e4fa6c1 100644..100755
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -51,7 +51,7 @@
#include "res_bmp.hrc"
#include "glob.hrc"
#include "app.hrc"
-
+#include "helpids.h"
#include "optsitem.hxx"
#include "app.hxx"
#include "FrameView.hxx"
@@ -597,20 +597,20 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
if (mePageKind == PK_NOTES)
{
SetHelpId( SID_NOTESMODE );
- GetActiveWindow()->SetHelpId( SID_NOTESMODE );
- GetActiveWindow()->SetUniqueId( SID_NOTESMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
}
else if (mePageKind == PK_HANDOUT)
{
SetHelpId( SID_HANDOUTMODE );
- GetActiveWindow()->SetHelpId( SID_HANDOUTMODE );
- GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
}
else
{
SetHelpId( SD_IF_SDDRAWVIEWSHELL );
- GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL );
- GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL );
+ GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
+ GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL );
}
}
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index f758a65953d5..fa2ddf1120d0 100755
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -957,11 +957,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 );
@@ -970,7 +966,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 );
}
@@ -1061,12 +1056,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 );
@@ -1573,11 +1564,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.
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 54cd0c792c94..f4d8ca90687b 100755
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -196,7 +196,6 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
case SID_INSERT_PLUGIN:
case SID_INSERT_SOUND:
case SID_INSERT_VIDEO:
- case SID_INSERT_APPLET:
case SID_INSERT_FLOATINGFRAME:
case SID_INSERT_MATH:
case SID_INSERT_DIAGRAM:
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3628a11ac5a1..36e5d96c97ff 100755
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -61,6 +61,7 @@
#include <sfx2/dispatch.hxx>
#include <svtools/cliplistener.hxx>
#include <svx/float3d.hxx>
+#include "helpids.h"
#include "view/viewoverlaymanager.hxx"
#include "app.hrc"
@@ -334,16 +335,16 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
if( eDocType == DOCUMENT_TYPE_DRAW )
{
SetHelpId( SD_IF_SDGRAPHICVIEWSHELL );
- GetActiveWindow()->SetHelpId( SD_IF_SDGRAPHICVIEWSHELL );
- GetActiveWindow()->SetUniqueId( SD_IF_SDGRAPHICVIEWSHELL );
+ GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL );
+ GetActiveWindow()->SetUniqueId( HID_SDGRAPHICVIEWSHELL );
}
else
{
if (mePageKind == PK_NOTES)
{
SetHelpId( SID_NOTESMODE );
- GetActiveWindow()->SetHelpId( SID_NOTESMODE );
- GetActiveWindow()->SetUniqueId( SID_NOTESMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
// AutoLayouts muessen erzeugt sein
GetDoc()->StopWorkStartupDelay();
@@ -351,8 +352,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
else if (mePageKind == PK_HANDOUT)
{
SetHelpId( SID_HANDOUTMODE );
- GetActiveWindow()->SetHelpId( SID_HANDOUTMODE );
- GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
// AutoLayouts muessen erzeugt sein
GetDoc()->StopWorkStartupDelay();
@@ -360,8 +361,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
else
{
SetHelpId( SD_IF_SDDRAWVIEWSHELL );
- GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL );
- GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL );
+ GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
+ GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL );
}
}
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 2574032e3d99..d7cc1fc1d84a 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -33,7 +33,7 @@
#ifndef _SVXIDS_HXX
#include <svx/svxids.hrc>
#endif
-
+#include <sfx2/msgpool.hxx>
#include <svx/hyprlink.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/hlnkitem.hxx>
@@ -127,7 +127,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, String( SdResId( STR_INSERTLAYER ) ) ) : 0;
if( pDlg )
{
- pDlg->SetHelpId( SID_INSERTLAYER );
+ pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
// Ueberpruefung auf schon vorhandene Namen
BOOL bLoop = TRUE;
@@ -293,7 +293,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, String( SdResId( STR_MODIFYLAYER ) ) ) : 0;
if( pDlg )
{
- pDlg->SetHelpId( SID_MODIFYLAYER );
+ pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
// Ueberpruefung auf schon vorhandene Namen
BOOL bLoop = TRUE;
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index eefe0680d2d4..ae47111c8200 100644..100755
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -788,9 +788,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId )
break;
case SID_INSERT_DIAGRAM:
-#ifdef STARIMAGE_AVAILABLE
- case SID_INSERT_IMAGE:
-#endif
case SID_ATTR_TABLE:
case SID_INSERTFILE:
case SID_INSERT_GRAPHIC:
@@ -802,7 +799,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId )
case SID_INSERT_PLUGIN:
case SID_INSERT_SOUND:
case SID_INSERT_VIDEO:
- case SID_INSERT_APPLET:
case SID_INSERT_TABLE:
{
nMappedSId = SID_DRAWTBX_INSERT;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index d83abefbea47..61f513970662 100755
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -32,7 +32,7 @@
#include "ViewShellImplementation.hxx"
#include <memory>
-
+#include "helpids.h"
#include "app.hrc"
#include <svx/hyprlink.hxx>
#include <svx/hyperdlg.hxx>
@@ -180,8 +180,8 @@ void OutlineViewShell::Construct(DrawDocShell* )
SetName (aName);
SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
- GetActiveWindow()->SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
- GetActiveWindow()->SetUniqueId( SD_IF_SDOUTLINEVIEWSHELL );
+ GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL );
+ GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 07:45:27 +0000