summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-07-23 16:18:47 +0200
committerMathias Bauer <mba@openoffice.org>2010-07-23 16:18:47 +0200
commiteffc31fbbf24d9b81499acffe29483e764361594 (patch)
tree64282421c1a06b002a31d7f7b80bc03ed105d97e
parent4c498c21dc50a86004ed8c90e988abc2686e9430 (diff)
CWS changehid: #i111874#: some HID cleanup
-rwxr-xr-xsd/inc/helpids.h2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews5.cxx8
-rwxr-xr-xsd/source/ui/view/drviewsa.cxx8
3 files changed, 8 insertions, 10 deletions
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 2dabcc43db45..b01009f159d6 100755
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -28,8 +28,6 @@
#include <svx/svxcommands.h>
#include "sdcommands.h"
-#define HID_NOTESMODE "SD_HID_NOTESMODE"
-#define HID_HANDOUTMODE "SD_HID_HANDOUTMODE"
#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL"
#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL"
#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL"
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 8d932c4be047..433a4e4fa6c1 100644..100755
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -597,14 +597,14 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
if (mePageKind == PK_NOTES)
{
SetHelpId( SID_NOTESMODE );
- GetActiveWindow()->SetHelpId( HID_NOTESMODE );
- GetActiveWindow()->SetUniqueId( HID_NOTESMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
}
else if (mePageKind == PK_HANDOUT)
{
SetHelpId( SID_HANDOUTMODE );
- GetActiveWindow()->SetHelpId( HID_HANDOUTMODE );
- GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
}
else
{
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 394174595696..36e5d96c97ff 100755
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -343,8 +343,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
if (mePageKind == PK_NOTES)
{
SetHelpId( SID_NOTESMODE );
- GetActiveWindow()->SetHelpId( HID_NOTESMODE );
- GetActiveWindow()->SetUniqueId( HID_NOTESMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
// AutoLayouts muessen erzeugt sein
GetDoc()->StopWorkStartupDelay();
@@ -352,8 +352,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
else if (mePageKind == PK_HANDOUT)
{
SetHelpId( SID_HANDOUTMODE );
- GetActiveWindow()->SetHelpId( HID_HANDOUTMODE );
- GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE );
+ GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
+ GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
// AutoLayouts muessen erzeugt sein
GetDoc()->StopWorkStartupDelay();