diff options
Diffstat (limited to 'sd/source/ui')
60 files changed, 640 insertions, 2313 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src index 0f83818fafb3..62abf708d883 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.src +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.src @@ -98,11 +98,13 @@ TabDialog DLG_CUSTOMANIMATION_CREATE TabPage RID_TP_CUSTOMANIMATION_ENTRANCE { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_ENTRANCE"; Hide = TRUE; Size = MAP_APPFONT ( 156, 217 ); ListBox LB_EFFECTS { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS"; Pos = MAP_APPFONT ( 3 , 3 ) ; Size = MAP_APPFONT( 144, 160 ); OutputSize = TRUE; @@ -121,6 +123,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE ComboBox CB_SPEED { + HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED"; Pos = MAP_APPFONT ( 48 , 166 ) ; Size = MAP_APPFONT ( 101, 48 ); TabStop = TRUE ; @@ -130,6 +133,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE CheckBox CBX_PREVIEW { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW"; Pos = MAP_APPFONT ( 3 , 181 ) ; Size = MAP_APPFONT ( 143 , 10 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src index 8232638678e1..270fef75db50 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.src +++ b/sd/source/ui/animations/CustomAnimationDialog.src @@ -96,6 +96,7 @@ TabDialog DLG_CUSTOMANIMATION TabPage RID_TP_CUSTOMANIMATION_EFFECT { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT"; Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Effect"; @@ -120,6 +121,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_PROPERTY_1 { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_1"; Pos = MAP_APPFONT ( X2+6 , 14 ) ; Size = MAP_APPFONT ( W2, 100 ); Hide = TRUE; @@ -139,6 +141,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_PROPERTY_2 { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_2"; Pos = MAP_APPFONT ( X2+6 , 14 ) ; Size = MAP_APPFONT ( W2, 100 ); Hide = TRUE; @@ -149,6 +152,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT CheckBox CB_SMOOTH_START { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_START"; Pos = MAP_APPFONT( X1+6, 14 ); Size = MAP_APPFONT ( (W0 / 2) , 10 ) ; Hide = TRUE; @@ -158,6 +162,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT CheckBox CB_SMOOTH_END { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_END"; Pos = MAP_APPFONT( X1 + (W0 / 2) + 3, 14 ); Size = MAP_APPFONT ( (W0 / 2) , 10 ) ; Hide = TRUE; @@ -167,6 +172,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT CheckBox CB_AUTORESTART { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_AUTORESTART"; Pos = MAP_APPFONT( X1+6, 14 ); Size = MAP_APPFONT ( W0 , 10 ) ; Hide = TRUE; @@ -190,6 +196,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_FROM_START { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_START"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 16 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -201,6 +208,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_FROM_LAST { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_LAST"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 29 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -212,6 +220,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_FROM_TIME { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 42 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -223,6 +232,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT MetricField MF_START_TIME { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_START_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 55 ) ; Size = MAP_APPFONT ( W1, 12 ); @@ -253,6 +263,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_STOP_ON_CLICK { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_ON_CLICK"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 81 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -264,6 +275,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_STOP_ON_NEXT_SLIDE { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_ON_NEXT_SLIDE"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 94 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -275,6 +287,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_STOP_AFTER_N_SLIDES { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_AFTER_N_SLIDES"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 107 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -286,6 +299,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT MetricField MF_STOP_AFTER_SLIDES { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_STOP_AFTER_SLIDES"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 55 ) ; Size = MAP_APPFONT ( W1, 12 ); @@ -329,6 +343,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_SOUND { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_SOUND"; Pos = MAP_APPFONT ( X2 , 3 ) ; Size = MAP_APPFONT ( W2 - 19, 100 ); TabStop = TRUE ; @@ -338,6 +353,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT PushButton PB_SOUND_PREVIEW { + HelpID = "sd:PushButton:RID_TP_CUSTOMANIMATION_EFFECT:PB_SOUND_PREVIEW"; Pos = MAP_APPFONT ( X2 + W2 - 16 , 2 ) ; Size = MAP_APPFONT( 16, 14 ); OutputSize = TRUE; @@ -355,6 +371,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_AFTER_EFFECT { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_AFTER_EFFECT"; Pos = MAP_APPFONT ( X2 , 18 ) ; Size = MAP_APPFONT ( W2, 100 ); TabStop = TRUE ; @@ -379,6 +396,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox CLB_DIMCOLOR { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:CLB_DIMCOLOR"; Pos = MAP_APPFONT( X2, 33 ); Size = MAP_APPFONT ( W2, 100 ); TabStop = TRUE ; @@ -397,6 +415,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_TEXT_ANIM { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM"; Pos = MAP_APPFONT ( X2 , 48 ) ; Size = MAP_APPFONT ( W2, 100 ); TabStop = TRUE ; @@ -422,6 +441,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT MetricField MF_TEXT_DELAY { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY"; Pos = MAP_APPFONT ( X2, 64 ) ; Size = MAP_APPFONT ( 42, 12 ); TabStop = TRUE ; @@ -440,6 +460,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT TabPage RID_TP_CUSTOMANIMATION_DURATION { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_DURATION"; Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Timing"; @@ -455,6 +476,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ListBox LB_START { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_START"; Pos = MAP_APPFONT ( X2 , 3 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -480,6 +502,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION MetricField MF_START_DELAY { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_DURATION:MF_START_DELAY"; Pos = MAP_APPFONT ( X2 , 18 ) ; Size = MAP_APPFONT ( W2, 12 ); Border = TRUE ; @@ -506,6 +529,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ComboBox CB_DURATION { + HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_DURATION"; Pos = MAP_APPFONT ( X2 , 33 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -524,6 +548,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ComboBox CB_REPEAT { + HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_REPEAT"; Pos = MAP_APPFONT ( X2 , 48 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -533,6 +558,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION CheckBox CBX_REWIND { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_DURATION:CBX_REWIND"; Pos = MAP_APPFONT ( X0 , 66 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; TabStop = TRUE ; @@ -550,6 +576,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION RadioButton RB_CLICKSEQUENCE { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_CLICKSEQUENCE"; Pos = MAP_APPFONT ( X1+6, 92 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; Text [ en-US ] = "Animate as part of click sequence" ; @@ -558,6 +585,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION RadioButton RB_INTERACTIVE { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE"; Pos = MAP_APPFONT ( X1+6, 105 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; Text [ en-US ] = "Start effect on click of" ; @@ -566,6 +594,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ListBox LB_TRIGGER { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER"; Pos = MAP_APPFONT ( X1+18 , 118 ); Size = MAP_APPFONT ( W2, 80 ); TabStop = TRUE ; @@ -576,6 +605,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION TabPage RID_TP_CUSTOMANIMATION_TEXT { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_TEXT"; Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Text Animation"; @@ -591,6 +621,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT ListBox LB_GROUP_TEXT { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT"; Pos = MAP_APPFONT ( X2 , 3 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -609,8 +640,9 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT }; }; - Checkbox CBX_GROUP_AUTO + CheckBox CBX_GROUP_AUTO { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO"; Pos = MAP_APPFONT ( X0 , 20 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; TabStop = TRUE ; @@ -620,6 +652,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT MetricField MF_GROUP_AUTO { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO"; Pos = MAP_APPFONT ( X2 , 18 ) ; Size = MAP_APPFONT ( W2, 12 ); Border = TRUE ; @@ -635,16 +668,18 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT SpinSize = 5 ; }; - Checkbox CBX_ANIMATE_FORM + CheckBox CBX_ANIMATE_FORM { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_ANIMATE_FORM"; Pos = MAP_APPFONT ( X0 , 33 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Animate attached shape" ; }; - Checkbox CBX_REVERSE + CheckBox CBX_REVERSE { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_REVERSE"; Pos = MAP_APPFONT ( X0 , 46 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src index 0ca43731d6b0..536d10f9a417 100644 --- a/sd/source/ui/annotations/annotations.src +++ b/sd/source/ui/annotations/annotations.src @@ -28,6 +28,7 @@ #include "annotations.hrc" #include "glob.hrc" #include <svx/svxids.hrc> +#include "helpids.h" Menu RID_ANNOTATION_CONTEXTMENU { @@ -36,7 +37,7 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_REPLYTO_POSTIT; - HelpID = SID_REPLYTO_POSTIT ; + HelpId = CMD_SID_REPLYTO_POSTIT ; Text [ en-US ] = "~Reply"; }; MenuItem @@ -46,25 +47,25 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_ATTR_CHAR_WEIGHT; - HelpID = SID_ATTR_CHAR_WEIGHT ; + HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; Text [ en-US ] = "~Bold"; }; MenuItem { Identifier = SID_ATTR_CHAR_POSTURE; - HelpID = SID_ATTR_CHAR_POSTURE; + HelpId = CMD_SID_ATTR_CHAR_POSTURE; Text [ en-US ] = "~Italic"; }; MenuItem { Identifier = SID_ATTR_CHAR_UNDERLINE; - HelpID = SID_ATTR_CHAR_UNDERLINE; + HelpId = CMD_SID_ATTR_CHAR_UNDERLINE; Text [ en-US ] = "~Underline"; }; MenuItem { Identifier = SID_ATTR_CHAR_STRIKEOUT; - HelpID = SID_ATTR_CHAR_STRIKEOUT; + HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT; Text [ en-US ] = "~Strikethrough"; }; MenuItem @@ -74,13 +75,13 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_COPY ; - HelpID = SID_COPY ; + HelpId = CMD_SID_COPY ; Text [ en-US ] = "~Copy" ; }; MenuItem { Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + HelpId = CMD_SID_PASTE ; Text [ en-US ] = "~Paste" ; }; MenuItem @@ -90,19 +91,19 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_DELETE_POSTIT ; - HelpID = SID_DELETE_POSTIT; + HelpId = CMD_SID_DELETE_POSTIT; Text [ en-US ] = "~Delete Comment" ; }; MenuItem { Identifier = SID_DELETEALLBYAUTHOR_POSTIT ; - HelpID = SID_DELETEALLBYAUTHOR_POSTIT; + HelpId = CMD_SID_DELETEALLBYAUTHOR_POSTIT; Text [ en-US ] = "Delete All Comments b~y %1" ; }; MenuItem { Identifier = SID_DELETEALL_POSTIT; - HelpID = SID_DELETEALL_POSTIT; + HelpId = CMD_SID_DELETEALL_POSTIT; Text [ en-US ] = "Delete ~All Comments" ; }; }; @@ -115,7 +116,7 @@ Menu RID_ANNOTATION_TAG_CONTEXTMENU MenuItem { Identifier = SID_REPLYTO_POSTIT; - HelpID = SID_REPLYTO_POSTIT; + HelpId = CMD_SID_REPLYTO_POSTIT; Text [ en-US ] = "~Reply"; }; MenuItem @@ -125,19 +126,19 @@ Menu RID_ANNOTATION_TAG_CONTEXTMENU MenuItem { Identifier = SID_DELETE_POSTIT ; - HelpID = SID_DELETE_POSTIT ; + HelpId = CMD_SID_DELETE_POSTIT ; Text [ en-US ] = "~Delete Comment" ; }; MenuItem { Identifier = SID_DELETEALLBYAUTHOR_POSTIT ; - HelpID = SID_DELETEALLBYAUTHOR_POSTIT ; + HelpId = CMD_SID_DELETEALLBYAUTHOR_POSTIT ; Text [ en-US ] = "Delete All Comments ~by %1" ; }; MenuItem { Identifier = SID_DELETEALL_POSTIT; - HelpID = SID_DELETEALL_POSTIT; + HelpId = CMD_SID_DELETEALL_POSTIT; Text [ en-US ] = "Delete ~All Comments" ; }; }; diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk index b0ac26018877..8c66ae2ee0fa 100755 --- a/sd/source/ui/app/makefile.mk +++ b/sd/source/ui/app/makefile.mk @@ -50,7 +50,6 @@ SRC1FILES = \ toolbox.src \ strings.src \ res_bmp.src \ - tbx_ww.src \ popup.src \ sdstring.src diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src index 21d906bfedf0..b9fbbb4b3d3a 100755 --- a/sd/source/ui/app/menuids2_tmpl.src +++ b/sd/source/ui/app/menuids2_tmpl.src @@ -61,7 +61,7 @@ MenuItem\ {\ Identifier = SID_NEWDOCDIRECT ; \ - HelpID = SID_NEWDOCDIRECT ; \ + HelpId = CMD_SID_NEWDOCDIRECT ; \ Text [ en-US ] = "~New" ; \ }; @@ -69,7 +69,7 @@ MenuItem\ {\ Identifier = SID_EXPORTDOC ; \ - HelpID = SID_EXPORTDOC ; \ + HelpId = CMD_SID_EXPORTDOC ; \ Text [ en-US ] = "~Export..." ; \ }; @@ -77,7 +77,7 @@ MenuItem\ {\ Identifier = SID_EXPORTDOCASPDF ; \ - HelpID = SID_EXPORTDOCASPDF ; \ + HelpId = CMD_SID_EXPORTDOCASPDF ; \ Text [ en-US ] = "Export as PDF..." ; \ }; @@ -85,7 +85,7 @@ MenuItem\ {\ Identifier = MN_SUB_SEND ; \ - HelpID = MN_SUB_SEND ; \ + HelpID = HID_MN_SUB_SEND ; \ Command = ".uno:SendMenu" ; \ Text [ en-US ] = "Sen~d" ; \ SubMenu = Menu\ @@ -102,7 +102,7 @@ MenuItem\ {\ Identifier = SID_PAGESETUP ; \ - HelpID = SID_PAGESETUP ; \ + HelpId = CMD_SID_PAGESETUP ; \ Text [ en-US ] = "~Page..." ; \ }; // @@ -110,7 +110,7 @@ // #define MN_EDIT \ Identifier = 20 ; \ - HelpID = 20 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:EditMenu"; \ Text [ en-US ] = "~Edit" ; \ @@ -118,7 +118,7 @@ MenuItem\ {\ Identifier = SID_PASTE2 ; \ - HelpID = SID_PASTE2 ; \ + HelpId = CMD_SID_PASTE2 ; \ Text [ en-US ] = "Paste ~Special..." ; \ }; @@ -126,7 +126,7 @@ MenuItem\ {\ Identifier = SID_COPYOBJECTS ; \ - HelpID = SID_COPYOBJECTS ; \ + HelpId = CMD_SID_COPYOBJECTS ; \ Text [ en-US ] = "Duplicat~e..." ; \ }; @@ -134,7 +134,7 @@ MenuItem\ {\ Identifier = SID_POLYGON_MORPHING ; \ - HelpID = SID_POLYGON_MORPHING ; \ + HelpId = CMD_SID_POLYGON_MORPHING ; \ Text [ en-US ] = "Cross-fading..." ; \ }; @@ -142,7 +142,7 @@ MenuItem\ {\ Identifier = SID_MODIFY_FIELD ; \ - HelpID = SID_MODIFY_FIELD ; \ + HelpId = CMD_SID_MODIFY_FIELD ; \ Text [ en-US ] = "F~ields..." ; \ }; @@ -150,7 +150,7 @@ MenuItem\ {\ Identifier = SID_DELETE_LAYER ; \ - HelpID = SID_DELETE_LAYER ; \ + HelpId = CMD_SID_DELETE_LAYER ; \ Text [ en-US ] = "Delete ~Layer..." ; \ }; @@ -158,7 +158,7 @@ MenuItem\ {\ Identifier = SID_MANAGE_LINKS ; \ - HelpID = SID_MANAGE_LINKS ; \ + HelpId = CMD_SID_MANAGE_LINKS ; \ Text [ en-US ] = "Lin~ks..." ; \ }; // @@ -166,7 +166,7 @@ // #define MN_VIEW \ Identifier = 23 ; \ - HelpID = 23 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:ViewMenu" ; \ Text [ en-US ] = "~View" ; \ @@ -174,7 +174,7 @@ MenuItem\ {\ Identifier = SID_TOGGLETOOLBAR ; \ - HelpID = SID_TOGGLETOOLBAR ; \ + HelpId = CMD_SID_TOGGLETOOLBAR ; \ Text [ en-US ] = "Main ~Toolbar" ; \ }; @@ -182,7 +182,7 @@ MenuItem\ {\ Identifier = SID_TOGGLEOPTIONBAR ; \ - HelpID = SID_TOGGLEOPTIONBAR ; \ + HelpId = CMD_SID_TOGGLEOPTIONBAR ; \ Text [ en-US ] = "Optio~n Bar" ; \ }; @@ -190,7 +190,7 @@ MenuItem\ {\ Identifier = SID_TOGGLECOMMONTASKBAR ; \ - HelpID = SID_TOGGLECOMMONTASKBAR ; \ + HelpId = CMD_SID_TOGGLECOMMONTASKBAR ; \ Text [ en-US ] = "~Presentation" ; \ }; @@ -198,7 +198,7 @@ MenuItem\ {\ Identifier = SID_CUSTOMIZETOOLBOX ; \ - HelpID = SID_CUSTOMIZETOOLBOX ; \ + HelpId = CMD_SID_CUSTOMIZETOOLBOX ; \ Text [ en-US ] = "Customi~ze..." ; \ }; @@ -206,7 +206,7 @@ MenuItem\ {\ Identifier = SID_RULER ; \ - HelpID = SID_RULER ; \ + HelpId = CMD_SID_RULER ; \ Command = ".uno:ShowRuler" ; \ Text [ en-US ] = "~Rulers" ; \ }; @@ -216,7 +216,7 @@ MenuItem\ {\ Identifier = SID_NOTESMODE ; \ - HelpID = SID_NOTESMODE ; \ + HelpId = CMD_SID_NOTESMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Notes View" ; \ }; @@ -226,7 +226,7 @@ MenuItem\ {\ Identifier = SID_HANDOUTMODE ; \ - HelpID = SID_HANDOUTMODE ; \ + HelpId = CMD_SID_HANDOUTMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Handout View" ; \ }; @@ -235,7 +235,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_WIN ; \ - HelpID = SID_PREVIEW_WIN ; \ + HelpId = CMD_SID_PREVIEW_WIN ; \ Text [ en-US ] = "~Preview" ; \ }; @@ -243,7 +243,7 @@ MenuItem\ {\ Identifier = SID_PAGEMODE ; \ - HelpID = SID_PAGEMODE ; \ + HelpId = CMD_SID_PAGEMODE ; \ Check = TRUE ; \ Text [ en-US ] = "S~lide" ; \ }; @@ -252,7 +252,7 @@ MenuItem\ {\ Identifier = SID_SLIDE_MASTERPAGE ; \ - HelpID = SID_SLIDE_MASTERPAGE ; \ + HelpId = CMD_SID_SLIDE_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Slide Master" ; \ }; @@ -261,7 +261,7 @@ MenuItem\ {\ Identifier = SID_TITLE_MASTERPAGE ; \ - HelpID = SID_TITLE_MASTERPAGE ; \ + HelpId = CMD_SID_TITLE_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Title" ; \ }; @@ -270,7 +270,7 @@ MenuItem\ {\ Identifier = SID_NOTES_MASTERPAGE ; \ - HelpID = SID_NOTES_MASTERPAGE ; \ + HelpId = CMD_SID_NOTES_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Notes" ; \ }; @@ -279,7 +279,7 @@ MenuItem\ {\ Identifier = SID_HANDOUT_MASTERPAGE ; \ - HelpID = SID_HANDOUT_MASTERPAGE ; \ + HelpId = CMD_SID_HANDOUT_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Handout" ; \ }; @@ -288,7 +288,7 @@ MenuItem\ {\ Identifier = SID_LAYERMODE ; \ - HelpID = SID_LAYERMODE ; \ + HelpId = CMD_SID_LAYERMODE ; \ Check = TRUE ; \ Text [ en-US ] = "La~yer" ; \ }; @@ -297,7 +297,7 @@ MenuItem\ {\ Identifier = SID_HEADER_AND_FOOTER ; \ - HelpID = SID_HEADER_AND_FOOTER ; \ + HelpId = CMD_SID_HEADER_AND_FOOTER ; \ Text = "Kopf- und Fußzeile.."; \ }; @@ -305,7 +305,7 @@ MenuItem\ {\ Identifier = SID_INSERT_PAGE_NUMBER ; \ - HelpID = SID_INSERT_PAGE_NUMBER ; \ + HelpId = CMD_SID_INSERT_PAGE_NUMBER ; \ Text = "Seitenzahl..." ; \ }; @@ -313,7 +313,7 @@ MenuItem\ {\ Identifier = SID_INSERT_DATE_TIME ; \ - HelpID = SID_INSERT_DATE_TIME ; \ + HelpId = CMD_SID_INSERT_DATE_TIME ; \ Text = "Datum und Uhrzeit..." ; \ }; @@ -321,7 +321,7 @@ MenuItem\ {\ Identifier = MN_SUB_MASTER_LAYOUTS ; \ - HelpId = MN_SUB_MASTER_LAYOUTS; \ + HelpId = HID_MN_SUB_MASTER_LAYOUTS; \ Text = "Masterlayouts";\ SubMenu = Menu\ {\ @@ -330,19 +330,19 @@ MenuItem\ {\ Identifier = SID_MASTER_LAYOUTS_SLIDE ; \ - HelpID = SID_MASTER_LAYOUTS_SLIDE ; \ + HelpId = CMD_SID_MASTER_LAYOUTS_SLIDE ; \ Text = "Masterlayout..." ; \ };\ MenuItem\ {\ Identifier = SID_MASTER_LAYOUTS_NOTES ; \ - HelpID = SID_MASTER_LAYOUTS_NOTES ; \ + HelpId = CMD_SID_MASTER_LAYOUTS_NOTES ; \ Text = "Notizenmasterlayout..." ; \ };\ MenuItem\ {\ Identifier = SID_MASTER_LAYOUTS_HANDOUTS ; \ - HelpID = SID_MASTER_LAYOUTS_HANDOUTS ; \ + HelpId = CMD_SID_MASTER_LAYOUTS_HANDOUTS ; \ Text = "Handzettelmasterlayout..." ; \ };\ };\ @@ -354,7 +354,7 @@ MenuItem\ {\ Identifier = MN_SUB_VIEW ; \ - HelpID = MN_SUB_VIEW ; \ + HelpID = HID_MN_SUB_VIEW ; \ Command = ".uno:WorkspaceMenu" ; \ Text [ en-US ] = "Wor~kspace" ; \ SubMenu = Menu\ @@ -374,7 +374,7 @@ MenuItem\ {\ Identifier = MN_SUB_MASTERPAGE ; \ - HelpID = MN_SUB_MASTERPAGE ; \ + HelpID = HID_MN_SUB_MASTERPAGE ; \ Command = ".uno:MasterPageMenu" ; \ Text [ en-US ] = "~Master" ; \ SubMenu = Menu\ @@ -393,7 +393,7 @@ // #define MN_INSERT \ Identifier = 21 ; \ - HelpID = 21 ; \ + HelpID = "what a hack" ; \ Command = ".uno:InsertMenu" ; \ Text [ en-US ] = "~Insert" ; \ @@ -401,7 +401,7 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "Slid~e..." ; \ }; @@ -409,7 +409,7 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "Slid~e" ; \ }; @@ -417,7 +417,7 @@ MenuItem\ {\ Identifier = SID_DUPLICATE_PAGE ; \ - HelpID = SID_DUPLICATE_PAGE ; \ + HelpId = CMD_SID_DUPLICATE_PAGE ; \ Text [ en-US ] = "D~uplicate Slide" ; \ }; @@ -425,7 +425,7 @@ MenuItem\ {\ Identifier = SID_EXPAND_PAGE ; \ - HelpID = SID_EXPAND_PAGE ; \ + HelpId = CMD_SID_EXPAND_PAGE ; \ Text [ en-US ] = "E~xpand Slide" ; \ }; @@ -433,7 +433,7 @@ MenuItem\ {\ Identifier = SID_SUMMARY_PAGE ; \ - HelpID = SID_SUMMARY_PAGE ; \ + HelpId = CMD_SID_SUMMARY_PAGE ; \ Text [ en-US ] = "Su~mmary Slide" ; \ }; @@ -441,7 +441,7 @@ MenuItem\ {\ Identifier = SID_INSERTLAYER ; \ - HelpID = SID_INSERTLAYER ; \ + HelpId = CMD_SID_INSERTLAYER ; \ Text [ en-US ] = "~Layer..." ; \ }; @@ -449,7 +449,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_DATE_FIX ; \ - HelpID = SID_INSERT_FLD_DATE_FIX ; \ + HelpId = CMD_SID_INSERT_FLD_DATE_FIX ; \ Text [ en-US ] = "~Date (fixed)" ; \ }; @@ -457,7 +457,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_DATE_VAR ; \ - HelpID = SID_INSERT_FLD_DATE_VAR ; \ + HelpId = CMD_SID_INSERT_FLD_DATE_VAR ; \ Text [ en-US ] = "Dat~e (variable)" ; \ }; @@ -465,7 +465,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_TIME_FIX ; \ - HelpID = SID_INSERT_FLD_TIME_FIX ; \ + HelpId = CMD_SID_INSERT_FLD_TIME_FIX ; \ Text [ en-US ] = "~Time (fixed)" ; \ }; @@ -473,7 +473,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_TIME_VAR ; \ - HelpID = SID_INSERT_FLD_TIME_VAR ; \ + HelpId = CMD_SID_INSERT_FLD_TIME_VAR ; \ Text [ en-US ] = "T~ime (variable)" ; \ }; @@ -481,7 +481,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_PAGE ; \ - HelpID = SID_INSERT_FLD_PAGE ; \ + HelpId = CMD_SID_INSERT_FLD_PAGE ; \ Text [ en-US ] = "~Page Number" ; \ }; @@ -489,7 +489,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_FILE ; \ - HelpID = SID_INSERT_FLD_FILE ; \ + HelpId = CMD_SID_INSERT_FLD_FILE ; \ Text [ en-US ] = "~File Name" ; \ }; @@ -497,7 +497,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_AUTHOR ; \ - HelpID = SID_INSERT_FLD_AUTHOR ; \ + HelpId = CMD_SID_INSERT_FLD_AUTHOR ; \ Text [ en-US ] = "~Author" ; \ }; @@ -505,7 +505,7 @@ MenuItem\ {\ Identifier = SID_TWAIN_SELECT ; \ - HelpID = SID_TWAIN_SELECT ; \ + HelpId = CMD_SID_TWAIN_SELECT ; \ Text [ en-US ] = "~Select Source..." ; \ }; @@ -513,7 +513,7 @@ MenuItem\ {\ Identifier = SID_TWAIN_TRANSFER ; \ - HelpID = SID_TWAIN_TRANSFER ; \ + HelpId = CMD_SID_TWAIN_TRANSFER ; \ Text [ en-US ] = "~Request..." ; \ }; @@ -521,7 +521,7 @@ MenuItem\ {\ Identifier = SID_ATTR_TABLE ; \ - HelpID = SID_ATTR_TABLE ; \ + HelpId = CMD_SID_ATTR_TABLE ; \ Text [ en-US ] = "Sp~readsheet" ; \ }; @@ -536,7 +536,7 @@ MenuItem\ {\ Identifier = SID_INSERT_DIAGRAM ; \ - HelpID = SID_INSERT_DIAGRAM ; \ + HelpId = CMD_SID_INSERT_DIAGRAM ; \ Text [ en-US ] = "Chart" ; \ }; @@ -544,7 +544,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLOATINGFRAME ; \ - HelpID = SID_INSERT_FLOATINGFRAME ; \ + HelpId = CMD_SID_INSERT_FLOATINGFRAME ; \ Text [ en-US ] = "Float~ing Frame..." ; \ }; @@ -552,7 +552,7 @@ MenuItem\ {\ Identifier = SID_INSERTFILE ; \ - HelpID = SID_INSERTFILE ; \ + HelpId = CMD_SID_INSERTFILE ; \ Text [ en-US ] = "~File..." ; \ }; @@ -560,7 +560,7 @@ MenuItem\ {\ Identifier = MN_SUB_FIELD ; \ - HelpID = MN_SUB_FIELD ; \ + HelpID = HID_MN_SUB_FIELD ; \ Command = ".uno:FieldMenu" ; \ Text [ en-US ] = "Fiel~ds" ; \ SubMenu = Menu\ @@ -594,7 +594,7 @@ // #define MN_FORMAT \ Identifier = 22 ; \ - HelpID = 22 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:FormatMenu" ; \ Text [ en-US ] = "F~ormat" ; \ @@ -602,7 +602,7 @@ MenuItem\ {\ Identifier = SID_TEXTATTR_DLG ; \ - HelpID = SID_TEXTATTR_DLG ; \ + HelpId = CMD_SID_TEXTATTR_DLG ; \ Text [ en-US ] = "Te~xt..." ; \ }; @@ -610,7 +610,7 @@ MenuItem\ {\ Identifier = SID_MEASURE_DLG ; \ - HelpID = SID_MEASURE_DLG ; \ + HelpId = CMD_SID_MEASURE_DLG ; \ Text [ en-US ] = "Dimen~sions..." ; \ }; @@ -618,7 +618,7 @@ MenuItem\ {\ Identifier = SID_CONNECTION_DLG ; \ - HelpID = SID_CONNECTION_DLG ; \ + HelpId = CMD_SID_CONNECTION_DLG ; \ Text [ en-US ] = "~Connector..." ; \ }; @@ -626,7 +626,7 @@ MenuItem\ {\ Identifier = SID_MODIFYLAYER ; \ - HelpID = SID_MODIFYLAYER ; \ + HelpId = CMD_SID_MODIFYLAYER ; \ Text [ en-US ] = "~Layer..." ; \ }; @@ -635,7 +635,7 @@ MenuItem\ {\ Identifier = SID_MODIFYPAGE ; \ - HelpID = SID_MODIFYPAGE ; \ + HelpId = CMD_SID_MODIFYPAGE ; \ Text [ en-US ] = "Modify ~Layout..." ; \ }; @@ -643,7 +643,7 @@ MenuItem\ {\ Identifier = MN_SUB_TEMPLATES ; \ - HelpID = MN_SUB_TEMPLATES ; \ + HelpID = HID_MN_SUB_TEMPLATES ; \ Command = ".uno:TemplatesMenu" ; \ Text [ en-US ] = "Styl~es" ; \ SubMenu = Menu\ @@ -661,7 +661,7 @@ // #define MN_EXTRAS \ Identifier = ITEM_TOOLS_ID ; \ - HelpID = 25 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:ToolsMenu" ; \ Text [ en-US ] = "~Tools" ; \ @@ -671,7 +671,7 @@ /* ### ACHTUNG: Neuer Text in Resource! */ #define MN_SLIDESHOW \ Identifier = 26 ; \ - HelpID = 26 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:SlideShowMenu" ; \ Text [ en-US ] = "~Slide Show" ; \ @@ -679,7 +679,7 @@ MenuItem\ {\ Identifier = SID_SPELL_DIALOG ; \ - HelpID = SID_SPELL_DIALOG ; \ + HelpId = CMD_SID_SPELL_DIALOG ; \ Text [ en-US ] = "~Check..." ; \ }; @@ -687,7 +687,7 @@ MenuItem\ {\ Identifier = SID_AUTOSPELL_CHECK ; \ - HelpID = SID_AUTOSPELL_CHECK ; \ + HelpId = CMD_SID_AUTOSPELL_CHECK ; \ Text [ en-US ] = "~AutoSpellcheck" ; \ }; @@ -695,7 +695,7 @@ MenuItem\ {\ Identifier = SID_THESAURUS ; \ - HelpID = SID_THESAURUS ; \ + HelpId = CMD_SID_THESAURUS ; \ Text [ en-US ] = "~Thesaurus..." ; \ }; @@ -703,7 +703,7 @@ MenuItem\ {\ Identifier = SID_HYPHENATION ; \ - HelpID = SID_HYPHENATION ; \ + HelpId = CMD_SID_HYPHENATION ; \ Text [ en-US ] = "~Hyphenation" ; \ }; @@ -711,7 +711,7 @@ MenuItem\ {\ Identifier = SID_AUTO_CORRECT_DLG ; \ - HelpID = SID_AUTO_CORRECT_DLG ; \ + HelpId = CMD_SID_AUTO_CORRECT_DLG ; \ Text [ en-US ] = "~AutoCorrect..." ; \ }; @@ -720,7 +720,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATION_DLG ; \ - HelpID = SID_PRESENTATION_DLG ; \ + HelpId = CMD_SID_PRESENTATION_DLG ; \ Text [ en-US ] = "~Slide Show Settings..." ; \ }; @@ -729,7 +729,7 @@ MenuItem\ {\ Identifier = SID_CUSTOMSHOW_DLG ; \ - HelpID = SID_CUSTOMSHOW_DLG ; \ + HelpId = CMD_SID_CUSTOMSHOW_DLG ; \ Text [ en-US ] = "~Custom Slide Show..." ; \ }; @@ -737,7 +737,7 @@ MenuItem\ {\ Identifier = SID_ANIMATION_OBJECTS ; \ - HelpID = SID_ANIMATION_OBJECTS ; \ + HelpId = CMD_SID_ANIMATION_OBJECTS ; \ Text [ en-US ] = "~Animation" ; \ }; @@ -745,7 +745,7 @@ MenuItem\ {\ Identifier = SID_ANIMATION_EFFECTS ; \ - HelpID = SID_ANIMATION_EFFECTS ; \ + HelpId = CMD_SID_ANIMATION_EFFECTS ; \ Text [ en-US ] = "~Interaction..." ; \ }; @@ -753,7 +753,7 @@ MenuItem\ {\ Identifier = MN_SUB_SPELLING ; \ - HelpID = MN_SUB_SPELLING ; \ + HelpID = HID_MN_SUB_SPELLING ; \ Command = ".uno:SpellingMenu" ; \ Text [ en-US ] = "~Spellcheck" ; \ SubMenu = Menu\ @@ -770,7 +770,7 @@ // #define MN_MODIFY \ Identifier = 24 ; \ - HelpID = 24 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:ModifyMenu" ; \ Text [ en-US ] = "~Modify" ; \ @@ -778,7 +778,7 @@ MenuItem\ {\ Identifier = SID_MOREFRONT ; \ - HelpID = SID_MOREFRONT ; \ + HelpId = CMD_SID_MOREFRONT ; \ Text [ en-US ] = "Bring ~Forward" ; \ }; @@ -786,7 +786,7 @@ MenuItem\ {\ Identifier = SID_MOREBACK ; \ - HelpID = SID_MOREBACK ; \ + HelpId = CMD_SID_MOREBACK ; \ Text [ en-US ] = "Send Back~ward" ; \ }; @@ -794,7 +794,7 @@ MenuItem\ {\ Identifier = SID_BEFORE_OBJ ; \ - HelpID = SID_BEFORE_OBJ ; \ + HelpId = CMD_SID_BEFORE_OBJ ; \ Text [ en-US ] = "In Front of ~Object" ; \ }; @@ -802,7 +802,7 @@ MenuItem\ {\ Identifier = SID_BEHIND_OBJ ; \ - HelpID = SID_BEHIND_OBJ ; \ + HelpId = CMD_SID_BEHIND_OBJ ; \ Text [ en-US ] = "Be~hind Object" ; \ }; @@ -810,7 +810,7 @@ MenuItem\ {\ Identifier = SID_REVERSE_ORDER ; \ - HelpID = SID_REVERSE_ORDER ; \ + HelpId = CMD_SID_REVERSE_ORDER ; \ Text [ en-US ] = "~Reverse" ; \ }; @@ -818,7 +818,7 @@ MenuItem\ {\ Identifier = SID_BMPMASK ; \ - HelpID = SID_BMPMASK ; \ + HelpId = CMD_SID_BMPMASK ; \ Text [ en-US ] = "~Eyedropper" ; \ }; @@ -826,7 +826,7 @@ MenuItem\ {\ Identifier = SID_GALLERY; \ - HelpID = SID_GALLERY; \ + HelpId = CMD_SID_GALLERY; \ Text [ en-US ] = "~Gallery" ; \ }; @@ -834,7 +834,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_COLOR ; \ - HelpID = SID_OUTPUT_QUALITY_COLOR ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_COLOR ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Color" ; \ }; @@ -843,7 +843,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_GRAYSCALE ; \ - HelpID = SID_OUTPUT_QUALITY_GRAYSCALE ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_GRAYSCALE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Grayscale" ; \ }; @@ -852,7 +852,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_BLACKWHITE ; \ - HelpID = SID_OUTPUT_QUALITY_BLACKWHITE ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_BLACKWHITE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Black and White" ; \ }; @@ -861,7 +861,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_CONTRAST ; \ - HelpID = SID_OUTPUT_QUALITY_CONTRAST ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_CONTRAST ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~High Contrast";\ }; @@ -870,7 +870,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_COLOR ; \ - HelpID = SID_PREVIEW_QUALITY_COLOR ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_COLOR ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Color" ; \ }; @@ -879,7 +879,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_GRAYSCALE ; \ - HelpID = SID_PREVIEW_QUALITY_GRAYSCALE ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_GRAYSCALE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Grayscale" ; \ }; @@ -888,7 +888,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_BLACKWHITE ; \ - HelpID = SID_PREVIEW_QUALITY_BLACKWHITE ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_BLACKWHITE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Black and White" ; \ }; @@ -897,7 +897,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_CONTRAST ; \ - HelpID = SID_PREVIEW_QUALITY_CONTRAST ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_CONTRAST ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~High Contrast";\ }; @@ -906,7 +906,7 @@ MenuItem\ {\ Identifier = MN_SUB_POSITION ; \ - HelpID = MN_SUB_POSITION ; \ + HelpID = HID_MN_SUB_POSITION ; \ Command = ".uno:ArrangeMenu" ; \ Text [ en-US ] = "~Arrange" ; \ SubMenu = Menu\ @@ -949,7 +949,7 @@ MenuItem\ {\ Identifier = MN_SUB_OUTPUT_QUALITY ; \ - HelpID = MN_SUB_OUTPUT_QUALITY ; \ + HelpID = HID_MN_SUB_OUTPUT_QUALITY ; \ Command = ".uno:DisplayQualityMenu" ; \ SubMenu = Menu\ {\ @@ -968,7 +968,7 @@ MenuItem\ {\ Identifier = MN_SUB_PREVIEW_OUTPUT_QUALITY ; \ - HelpID = MN_SUB_PREVIEW_OUTPUT_QUALITY ; \ + HelpID = HID_MN_SUB_PREVIEW_OUTPUT_QUALITY ; \ Command = ".uno:PreviewDisplayQualityMenu" ; \ SubMenu = Menu\ {\ diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src index 09a90fdc0649..aae782b5fe1e 100644 --- a/sd/source/ui/app/menuids3_tmpl.src +++ b/sd/source/ui/app/menuids3_tmpl.src @@ -32,7 +32,7 @@ MenuItem\ {\ Identifier = SID_CHANGEBEZIER ; \ - HelpID = SID_CHANGEBEZIER ; \ + HelpId = CMD_SID_CHANGEBEZIER ; \ Text [ en-US ] = "To ~Curve" ; \ }; @@ -40,7 +40,7 @@ MenuItem\ {\ Identifier = SID_CHANGEPOLYGON ; \ - HelpID = SID_CHANGEPOLYGON ; \ + HelpId = CMD_SID_CHANGEPOLYGON ; \ Text [ en-US ] = "To ~Polygon" ; \ }; @@ -48,7 +48,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_CONTOUR ; \ - HelpID = SID_CONVERT_TO_CONTOUR ; \ + HelpId = CMD_SID_CONVERT_TO_CONTOUR ; \ Text [ en-US ] = "To C~ontour";\ }; @@ -56,7 +56,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_3D ; \ - HelpID = SID_CONVERT_TO_3D ; \ + HelpId = CMD_SID_CONVERT_TO_3D ; \ Text [ en-US ] = "To 3~D" ; \ }; @@ -64,7 +64,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_BITMAP ; \ - HelpID = SID_CONVERT_TO_BITMAP ; \ + HelpId = CMD_SID_CONVERT_TO_BITMAP ; \ Text [ en-US ] = "To ~Bitmap" ; \ }; @@ -72,7 +72,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_METAFILE ; \ - HelpID = SID_CONVERT_TO_METAFILE ; \ + HelpId = CMD_SID_CONVERT_TO_METAFILE ; \ Text [ en-US ] = "To ~Metafile" ; \ }; @@ -80,7 +80,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_3D_LATHE_FAST ; \ - HelpID = SID_CONVERT_TO_3D_LATHE_FAST ; \ + HelpId = CMD_SID_CONVERT_TO_3D_LATHE_FAST ; \ /* ### ACHTUNG: Neuer Text in Resource? In 3~D-Rotationskörper : In 3~D-Rotationsk÷rper */\ Text [ en-US ] = "To 3D ~Rotation Object" ; \ }; @@ -89,7 +89,7 @@ MenuItem\ {\ Identifier = SID_VERTICAL ; \ - HelpID = SID_VERTICAL ; \ + HelpId = CMD_SID_VERTICAL ; \ Text [ en-US ] = "~Vertically" ; \ }; @@ -97,7 +97,7 @@ MenuItem\ {\ Identifier = SID_HORIZONTAL ; \ - HelpID = SID_HORIZONTAL ; \ + HelpId = CMD_SID_HORIZONTAL ; \ Text [ en-US ] = "~Horizontally" ; \ }; @@ -105,7 +105,7 @@ MenuItem\ {\ Identifier = SID_3D_WIN ; \ - HelpID = SID_3D_WIN ; \ + HelpId = CMD_SID_3D_WIN ; \ Text [ en-US ] = "~3D Effects" ; \ }; @@ -113,7 +113,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATION_LAYOUT ; \ - HelpID = SID_PRESENTATION_LAYOUT ; \ + HelpId = CMD_SID_PRESENTATION_LAYOUT ; \ Text [ en-US ] = "~Slide Design" ; \ }; @@ -121,7 +121,7 @@ MenuItem\ {\ Identifier = SID_SLIDE_TRANSITIONS_PANEL ; \ - HelpID = SID_SLIDE_TRANSITIONS_PANEL ; \ + HelpId = CMD_SID_SLIDE_TRANSITIONS_PANEL ; \ Text [ en-US ] = "Slide ~Transition" ; \ }; @@ -129,7 +129,7 @@ MenuItem\ {\ Identifier = SID_SHOW_SLIDE ; \ - HelpID = SID_SHOW_SLIDE ; \ + HelpId = CMD_SID_SHOW_SLIDE ; \ Text [ en-US ] = "~Show Slide" ; \ }; @@ -137,7 +137,7 @@ MenuItem\ {\ Identifier = SID_HIDE_SLIDE ; \ - HelpID = SID_HIDE_SLIDE ; \ + HelpId = CMD_SID_HIDE_SLIDE ; \ Text [ en-US ] = "~Hide Slide" ; \ }; @@ -145,7 +145,7 @@ MenuItem\ {\ Identifier = SID_GROUP ; \ - HelpID = SID_GROUP ; \ + HelpId = CMD_SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ }; @@ -153,7 +153,7 @@ MenuItem\ {\ Identifier = SID_UNGROUP ; \ - HelpID = SID_UNGROUP ; \ + HelpId = CMD_SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ }; @@ -161,7 +161,7 @@ MenuItem\ {\ Identifier = SID_ENTER_GROUP ; \ - HelpID = SID_ENTER_GROUP ; \ + HelpId = CMD_SID_ENTER_GROUP ; \ Text [ en-US ] = "~Edit Group" ; \ }; @@ -169,7 +169,7 @@ MenuItem\ {\ Identifier = SID_LEAVE_GROUP ; \ - HelpID = SID_LEAVE_GROUP ; \ + HelpId = CMD_SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit group" ; \ }; @@ -177,7 +177,7 @@ MenuItem\ {\ Identifier = MN_SUB_GROUP ; \ - HelpID = MN_SUB_GROUP ; \ + HelpID = HID_MN_SUB_GROUP ; \ Command = ".uno:GroupMenu" ; \ Text [ en-US ] = "~Group" ; \ SubMenu = Menu\ diff --git a/sd/source/ui/app/menuids4_tmpl.src b/sd/source/ui/app/menuids4_tmpl.src index 9b077db8f22f..61a43aa6d8ba 100644 --- a/sd/source/ui/app/menuids4_tmpl.src +++ b/sd/source/ui/app/menuids4_tmpl.src @@ -36,7 +36,7 @@ MenuItem\ {\ Identifier = MN_SUB_GRAPHIC ; \ - HelpID = MN_SUB_GRAPHIC ; \ + HelpID = HID_MN_SUB_GRAPHIC ; \ Text [ en-US ] = "~Graphics" ; \ SubMenu = Menu\ {\ diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index e21caafaa739..1e313bbee2fc 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -27,6 +27,8 @@ #include <svx/dialogs.hrc> #include "app.hrc" #include "res_bmp.hrc" +#include "helpids.h" + #define SEPARATOR MenuItem { Separator = TRUE; }; // DUMMY ist eine ID wo ein SubMenu folgt // (muss jeweils immer erhoeht werden!) @@ -37,7 +39,7 @@ MenuItem\ {\ Identifier = SID_DISTRIBUTE_DLG ; \ - HelpID = SID_DISTRIBUTE_DLG ; \ + HelpId = CMD_SID_DISTRIBUTE_DLG ; \ Text [ en-US ] = "~Distribution..." ; \ }; @@ -46,7 +48,7 @@ MenuItem\ {\ Identifier = SID_DRAWINGMODE ; \ - HelpID = SID_DRAWINGMODE ; \ + HelpId = CMD_SID_DRAWINGMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Drawing View" ; \ }; @@ -55,7 +57,7 @@ MenuItem\ {\ Identifier = SID_OUTLINEMODE ; \ - HelpID = SID_OUTLINEMODE ; \ + HelpId = CMD_SID_OUTLINEMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Outline View" ; \ }; @@ -64,7 +66,7 @@ MenuItem\ {\ Identifier = SID_DIAMODE ; \ - HelpID = SID_DIAMODE ; \ + HelpId = CMD_SID_DIAMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Slide Sorter" ; \ }; @@ -73,7 +75,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATION ; \ - HelpID = SID_PRESENTATION ; \ + HelpId = CMD_SID_PRESENTATION ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmpräsentation... */\ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmpräsentation... */\ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmprõsentation */\ @@ -85,7 +87,7 @@ MenuItem\ {\ Identifier = SID_CAPTUREPOINT ; \ - HelpID = SID_CAPTUREPOINT ; \ + HelpId = CMD_SID_CAPTUREPOINT ; \ /* ### ACHTUNG: Neuer Text in Resource? F~angpunkt/-linie einfügen... : F~angpunkt/-linie einf³gen... */\ /* ### ACHTUNG: Neuer Text in Resource? Fangpunkt oder -linie einfügen : Fangpunkt oder -linie einf³gen */\ Text [ en-US ] = "~Insert Snap Point/Line..." ; \ @@ -95,7 +97,7 @@ MenuItem\ {\ Identifier = SID_SET_SNAPITEM ; \ - HelpID = SID_SET_SNAPITEM ; \ + HelpId = CMD_SID_SET_SNAPITEM ; \ /* ### ACHTUNG: Neuer Text in Resource? Fangobjekt bearbeiten oder löschen : Fangobjekt bearbeiten oder l÷schen */\ Text [ en-US ] = "~Edit..." ; \ }; @@ -104,7 +106,7 @@ MenuItem\ {\ Identifier = SID_DELETE_SNAPITEM ; \ - HelpID = SID_DELETE_SNAPITEM ; \ + HelpId = CMD_SID_DELETE_SNAPITEM ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\ /* ### ACHTUNG: Neuer Text in Resource? Fangobjekt löschen : Fangobjekt l÷schen */\ Text [ en-US ] = "~Delete" ; \ @@ -115,7 +117,7 @@ MenuItem\ {\ Identifier = SID_MODIFYPAGE ; \ - HelpID = SID_MODIFYPAGE ; \ + HelpId = CMD_SID_MODIFYPAGE ; \ Text [ en-US ] = "Slide ~Layout" ; \ }; @@ -123,7 +125,7 @@ MenuItem\ {\ Identifier = SID_PAGESETUP ; \ - HelpID = SID_PAGESETUP ; \ + HelpId = CMD_SID_PAGESETUP ; \ /* ### ACHTUNG: Neuer Text in Resource? Seitengröße, Ausrichtung, Rahmen festlegen : Seitengr÷˜e, Ausrichtung, Rahmen festlegen */\ Text [ en-US ] = "~Page Setup..." ; \ }; @@ -133,7 +135,7 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "~New Slide" ; \ }; @@ -141,7 +143,7 @@ MenuItem\ {\ Identifier = SID_INSERT_MASTER_PAGE ; \ - HelpID = SID_INSERT_MASTER_PAGE ; \ + HelpId = CMD_SID_INSERT_MASTER_PAGE ; \ Text [ en-US ] = "~New Master" ; \ }; @@ -149,28 +151,28 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "~New Page" ; \ }; #define MN_SELECT_BACKGROUND \ MenuItem\ {\ Identifier = SID_SELECT_BACKGROUND ; \ - HelpID = SID_SELECT_BACKGROUND ; \ + HelpId = CMD_SID_SELECT_BACKGROUND ; \ Text [ en-US ] = "Set Background Picture for Slide ..." ; \ }; #define MN_DISPLAY_MASTER_BACKGROUND \ MenuItem\ {\ Identifier = SID_DISPLAY_MASTER_BACKGROUND ; \ - HelpID = SID_DISPLAY_MASTER_BACKGROUND ; \ + HelpId = CMD_SID_DISPLAY_MASTER_BACKGROUND ; \ Text [ en-US ] = "Display Background of Master" ; \ }; #define MN_DISPLAY_MASTER_OBJECTS \ MenuItem\ {\ Identifier = SID_DISPLAY_MASTER_OBJECTS ; \ - HelpID = SID_DISPLAY_MASTER_OBJECTS ; \ + HelpId = CMD_SID_DISPLAY_MASTER_OBJECTS ; \ Text [ en-US ] = "Display Objects from Master" ; \ }; @@ -225,7 +227,7 @@ MenuItem\ {\ Identifier = SID_RENAMELAYER ; \ - HelpID = SID_RENAMELAYER ; \ + HelpId = CMD_SID_RENAMELAYER ; \ Text [ en-US ] = "~Rename Layer..." ; \ }; @@ -233,7 +235,7 @@ MenuItem\ {\ Identifier = SID_DELETE_PAGE ; \ - HelpID = SID_DELETE_PAGE ; \ + HelpId = CMD_SID_DELETE_PAGE ; \ Text [ en-US ] = "D~elete Slide" ; \ }; @@ -241,7 +243,7 @@ MenuItem\ {\ Identifier = SID_DELETE_MASTER_PAGE ; \ - HelpID = SID_DELETE_MASTER_PAGE ; \ + HelpId = CMD_SID_DELETE_MASTER_PAGE ; \ Text [ en-US ] = "D~elete Master" ; \ }; @@ -251,7 +253,7 @@ MenuItem\ {\ Identifier = SID_DELETE_PAGE ; \ - HelpID = SID_DELETE_PAGE ; \ + HelpId = CMD_SID_DELETE_PAGE ; \ Text [ en-US ] = "D~elete Page" ; \ }; @@ -259,7 +261,7 @@ MenuItem\ {\ Identifier = SID_RENAMEPAGE ; \ - HelpID = SID_RENAMEPAGE ; \ + HelpId = CMD_SID_RENAMEPAGE ; \ Text [ en-US ] = "~Rename Slide" ; \ }; @@ -267,7 +269,7 @@ MenuItem\ {\ Identifier = SID_RENAME_MASTER_PAGE ; \ - HelpID = SID_RENAME_MASTER_PAGE ; \ + HelpId = CMD_SID_RENAME_MASTER_PAGE ; \ Text [ en-US ] = "~Rename Master" ; \ }; @@ -275,7 +277,7 @@ MenuItem\ {\ Identifier = SID_RENAMEPAGE ; \ - HelpID = SID_RENAMEPAGE ; \ + HelpId = CMD_SID_RENAMEPAGE ; \ Text [ en-US ] = "~Rename Page" ; \ }; @@ -284,7 +286,7 @@ MenuItem\ {\ Identifier = SID_ATTRIBUTES_LINE ; \ - HelpID = SID_ATTRIBUTES_LINE ; \ + HelpId = CMD_SID_ATTRIBUTES_LINE ; \ Text [ en-US ] = "L~ine..." ; \ }; @@ -292,7 +294,7 @@ MenuItem\ {\ Identifier = SID_ATTRIBUTES_AREA ; \ - HelpID = SID_ATTRIBUTES_AREA ; \ + HelpId = CMD_SID_ATTRIBUTES_AREA ; \ Text [ en-US ] = "~Area..." ; \ }; @@ -300,7 +302,7 @@ MenuItem\ {\ Identifier = SID_TEXTATTR_DLG ; \ - HelpID = SID_TEXTATTR_DLG ; \ + HelpId = CMD_SID_TEXTATTR_DLG ; \ Text [ en-US ] = "~Text..." ; \ }; @@ -308,7 +310,7 @@ MenuItem\ {\ Identifier = SID_CONNECTION_DLG ; \ - HelpID = SID_CONNECTION_DLG ; \ + HelpId = CMD_SID_CONNECTION_DLG ; \ Text [ en-US ] = "~Connector..." ; \ }; @@ -316,7 +318,7 @@ MenuItem\ {\ Identifier = SID_CONNECTION_NEW_ROUTING ; \ - HelpID = SID_CONNECTION_NEW_ROUTING ; \ + HelpId = CMD_SID_CONNECTION_NEW_ROUTING ; \ /* ### ACHTUNG: Neuer Text in Resource? Linienverlauf ~zurücksetzen : Linienverlauf ~zur³cksetzen */\ Text [ en-US ] = "Reset ~Routing" ; \ }; @@ -325,7 +327,7 @@ MenuItem\ {\ Identifier = SID_MEASURE_DLG ; \ - HelpID = SID_MEASURE_DLG ; \ + HelpId = CMD_SID_MEASURE_DLG ; \ /* ### ACHTUNG: Neuer Text in Resource? Bema~ßung... : Bema~˜ung... */\ Text [ en-US ] = "Dimen~sions..." ; \ }; @@ -334,7 +336,7 @@ MenuItem\ {\ Identifier = SID_ATTR_TRANSFORM ; \ - HelpID = SID_ATTR_TRANSFORM ; \ + HelpId = CMD_SID_ATTR_TRANSFORM ; \ Text [ en-US ] = "Position and Si~ze..." ; \ }; @@ -342,7 +344,7 @@ MenuItem\ {\ Identifier = SID_BEZIER_EDIT ; \ - HelpID = SID_BEZIER_EDIT ; \ + HelpId = CMD_SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ; \ }; @@ -351,7 +353,7 @@ MenuItem\ {\ Identifier = SID_POSITION ; \ - HelpID = SID_POSITION ; \ + HelpId = CMD_SID_POSITION ; \ Command = ".uno:ObjectPosition"; \ Text [ en-US ] = "Arra~nge" ; \ SubMenu = Menu\ @@ -361,25 +363,25 @@ MenuItem\ {\ Identifier = SID_FRAME_TO_TOP ; \ - HelpID = SID_FRAME_TO_TOP ; \ + HelpId = CMD_SID_FRAME_TO_TOP ; \ Text [ en-US ] = "~Bring to Front" ; \ };\ MenuItem\ {\ Identifier = SID_MOREFRONT ; \ - HelpID = SID_MOREFRONT ; \ + HelpId = CMD_SID_MOREFRONT ; \ Text [ en-US ] = "Bring ~Forward" ; \ };\ MenuItem\ {\ Identifier = SID_MOREBACK ; \ - HelpID = SID_MOREBACK ; \ + HelpId = CMD_SID_MOREBACK ; \ Text [ en-US ] = "Send Back~ward" ; \ };\ MenuItem\ {\ Identifier = SID_FRAME_TO_BOTTOM ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ + HelpId = CMD_SID_FRAME_TO_BOTTOM ; \ Text [ en-US ] = "~Send to Back" ; \ };\ MenuItem\ @@ -389,13 +391,13 @@ MenuItem\ {\ Identifier = SID_BEFORE_OBJ ; \ - HelpID = SID_BEFORE_OBJ ; \ + HelpId = CMD_SID_BEFORE_OBJ ; \ Text [ en-US ] = "In Front of ~Object" ; \ };\ MenuItem\ {\ Identifier = SID_BEHIND_OBJ ; \ - HelpID = SID_BEHIND_OBJ ; \ + HelpId = CMD_SID_BEHIND_OBJ ; \ Text [ en-US ] = "Be~hind Object" ; \ };\ MenuItem\ @@ -405,7 +407,7 @@ MenuItem\ {\ Identifier = SID_REVERSE_ORDER ; \ - HelpID = SID_REVERSE_ORDER ; \ + HelpId = CMD_SID_REVERSE_ORDER ; \ Text [ en-US ] = "~Reverse" ; \ };\ };\ @@ -417,7 +419,7 @@ MenuItem\ {\ Identifier = SID_CHAR_DLG ; \ - HelpID = SID_CHAR_DLG ; \ + HelpId = CMD_SID_CHAR_DLG ; \ Text [ en-US ] = "C~haracter..." ; \ /* ### ACHTUNG: Neuer Text in Resource? Zeichenattribute für den selektierten Bereich auswählen : Zeichenattribute f³r den selektierten Bereich auswõhlen */\ }; @@ -426,7 +428,7 @@ MN_CHAR \ MenuItem {\ Identifier = SID_PARA_DLG;\ - HelpID = SID_PARA_DLG;\ + HelpId = CMD_SID_PARA_DLG;\ Text [ en-US ] = "P~aragraph...";\ }; @@ -434,13 +436,13 @@ MenuItem\ {\ Identifier = SID_ATTR_CHAR_FONT ; \ - HelpID = SID_ATTR_CHAR_FONT ; \ + HelpId = CMD_SID_ATTR_CHAR_FONT ; \ Text [ en-US ] = "~Font" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ + HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Größe : ~Gr÷˜e */\ Text [ en-US ] = "~Size" ; \ };\ @@ -456,43 +458,43 @@ MenuItem\ {\ Identifier = SID_ATTR_CHAR_WEIGHT ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ + HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; \ Text [ en-US ] = "Bold" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_POSTURE ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ + HelpId = CMD_SID_ATTR_CHAR_POSTURE ; \ Text [ en-US ] = "Italic" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_OVERLINE ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ + HelpId = CMD_SID_ATTR_CHAR_OVERLINE ; \ Text [ en-US ] = "Overline" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_UNDERLINE ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ + HelpId = CMD_SID_ATTR_CHAR_UNDERLINE ; \ Text [ en-US ] = "Underline" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_STRIKEOUT ; \ - HelpID = SID_ATTR_CHAR_STRIKEOUT ; \ + HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT ; \ Text [ en-US ] = "Strikethrough" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_SHADOWED ; \ - HelpID = SID_ATTR_CHAR_SHADOWED ; \ + HelpId = CMD_SID_ATTR_CHAR_SHADOWED ; \ Text [ en-US ] = "Shadow" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_CONTOUR ; \ - HelpID = SID_ATTR_CHAR_CONTOUR ; \ + HelpId = CMD_SID_ATTR_CHAR_CONTOUR ; \ Text [ en-US ] = "~Contour" ; \ };\ };\ @@ -512,21 +514,21 @@ MenuItem\ {\ Identifier = SID_ATTR_PARA_LINESPACE_10 ; \ - HelpID = SID_ATTR_PARA_LINESPACE_10 ; \ + HelpId = CMD_SID_ATTR_PARA_LINESPACE_10 ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Single Line Spacing" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_LINESPACE_15 ; \ - HelpID = SID_ATTR_PARA_LINESPACE_15 ; \ + HelpId = CMD_SID_ATTR_PARA_LINESPACE_15 ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "1.5 Lines" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_LINESPACE_20 ; \ - HelpID = SID_ATTR_PARA_LINESPACE_20 ; \ + HelpId = CMD_SID_ATTR_PARA_LINESPACE_20 ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Double" ; \ };\ @@ -538,7 +540,7 @@ MenuItem\ {\ Identifier = SID_CHARMAP ; \ - HelpID = SID_CHARMAP ; \ + HelpId = CMD_SID_CHARMAP ; \ Text [ en-US ] = "S~pecial Character..." ; \ }; @@ -556,28 +558,28 @@ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Left" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Right" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Centered" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Justified" ; \ };\ @@ -591,7 +593,7 @@ {\ Identifier = SID_OBJECT_ALIGN ; \ Command = ".uno:AlignObjetMenu" ; \ - HelpID = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "Al~ignment" ; \ SubMenu = Menu\ {\ @@ -600,38 +602,38 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_LEFT ; \ - HelpID = SID_OBJECT_ALIGN_LEFT ; \ + HelpId = CMD_SID_OBJECT_ALIGN_LEFT ; \ Text [ en-US ] = "~Left" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_CENTER ; \ - HelpID = SID_OBJECT_ALIGN_CENTER ; \ + HelpId = CMD_SID_OBJECT_ALIGN_CENTER ; \ Text [ en-US ] = "~Centered" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_RIGHT ; \ - HelpID = SID_OBJECT_ALIGN_RIGHT ; \ + HelpId = CMD_SID_OBJECT_ALIGN_RIGHT ; \ Text [ en-US ] = "~Right" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_UP ; \ - HelpID = SID_OBJECT_ALIGN_UP ; \ + HelpId = CMD_SID_OBJECT_ALIGN_UP ; \ Text [ en-US ] = "~Top" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_MIDDLE ; \ - HelpID = SID_OBJECT_ALIGN_MIDDLE ; \ + HelpId = CMD_SID_OBJECT_ALIGN_MIDDLE ; \ Text [ en-US ] = "C~enter" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_DOWN ; \ - HelpID = SID_OBJECT_ALIGN_DOWN ; \ + HelpId = CMD_SID_OBJECT_ALIGN_DOWN ; \ Text [ en-US ] = "~Bottom" ; \ };\ };\ @@ -643,7 +645,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_CLOSE ; \ - HelpID = SID_OBJECT_CLOSE ; \ + HelpId = CMD_SID_OBJECT_CLOSE ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Objekt schließen : ~Objekt schlie˜en */\ Text [ en-US ] = "Close ~Object" ; \ }; @@ -652,27 +654,27 @@ MenuItem\ {\ Identifier = SID_BEZIER_EDIT ; \ - HelpID = SID_BEZIER_EDIT ; \ + HelpId = CMD_SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_BEZIER_MOVE ; \ - HelpID = SID_BEZIER_MOVE ; \ + HelpId = CMD_SID_BEZIER_MOVE ; \ Text [ en-US ] = "~Move Points" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_INSERT ; \ - HelpID = SID_BEZIER_INSERT ; \ + HelpId = CMD_SID_BEZIER_INSERT ; \ /* ### ACHTUNG: Neuer Text in Resource? Punkte ~einfügen : Punkte ~einf³gen */\ Text [ en-US ] = "Insert ~Points" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_DELETE ; \ - HelpID = SID_BEZIER_DELETE ; \ + HelpId = CMD_SID_BEZIER_DELETE ; \ /* ### ACHTUNG: Neuer Text in Resource? Punkte l~öschen : Punkte l~÷schen */\ Text [ en-US ] = "~Delete Points" ; \ };\ @@ -680,46 +682,46 @@ MenuItem\ {\ Identifier = SID_BEZIER_CLOSE ; \ - HelpID = SID_BEZIER_CLOSE ; \ + HelpId = CMD_SID_BEZIER_CLOSE ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Objekt schließen : ~Objekt schlie˜en */\ Text [ en-US ] = "Close ~Object" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_CUTLINE ; \ - HelpID = SID_BEZIER_CUTLINE ; \ + HelpId = CMD_SID_BEZIER_CUTLINE ; \ Text [ en-US ] = "~Split Curve" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_CONVERT ; \ - HelpID = SID_BEZIER_CONVERT ; \ + HelpId = CMD_SID_BEZIER_CONVERT ; \ Text [ en-US ] = "Con~vert to Curve" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_BEZIER_EDGE ; \ - HelpID = SID_BEZIER_EDGE ; \ + HelpId = CMD_SID_BEZIER_EDGE ; \ Text [ en-US ] = "~Corner" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_SMOOTH ; \ - HelpID = SID_BEZIER_SMOOTH ; \ + HelpId = CMD_SID_BEZIER_SMOOTH ; \ Text [ en-US ] = "Smoot~h" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_SYMMTR ; \ - HelpID = SID_BEZIER_SYMMTR ; \ + HelpId = CMD_SID_BEZIER_SYMMTR ; \ Text [ en-US ] = "S~ymmetric" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_BEZIER_ELIMINATE_POINTS ; \ - HelpID = SID_BEZIER_ELIMINATE_POINTS ; \ + HelpId = CMD_SID_BEZIER_ELIMINATE_POINTS ; \ Text [ en-US ] = "~Reduce Points" ; \ }; @@ -728,7 +730,7 @@ MenuItem\ {\ Identifier = SID_GROUP ; \ - HelpID = SID_GROUP ; \ + HelpId = CMD_SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Objekte gruppieren : Ausgewõhlte Objekte gruppieren */\ }; @@ -737,7 +739,7 @@ MenuItem\ {\ Identifier = SID_UNGROUP ; \ - HelpID = SID_UNGROUP ; \ + HelpId = CMD_SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ }; @@ -745,7 +747,7 @@ MenuItem\ {\ Identifier = SID_COMBINE ; \ - HelpID = SID_COMBINE ; \ + HelpId = CMD_SID_COMBINE ; \ Text [ en-US ] = "Comb~ine" ; \ /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Objekte kombinieren : Ausgewõhlte Objekte kombinieren */\ }; @@ -754,7 +756,7 @@ MenuItem\ {\ Identifier = SID_DISMANTLE ; \ - HelpID = SID_DISMANTLE ; \ + HelpId = CMD_SID_DISMANTLE ; \ Text [ en-US ] = "~Split" ; \ }; @@ -762,7 +764,7 @@ MenuItem\ {\ Identifier = SID_ENTER_GROUP ; \ - HelpID = SID_ENTER_GROUP ; \ + HelpId = CMD_SID_ENTER_GROUP ; \ Text [ en-US ] = "~Enter Group" ; \ /* ### ACHTUNG: Neuer Text in Resource? Objekte der Gruppierung können bearbeitet werden : Objekte der Gruppierung k÷nnen bearbeitet werden */\ }; @@ -771,7 +773,7 @@ MenuItem\ {\ Identifier = SID_LEAVE_GROUP ; \ - HelpID = SID_LEAVE_GROUP ; \ + HelpId = CMD_SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit Group" ; \ /* ### ACHTUNG: Neuer Text in Resource? Objekte der Gruppierung können nicht mehr bearbeitet werden : Objekte der Gruppierung k÷nnen nicht mehr bearbeitet werden */\ }; @@ -780,7 +782,7 @@ MenuItem\ {\ Identifier = SID_NAME_GROUP ; \ - HelpID = SID_NAME_GROUP ; \ + HelpId = CMD_SID_NAME_GROUP ; \ Text [ en-US ] = "Name..." ; \ }; @@ -789,7 +791,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_TITLE_DESCRIPTION; \ - HelpID = SID_OBJECT_TITLE_DESCRIPTION; \ + HelpId = CMD_SID_OBJECT_TITLE_DESCRIPTION; \ Text [ en-US ] = "Description..." ; \ }; @@ -798,7 +800,7 @@ MenuItem\ {\ Identifier = SID_REHEARSE_TIMINGS ; \ - HelpID = SID_REHEARSE_TIMINGS ; \ + HelpId = CMD_SID_REHEARSE_TIMINGS ; \ Text [ en-US ] = "~Rehearse Timings" ; \ }; @@ -806,7 +808,7 @@ MenuItem\ {\ Identifier = SID_CUSTOM_ANIMATION_PANEL ; \ - HelpID = SID_CUSTOM_ANIMATION_PANEL ; \ + HelpId = CMD_SID_CUSTOM_ANIMATION_PANEL ; \ Text [ en-US ] = "Custom Animation..." ; \ }; @@ -814,7 +816,7 @@ MenuItem\ {\ Identifier = SID_ANIMATION_EFFECTS ; \ - HelpID = SID_ANIMATION_EFFECTS ; \ + HelpId = CMD_SID_ANIMATION_EFFECTS ; \ Text [ en-US ] = "Int~eraction..." ; \ }; @@ -822,7 +824,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATIONOBJECT ; \ - HelpID = SID_PRESENTATIONOBJECT ; \ + HelpId = CMD_SID_PRESENTATIONOBJECT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Präsentationsobjekt... : ~Prõsentationsobjekt... */\ /* ### ACHTUNG: Neuer Text in Resource? Selektiertes Präsentationsobjekt bearbeiten : Selektiertes Prõsentationsobjekt bearbeiten */\ Text [ en-US ] = "Presentation ~Object..." ; \ @@ -833,7 +835,7 @@ MenuItem\ {\ Identifier = SID_DELETE ; \ - HelpID = SID_DELETE ; \ + HelpId = CMD_SID_DELETE ; \ /* ### ACHTUNG: Neuer Text in Resource? L~öschen : L~÷schen */\ Text [ en-US ] = "~Delete" ; \ /* ### ACHTUNG: Neuer Text in Resource? Alle selektierten Objekte löschen : Alle selektierten Objekte l÷schen */\ @@ -844,7 +846,7 @@ MenuItem\ {\ Identifier = SID_SET_DEFAULT ; \ - HelpID = SID_SET_DEFAULT ; \ + HelpId = CMD_SID_SET_DEFAULT ; \ Text [ en-US ] = "~Default" ; \ }; @@ -852,7 +854,7 @@ MenuItem\ {\ Identifier = SID_FONTWORK ; \ - HelpID = SID_FONTWORK ; \ + HelpId = CMD_SID_FONTWORK ; \ Text [ en-US ] = "F~ontwork" ; \ }; @@ -860,7 +862,7 @@ MenuItem\ {\ Identifier = SID_OBJECT ; \ - HelpID = SID_OBJECT ; \ + HelpId = CMD_SID_OBJECT ; \ Text [ en-US ] = "~OLE Object" ; \ }; @@ -868,7 +870,7 @@ MenuItem\ {\ Identifier = SID_ORIGINAL_SIZE ; \ - HelpID = SID_ORIGINAL_SIZE ; \ + HelpId = CMD_SID_ORIGINAL_SIZE ; \ Text [ en-US ] = "~Original Size" ; \ }; @@ -876,7 +878,7 @@ MenuItem\ {\ Identifier = SID_SAVEGRAPHIC ; \ - HelpID = SID_SAVEGRAPHIC ; \ + HelpId = CMD_SID_SAVEGRAPHIC ; \ Text [ en-US ] = "Save as Picture..." ; \ }; @@ -884,7 +886,7 @@ MenuItem\ {\ Identifier = SID_ATTR_GRAF_CROP ; \ - HelpID = SID_ATTR_GRAF_CROP ; \ + HelpId = CMD_SID_ATTR_GRAF_CROP ; \ Text [ en-US ] = "Crop Picture..." ; \ }; @@ -893,7 +895,7 @@ {\ Identifier = SID_NAVIGATOR ; \ Command = ".uno:Navigator" ; \ - HelpID = SID_NAVIGATOR ; \ + HelpId = CMD_SID_NAVIGATOR ; \ Text [ en-US ] = "Na~vigator" ; \ }; @@ -901,7 +903,7 @@ MenuItem\ {\ Identifier = SID_GLUE_INSERT_POINT ; \ - HelpID = SID_GLUE_INSERT_POINT ; \ + HelpId = CMD_SID_GLUE_INSERT_POINT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Punkt einfügen : ~Punkt einf³gen */\ Text [ en-US ] = "Insert ~Point" ; \ }; @@ -910,7 +912,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_LEFT ; \ - HelpID = SID_GLUE_ESCDIR_LEFT ; \ + HelpId = CMD_SID_GLUE_ESCDIR_LEFT ; \ Text [ en-US ] = "~Left" ; \ }; @@ -918,7 +920,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_TOP ; \ - HelpID = SID_GLUE_ESCDIR_TOP ; \ + HelpId = CMD_SID_GLUE_ESCDIR_TOP ; \ Text [ en-US ] = "~Top" ; \ }; @@ -926,7 +928,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_RIGHT ; \ - HelpID = SID_GLUE_ESCDIR_RIGHT ; \ + HelpId = CMD_SID_GLUE_ESCDIR_RIGHT ; \ Text [ en-US ] = "~Right" ; \ }; @@ -934,7 +936,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_BOTTOM ; \ - HelpID = SID_GLUE_ESCDIR_BOTTOM ; \ + HelpId = CMD_SID_GLUE_ESCDIR_BOTTOM ; \ Text [ en-US ] = "~Bottom" ; \ }; @@ -942,7 +944,7 @@ MenuItem\ {\ Identifier = SID_GLUE_PERCENT ; \ - HelpID = SID_GLUE_PERCENT ; \ + HelpId = CMD_SID_GLUE_PERCENT ; \ Text [ en-US ] = "~Adapt Position to Object" ; \ }; @@ -950,7 +952,7 @@ MenuItem\ {\ Identifier = SID_GLUE_HORZALIGN_LEFT ; \ - HelpID = SID_GLUE_HORZALIGN_LEFT ; \ + HelpId = CMD_SID_GLUE_HORZALIGN_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed ~Horizontal Left" ; \ }; @@ -959,7 +961,7 @@ MenuItem\ {\ Identifier = SID_GLUE_HORZALIGN_CENTER ; \ - HelpID = SID_GLUE_HORZALIGN_CENTER ; \ + HelpId = CMD_SID_GLUE_HORZALIGN_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed Horizontal ~Center" ; \ }; @@ -968,7 +970,7 @@ MenuItem\ {\ Identifier = SID_GLUE_HORZALIGN_RIGHT ; \ - HelpID = SID_GLUE_HORZALIGN_RIGHT ; \ + HelpId = CMD_SID_GLUE_HORZALIGN_RIGHT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed Hori~zontal Right" ; \ }; @@ -977,7 +979,7 @@ MenuItem\ {\ Identifier = SID_GLUE_VERTALIGN_TOP ; \ - HelpID = SID_GLUE_VERTALIGN_TOP ; \ + HelpId = CMD_SID_GLUE_VERTALIGN_TOP ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed ~Vertical Top" ; \ }; @@ -986,7 +988,7 @@ MenuItem\ {\ Identifier = SID_GLUE_VERTALIGN_CENTER ; \ - HelpID = SID_GLUE_VERTALIGN_CENTER ; \ + HelpId = CMD_SID_GLUE_VERTALIGN_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed V~ertical Center" ; \ }; @@ -995,7 +997,7 @@ MenuItem\ {\ Identifier = SID_GLUE_VERTALIGN_BOTTOM ; \ - HelpID = SID_GLUE_VERTALIGN_BOTTOM ; \ + HelpId = CMD_SID_GLUE_VERTALIGN_BOTTOM ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed Ver~tical Bottom" ; \ }; @@ -1004,7 +1006,7 @@ MenuItem\ {\ Identifier = SID_GRID_VISIBLE ; \ - HelpID = SID_GRID_VISIBLE ; \ + HelpId = CMD_SID_GRID_VISIBLE ; \ Text [ en-US ] = "~Visible Grid" ; \ }; @@ -1012,7 +1014,7 @@ MenuItem\ {\ Identifier = SID_GRID_USE ; \ - HelpID = SID_GRID_USE; \ + HelpId = CMD_SID_GRID_USE; \ Text [ en-US ] = "Snap to Grid"; \ }; @@ -1020,7 +1022,7 @@ MenuItem\ {\ Identifier = SID_GRID_FRONT ; \ - HelpID = SID_GRID_FRONT ; \ + HelpId = CMD_SID_GRID_FRONT ; \ Text [ en-US ] = "Grid to ~Front" ; \ }; @@ -1045,7 +1047,7 @@ MenuItem\ {\ Identifier = SID_HELPLINES_VISIBLE ; \ - HelpID = SID_HELPLINES_VISIBLE ; \ + HelpId = CMD_SID_HELPLINES_VISIBLE ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Fanglinien sichtbar : ~Hilfslinien sichtbar */\ Text [ en-US ] = "~Snap Lines Visible" ; \ }; @@ -1054,7 +1056,7 @@ MenuItem\ {\ Identifier = SID_HELPLINES_USE ; \ - HelpID = SID_HELPLINES_USE ; \ + HelpId = CMD_SID_HELPLINES_USE ; \ Text [ en-US ] = "Snap to Snap Lines"; \ }; @@ -1062,7 +1064,7 @@ MenuItem\ {\ Identifier = SID_HELPLINES_FRONT ; \ - HelpID = SID_HELPLINES_FRONT ; \ + HelpId = CMD_SID_HELPLINES_FRONT ; \ /* ### ACHTUNG: Neuer Text in Resource? Fanglini~en vorn : H~ilfslinien vorn */\ Text [ en-US ] = "Snap Lines to Front" ; \ }; @@ -1088,7 +1090,7 @@ MenuItem\ {\ Identifier = SID_SHOW_BROWSER ; \ - HelpID = SID_SHOW_BROWSER ; \ + HelpId = CMD_SID_SHOW_BROWSER ; \ Text [ en-US ] = "Propert~ies..." ; \ }; @@ -1096,7 +1098,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_1BIT_THRESHOLD ; \ - HelpID = SID_CONVERT_TO_1BIT_THRESHOLD ; \ + HelpId = CMD_SID_CONVERT_TO_1BIT_THRESHOLD ; \ Text [ en-US ] = "1Bit ~Threshold" ; \ }; @@ -1104,7 +1106,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_1BIT_MATRIX ; \ - HelpID = SID_CONVERT_TO_1BIT_MATRIX ; \ + HelpId = CMD_SID_CONVERT_TO_1BIT_MATRIX ; \ Text [ en-US ] = "1 Bit ~Dithering" ; \ }; @@ -1112,7 +1114,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_4BIT_GRAYS ; \ - HelpID = SID_CONVERT_TO_4BIT_GRAYS ; \ + HelpId = CMD_SID_CONVERT_TO_4BIT_GRAYS ; \ Text [ en-US ] = "4 Bit G~rayscales" ; \ }; @@ -1120,7 +1122,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_4BIT_COLORS ; \ - HelpID = SID_CONVERT_TO_4BIT_COLORS ; \ + HelpId = CMD_SID_CONVERT_TO_4BIT_COLORS ; \ Text [ en-US ] = "4 Bit ~Color Palette" ; \ }; @@ -1128,7 +1130,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_8BIT_GRAYS ; \ - HelpID = SID_CONVERT_TO_8BIT_GRAYS ; \ + HelpId = CMD_SID_CONVERT_TO_8BIT_GRAYS ; \ Text [ en-US ] = "8 Bit Gr~ayscales" ; \ }; @@ -1136,7 +1138,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_8BIT_COLORS ; \ - HelpID = SID_CONVERT_TO_8BIT_COLORS ; \ + HelpId = CMD_SID_CONVERT_TO_8BIT_COLORS ; \ Text [ en-US ] = "8 Bit C~olor Palette" ; \ }; @@ -1144,7 +1146,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_24BIT ; \ - HelpID = SID_CONVERT_TO_24BIT ; \ + HelpId = CMD_SID_CONVERT_TO_24BIT ; \ Text [ en-US ] = "24 Bit ~True Colors" ; \ }; @@ -1175,7 +1177,7 @@ {\ Identifier = SID_CONVERT ; \ Command = ".uno:ConvertMenu" ; \ - HelpID = SID_CONVERT ; \ + HelpId = HID_MN_SUB_CONVERT ; \ Text [ en-US ] = "Con~vert" ; \ SubMenu = Menu\ {\ @@ -1196,7 +1198,7 @@ MenuItem\ {\ Identifier = SID_MIRROR ; \ - HelpID = SID_MIRROR ; \ + HelpId = HID_MN_SUB_MIRROR ; \ Command = ".uno:MirrorMenu" ; \ Text [ en-US ] = "~Flip" ; \ SubMenu = Menu\ @@ -1213,7 +1215,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ROTATE ; \ - HelpID = SID_OBJECT_ROTATE ; \ + HelpId = CMD_SID_OBJECT_ROTATE ; \ Text [ en-US ] = "~Rotate";\ }; @@ -1221,7 +1223,7 @@ MenuItem\ {\ Identifier = SID_CONNECT ; \ - HelpID = SID_CONNECT ; \ + HelpId = CMD_SID_CONNECT ; \ Text [ en-US ] = "C~onnect" ; \ }; @@ -1229,7 +1231,7 @@ MenuItem\ {\ Identifier = SID_BREAK ; \ - HelpID = SID_BREAK ; \ + HelpId = CMD_SID_BREAK ; \ Text [ en-US ] = "~Break" ; \ }; @@ -1237,7 +1239,7 @@ MenuItem\ {\ Identifier = SID_STYLE_EDIT ; \ - HelpID = SID_STYLE_EDIT ; \ + HelpId = CMD_SID_STYLE_EDIT ; \ Text [ en-US ] = "Edit Style..." ; \ }; @@ -1245,7 +1247,7 @@ MenuItem\ {\ Identifier = SID_EDIT_HYPERLINK ; \ - HelpID = SID_EDIT_HYPERLINK ; \ + HelpId = CMD_SID_EDIT_HYPERLINK ; \ Text [ en-US ] = "H~yperlink..." ; \ }; @@ -1253,7 +1255,7 @@ MenuItem\ {\ Identifier = SID_BEZIER_EDIT ; \ - HelpID = SID_BEZIER_EDIT ; \ + HelpId = CMD_SID_BEZIER_EDIT ; \ Text [ en-US ] = "Poi~nts";\ }; @@ -1261,7 +1263,7 @@ MenuItem\ {\ Identifier = SID_GLUE_EDITMODE ; \ - HelpID = SID_GLUE_EDITMODE ; \ + HelpId = CMD_SID_GLUE_EDITMODE ; \ Text [ en-US ] = "~Glue Points";\ }; @@ -1278,25 +1280,25 @@ MenuItem \ {\ Identifier = SID_INSERTLAYER ; \ - HelpID = SID_INSERTLAYER ; \ + HelpId = CMD_SID_INSERTLAYER ; \ Text [ en-US ] = "~Insert";\ };\ MenuItem \ {\ Identifier = SID_MODIFYLAYER ; \ - HelpID = SID_MODIFYLAYER ; \ + HelpId = CMD_SID_MODIFYLAYER ; \ Text [ en-US ] = "~Modify";\ };\ MenuItem \ {\ Identifier = SID_DELETE_LAYER ; \ - HelpID = SID_DELETE_LAYER ; \ + HelpId = CMD_SID_DELETE_LAYER ; \ Text [ en-US ] = "Delete";\ };\ MenuItem \ {\ Identifier = SID_RENAMELAYER ; \ - HelpID = SID_RENAMELAYER ; \ + HelpId = CMD_SID_RENAMELAYER ; \ Text [ en-US ] = "~Rename";\ }; \ };\ diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index 54d25c998ff5..27f91bab3c6d 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -35,6 +35,7 @@ #ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> #endif +#include "helpids.h" #define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET @@ -82,7 +83,7 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_FORMAT_TABLE_DLG; - HelpID = SID_FORMAT_TABLE_DLG; + HelpId = CMD_SID_FORMAT_TABLE_DLG; Text [ en-US ] = "~Table..."; }; MenuItem @@ -97,32 +98,32 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_TABLE_MERGE_CELLS; - HelpID = SID_TABLE_MERGE_CELLS; + HelpId = CMD_SID_TABLE_MERGE_CELLS; Text [ en-US ] = "~Merge"; }; MenuItem { Identifier = SID_TABLE_SPLIT_CELLS; - HelpID = SID_TABLE_SPLIT_CELLS; + HelpId = CMD_SID_TABLE_SPLIT_CELLS; Text [ en-US ] = "~Split..."; }; SEPARATOR MenuItem { Identifier = SID_TABLE_VERT_NONE; - HelpID = SID_TABLE_VERT_NONE; + HelpId = CMD_SID_TABLE_VERT_NONE; Text [ en-US ] = "~Top"; }; MenuItem { Identifier = SID_TABLE_VERT_CENTER; - HelpID = SID_TABLE_VERT_CENTER; + HelpId = CMD_SID_TABLE_VERT_CENTER; Text [ en-US ] = "C~enter"; }; MenuItem { Identifier = SID_TABLE_VERT_BOTTOM; - HelpID = SID_TABLE_VERT_BOTTOM; + HelpId = CMD_SID_TABLE_VERT_BOTTOM; Text [ en-US ] = "~Bottom"; }; }; @@ -140,26 +141,26 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_TABLE_DISTRIBUTE_ROWS; - HelpID = SID_TABLE_DISTRIBUTE_ROWS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_ROWS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_ROW; - HelpID = SID_TABLE_SELECT_ROW; + HelpId = CMD_SID_TABLE_SELECT_ROW; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_ROW_DLG; - HelpID = SID_TABLE_INSERT_ROW_DLG; + HelpId = CMD_SID_TABLE_INSERT_ROW_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_ROW; - HelpID = SID_TABLE_DELETE_ROW; + HelpId = CMD_SID_TABLE_DELETE_ROW; Text [ en-US ] = "~Delete"; }; }; @@ -177,26 +178,26 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_TABLE_DISTRIBUTE_COLUMNS; - HelpID = SID_TABLE_DISTRIBUTE_COLUMNS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_COLUMNS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_COL; - HelpID = SID_TABLE_SELECT_COL; + HelpId = CMD_SID_TABLE_SELECT_COL; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_COL_DLG; - HelpID = SID_TABLE_INSERT_COL_DLG; + HelpId = CMD_SID_TABLE_INSERT_COL_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_COL; - HelpID = SID_TABLE_DELETE_COL; + HelpId = CMD_SID_TABLE_DELETE_COL; Text [ en-US ] = "~Delete"; }; }; @@ -428,21 +429,21 @@ Menu RID_LAYERTAB_POPUP MenuItem { Identifier = SID_INSERTLAYER ; - HelpID = SID_INSERTLAYER ; + HelpId = CMD_SID_INSERTLAYER ; /* ### ACHTUNG: Neuer Text in Resource? ~Ebene einfügen... : ~Ebene einf³gen... */ Text [ en-US ] = "~Insert Layer..." ; }; MenuItem { Identifier = SID_MODIFYLAYER ; - HelpID = SID_MODIFYLAYER ; + HelpId = CMD_SID_MODIFYLAYER ; /* ### ACHTUNG: Neuer Text in Resource? E~bene ändern... : E~bene õndern... */ Text [ en-US ] = "Modify La~yer..." ; }; MenuItem { Identifier = SID_DELETE_LAYER ; - HelpID = SID_DELETE_LAYER ; + HelpId = CMD_SID_DELETE_LAYER ; /* ### ACHTUNG: Neuer Text in Resource? Ebe~ne löschen... : Ebe~ne l÷schen... */ Text [ en-US ] = "Delete ~Layer..." ; }; @@ -457,13 +458,13 @@ Menu RID_TASKPANE_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_APPLY_TO_ALL_SLIDES; - HelpID = SID_TP_APPLY_TO_ALL_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_ALL_SLIDES; Text [ en-US ] = "~Apply to All Slides"; }; MenuItem { Identifier = SID_TP_APPLY_TO_SELECTED_SLIDES; - HelpID = SID_TP_APPLY_TO_SELECTED_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_SELECTED_SLIDES; Text [ en-US ] = "Apply to ~Selected Slides"; }; @@ -472,13 +473,13 @@ Menu RID_TASKPANE_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_SHOW_LARGE_PREVIEW; - HelpID = SID_TP_SHOW_LARGE_PREVIEW; + HelpId = CMD_SID_TP_SHOW_LARGE_PREVIEW; Text[ en-US ] = "Show ~Large Preview"; }; MenuItem { Identifier = SID_TP_SHOW_SMALL_PREVIEW; - HelpID = SID_TP_SHOW_SMALL_PREVIEW; + HelpId = CMD_SID_TP_SHOW_SMALL_PREVIEW; Text[ en-US ] = "Show S~mall Preview"; }; }; @@ -491,13 +492,13 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_APPLY_TO_ALL_SLIDES; - HelpID = SID_TP_APPLY_TO_ALL_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_ALL_SLIDES; Text [ en-US ] = "~Apply to All Slides"; }; MenuItem { Identifier = SID_TP_APPLY_TO_SELECTED_SLIDES; - HelpID = SID_TP_APPLY_TO_SELECTED_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_SELECTED_SLIDES; Text [ en-US ] = "Apply to ~Selected Slides"; }; @@ -507,7 +508,7 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_EDIT_MASTER; - HelpID = SID_TP_EDIT_MASTER; + HelpId = CMD_SID_TP_EDIT_MASTER; Text[ en-US ] = "~Edit Master..."; }; @@ -518,13 +519,13 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_SHOW_LARGE_PREVIEW; - HelpID = SID_TP_SHOW_LARGE_PREVIEW; + HelpId = CMD_SID_TP_SHOW_LARGE_PREVIEW; Text[ en-US ] = "Show ~Large Preview"; }; MenuItem { Identifier = SID_TP_SHOW_SMALL_PREVIEW; - HelpID = SID_TP_SHOW_SMALL_PREVIEW; + HelpId = CMD_SID_TP_SHOW_SMALL_PREVIEW; Text[ en-US ] = "Show S~mall Preview"; }; }; @@ -537,7 +538,7 @@ Menu RID_TASKPANE_LAYOUTMENU_POPUP MenuItem { Identifier = SID_TP_APPLY_TO_SELECTED_SLIDES; - HelpID = SID_TP_APPLY_TO_SELECTED_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_SELECTED_SLIDES; Text [ en-US ] = "Apply to ~Selected Slides"; }; @@ -546,7 +547,7 @@ Menu RID_TASKPANE_LAYOUTMENU_POPUP MenuItem { Identifier = SID_INSERTPAGE_LAYOUT_MENU; - HelpID = SID_INSERTPAGE_LAYOUT_MENU; + HelpId = CMD_SID_INSERTPAGE_LAYOUT_MENU; Text [ en-US ] = "~Insert Slide"; }; }; diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 5ee8fb5e4d6a..c76c09df62e6 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -733,7 +733,7 @@ MenuItem { Identifier = SID_FORMAT_TABLE_DLG; - HelpID = SID_FORMAT_TABLE_DLG; + HelpId = CMD_SID_FORMAT_TABLE_DLG; Text [ en-US ] = "~Table..."; }; MenuItem @@ -748,32 +748,32 @@ MenuItem { Identifier = SID_TABLE_MERGE_CELLS; - HelpID = SID_TABLE_MERGE_CELLS; + HelpId = CMD_SID_TABLE_MERGE_CELLS; Text [ en-US ] = "~Merge"; }; MenuItem { Identifier = SID_TABLE_SPLIT_CELLS; - HelpID = SID_TABLE_SPLIT_CELLS; + HelpId = CMD_SID_TABLE_SPLIT_CELLS; Text [ en-US ] = "~Split..."; }; SEPARATOR MenuItem { Identifier = SID_TABLE_VERT_NONE; - HelpID = SID_TABLE_VERT_NONE; + HelpId = CMD_SID_TABLE_VERT_NONE; Text [ en-US ] = "~Top"; }; MenuItem { Identifier = SID_TABLE_VERT_CENTER; - HelpID = SID_TABLE_VERT_CENTER; + HelpId = CMD_SID_TABLE_VERT_CENTER; Text [ en-US ] = "C~enter"; }; MenuItem { Identifier = SID_TABLE_VERT_BOTTOM; - HelpID = SID_TABLE_VERT_BOTTOM; + HelpId = CMD_SID_TABLE_VERT_BOTTOM; Text [ en-US ] = "~Bottom"; }; }; @@ -791,26 +791,26 @@ MenuItem { Identifier = SID_TABLE_DISTRIBUTE_ROWS; - HelpID = SID_TABLE_DISTRIBUTE_ROWS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_ROWS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_ROW; - HelpID = SID_TABLE_SELECT_ROW; + HelpId = CMD_SID_TABLE_SELECT_ROW; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_ROW_DLG; - HelpID = SID_TABLE_INSERT_ROW_DLG; + HelpId = CMD_SID_TABLE_INSERT_ROW_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_ROW; - HelpID = SID_TABLE_DELETE_ROW; + HelpId = CMD_SID_TABLE_DELETE_ROW; Text [ en-US ] = "~Delete"; }; }; @@ -828,26 +828,26 @@ MenuItem { Identifier = SID_TABLE_DISTRIBUTE_COLUMNS; - HelpID = SID_TABLE_DISTRIBUTE_COLUMNS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_COLUMNS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_COL; - HelpID = SID_TABLE_SELECT_COL; + HelpId = CMD_SID_TABLE_SELECT_COL; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_COL_DLG; - HelpID = SID_TABLE_INSERT_COL_DLG; + HelpId = CMD_SID_TABLE_INSERT_COL_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_COL; - HelpID = SID_TABLE_DELETE_COL; + HelpId = CMD_SID_TABLE_DELETE_COL; Text [ en-US ] = "~Delete"; }; }; diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index ccbc7c8f5665..c93460fc8b38 100755 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -158,57 +158,6 @@ SdModule::~SdModule() /************************************************************************* |* -|* Statusbar erzeugen -|* -\************************************************************************/ - -#define AUTOSIZE_WIDTH 180 -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) - -void SdModule::FillStatusBar(StatusBar& rStatusBar) -{ - // Hinweis - rStatusBar.InsertItem( SID_CONTEXT, TEXT_WIDTH( String().Fill( 30, 'x' ) ), // vorher 52 - SIB_IN | SIB_LEFT | SIB_AUTOSIZE ); - - // Groesse und Position - rStatusBar.InsertItem( SID_ATTR_SIZE, SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), // vorher 42 - SIB_IN | SIB_USERDRAW ); - // SIB_AUTOSIZE | SIB_LEFT | SIB_OWNERDRAW ); - - // Massstab - rStatusBar.InsertItem( SID_ATTR_ZOOM, SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), SIB_IN | SIB_CENTER ); -/* - // Einfuege- / Uberschreibmodus - rStatusBar.InsertItem( SID_ATTR_INSERT, TEXT_WIDTH( "EINFG" ), - SIB_IN | SIB_CENTER ); - - // Selektionsmodus - rStatusBar.InsertItem( SID_STATUS_SELMODE, TEXT_WIDTH( "ERG" ), - SIB_IN | SIB_CENTER ); -*/ - // Dokument geaendert - rStatusBar.InsertItem( SID_DOC_MODIFIED, SvxModifyControl::GetDefItemWidth(rStatusBar) ); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); - - - - // Seite - rStatusBar.InsertItem( SID_STATUS_PAGE, TEXT_WIDTH( String().Fill( 24, 'X' ) ), - SIB_IN | SIB_LEFT ); - - // Praesentationslayout - rStatusBar.InsertItem( SID_STATUS_LAYOUT, TEXT_WIDTH( String().Fill( 10, 'X' ) ), - SIB_IN | SIB_LEFT | SIB_AUTOSIZE ); -} - - - -/************************************************************************* -|* |* get notifications |* \************************************************************************/ diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index bb1199fdd352..7e87b246d371 100755..100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -26,6 +26,8 @@ ************************************************************************/ #include "strings.hrc" #include "glob.hrc" +#include "helpids.h" + String STR_DRAW_TOOLBOX { Text [ en-US ] = "Drawings Toolbar" ; @@ -440,7 +442,7 @@ ModalDialog RID_UNDO_DELETE_WARNING Moveable = TRUE; Closeable = TRUE; - HelpID = RID_UNDO_DELETE_WARNING; + HelpID = HID_UNDO_DELETE_WARNING; FixedImage IMG_UNDO_DELETE_WARNING { @@ -456,6 +458,7 @@ ModalDialog RID_UNDO_DELETE_WARNING }; CheckBox CB_UNDO_DELETE_DISABLE { + HelpID = "sd:CheckBox:RID_UNDO_DELETE_WARNING:CB_UNDO_DELETE_DISABLE"; Pos = MAP_APPFONT( 39, (4 * 12) + 9 ); Size = MAP_APPFONT( 175, 12 ); Text [ en-US ] = "~Do not show this warning again"; diff --git a/sd/source/ui/app/tbx_ww.src b/sd/source/ui/app/tbx_ww.src deleted file mode 100644 index 67e62be0f1be..000000000000 --- a/sd/source/ui/app/tbx_ww.src +++ /dev/null @@ -1,1124 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <svx/svxids.hrc> -#include <svx/globlmn.hrc> -#include "app.hrc" -#include "res_bmp.hrc" -#include "helpids.h" - -FloatingWindow RID_ALIGNMENT -{ - HelpId = HID_SD_FW_ALIGNMENT ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Alignment" ; - ToolBox RID_ALIGNMENT_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_LEFT - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_CENTER - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_RIGHT - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_UP - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_MIDDLE - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_DOWN - }; - }; - }; -}; -FloatingWindow RID_ZOOM -{ - HelpId = HID_SD_FW_ZOOM ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Zoom" ; - ToolBox RID_ZOOM_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ZOOM_OUT ; - HelpID = SID_ZOOM_OUT ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_IN ; - HelpID = SID_ZOOM_IN ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_REAL ; - HelpID = SID_SIZE_REAL ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_PREV ; - HelpID = SID_ZOOM_PREV ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_NEXT ; - HelpID = SID_ZOOM_NEXT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_PAGE ; - HelpID = SID_SIZE_PAGE ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_PAGE_WIDTH ; - HelpID = SID_SIZE_PAGE_WIDTH ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_ALL ; - HelpID = SID_SIZE_ALL ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_OPTIMAL ; - HelpID = SID_SIZE_OPTIMAL ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_PANNING ; - HelpID = SID_ZOOM_PANNING ; - }; - }; - }; -}; -FloatingWindow RID_CHOOSE_MODE -{ - HelpId = HID_SD_FW_CHOOSE_MODE ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Effects" ; - ToolBox RID_CHOOSE_MODE_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - ITEM_TOOLBAR_OBJECT_ROTATE - Checkable = TRUE ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_MIRROR ; - HelpID = SID_OBJECT_MIRROR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONVERT_TO_3D_LATHE ; - HelpID = SID_CONVERT_TO_3D_LATHE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_CROOK_ROTATE ; - HelpID = SID_OBJECT_CROOK_ROTATE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_CROOK_SLANT ; - HelpID = SID_OBJECT_CROOK_SLANT ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_SHEAR ; - HelpID = SID_OBJECT_SHEAR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_TRANSPARENCE ; - HelpID = SID_OBJECT_TRANSPARENCE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_GRADIENT ; - HelpID = SID_OBJECT_GRADIENT ; - }; - }; - }; -}; -FloatingWindow RID_TEXT -{ - HelpId = HID_SD_FW_TEXT ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - ToolBox RID_TEXT_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_ATTR_CHAR ; - HelpID = SID_ATTR_CHAR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_TEXT_FITTOSIZE ; - HelpID = SID_TEXT_FITTOSIZE ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION ; - HelpId = SID_DRAW_CAPTION ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FONTWORK ; - HelpId = SID_DRAW_FONTWORK ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_ATTR_CHAR_VERTICAL ; - HelpID = SID_ATTR_CHAR_VERTICAL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_TEXT_FITTOSIZE_VERTICAL ; - HelpID = SID_TEXT_FITTOSIZE_VERTICAL ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION_VERTICAL ; - HelpId = SID_DRAW_CAPTION_VERTICAL ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FONTWORK_VERTICAL ; - HelpId = SID_DRAW_FONTWORK_VERTICAL ; - }; - }; - }; - Text [ en-US ] = "Text" ; -}; -FloatingWindow RID_RECTANGLES -{ - HelpId = HID_SD_FW_RECTANGLES ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Rectangles" ; - ToolBox RID_RECTANGLES_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT ; - HelpID = SID_DRAW_RECT ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE ; - HelpID = SID_DRAW_SQUARE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT_ROUND ; - HelpID = SID_DRAW_RECT_ROUND ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE_ROUND ; - HelpID = SID_DRAW_SQUARE_ROUND ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT_NOFILL ; - HelpID = SID_DRAW_RECT_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE_NOFILL ; - HelpID = SID_DRAW_SQUARE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT_ROUND_NOFILL ; - HelpID = SID_DRAW_RECT_ROUND_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE_ROUND_NOFILL ; - HelpID = SID_DRAW_SQUARE_ROUND_NOFILL ; - }; - }; - }; -}; -FloatingWindow RID_ELLIPSES -{ - HelpId = HID_SD_FW_ELLIPSES ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Ellipses" ; - ToolBox RID_ELLIPSES_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSE ; - HelpID = SID_DRAW_ELLIPSE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLE ; - HelpID = SID_DRAW_CIRCLE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_PIE ; - HelpID = SID_DRAW_PIE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLEPIE ; - HelpID = SID_DRAW_CIRCLEPIE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSECUT ; - HelpID = SID_DRAW_ELLIPSECUT ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLECUT ; - HelpID = SID_DRAW_CIRCLECUT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSE_NOFILL ; - HelpID = SID_DRAW_ELLIPSE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLE_NOFILL ; - HelpID = SID_DRAW_CIRCLE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_PIE_NOFILL ; - HelpID = SID_DRAW_PIE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLEPIE_NOFILL ; - HelpID = SID_DRAW_CIRCLEPIE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSECUT_NOFILL ; - HelpID = SID_DRAW_ELLIPSECUT_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLECUT_NOFILL ; - HelpID = SID_DRAW_CIRCLECUT_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ARC ; - HelpID = SID_DRAW_ARC ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLEARC ; - HelpID = SID_DRAW_CIRCLEARC ; - }; - }; - }; -}; -FloatingWindow RID_LINES -{ - HelpId = HID_SD_FW_LINES ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Curves" ; - ToolBox RID_LINES_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - HelpID = 1 ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_BEZIER_FILL ; - HelpID = SID_DRAW_BEZIER_FILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_POLYGON ; - HelpID = SID_DRAW_POLYGON ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_XPOLYGON ; - HelpID = SID_DRAW_XPOLYGON ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_FREELINE ; - HelpID = SID_DRAW_FREELINE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_BEZIER_NOFILL ; - HelpID = SID_DRAW_BEZIER_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_POLYGON_NOFILL ; - HelpID = SID_DRAW_POLYGON_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_XPOLYGON_NOFILL ; - HelpID = SID_DRAW_XPOLYGON_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_FREELINE_NOFILL ; - HelpID = SID_DRAW_FREELINE_NOFILL ; - }; - }; - }; -}; -FloatingWindow RID_ARROWS -{ - HelpId = HID_SD_FW_ARROWS ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Lines" ; - ToolBox RID_ARROWS_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 3 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_LINE ; - HelpID = SID_DRAW_LINE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_END ; - HelpID = SID_LINE_ARROW_END ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_CIRCLE ; - HelpID = SID_LINE_ARROW_CIRCLE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_SQUARE ; - HelpID = SID_LINE_ARROW_SQUARE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_XLINE ; - HelpID = SID_DRAW_XLINE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_START ; - HelpID = SID_LINE_ARROW_START ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_CIRCLE_ARROW ; - HelpID = SID_LINE_CIRCLE_ARROW ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_SQUARE_ARROW ; - HelpID = SID_LINE_SQUARE_ARROW ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_MEASURELINE ; - HelpID = SID_DRAW_MEASURELINE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROWS ; - HelpID = SID_LINE_ARROWS ; - }; - }; - }; -}; -FloatingWindow RID_3D_OBJECTS -{ - HelpId = HID_SD_FW_3D_OBJECTS ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "3D Objects" ; - ToolBox RID_3D_OBJECTS_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - HelpID = 1 ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_CUBE ; - HelpID = SID_3D_CUBE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_SPHERE ; - HelpID = SID_3D_SPHERE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_CYLINDER ; - HelpID = SID_3D_CYLINDER ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_CONE ; - HelpID = SID_3D_CONE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_PYRAMID ; - HelpID = SID_3D_PYRAMID ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_TORUS ; - HelpID = SID_3D_TORUS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_SHELL ; - HelpID = SID_3D_SHELL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_HALF_SPHERE ; - HelpID = SID_3D_HALF_SPHERE ; - }; - }; - }; -}; -FloatingWindow RID_CONNECTORS -{ - HelpId = HID_SD_FW_CONNECTORS ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Connectors" ; - ToolBox RID_CONNECTORS_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 4 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_TOOL_CONNECTOR ; - HelpID = SID_TOOL_CONNECTOR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_ARROW_START ; - HelpID = SID_CONNECTOR_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_ARROW_END ; - HelpID = SID_CONNECTOR_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_ARROWS ; - HelpID = SID_CONNECTOR_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CIRCLE_START ; - HelpID = SID_CONNECTOR_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CIRCLE_END ; - HelpID = SID_CONNECTOR_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CIRCLES ; - HelpID = SID_CONNECTOR_CIRCLES ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES ; - HelpID = SID_CONNECTOR_LINES ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_ARROW_START ; - HelpID = SID_CONNECTOR_LINES_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_ARROW_END ; - HelpID = SID_CONNECTOR_LINES_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_ARROWS ; - HelpID = SID_CONNECTOR_LINES_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_CIRCLE_START ; - HelpID = SID_CONNECTOR_LINES_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_CIRCLE_END ; - HelpID = SID_CONNECTOR_LINES_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_CIRCLES ; - HelpID = SID_CONNECTOR_LINES_CIRCLES ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE ; - HelpID = SID_CONNECTOR_LINE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_ARROW_START ; - HelpID = SID_CONNECTOR_LINE_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_ARROW_END ; - HelpID = SID_CONNECTOR_LINE_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_ARROWS ; - HelpID = SID_CONNECTOR_LINE_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_CIRCLE_START ; - HelpID = SID_CONNECTOR_LINE_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_CIRCLE_END ; - HelpID = SID_CONNECTOR_LINE_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_CIRCLES ; - HelpID = SID_CONNECTOR_LINE_CIRCLES ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE ; - HelpID = SID_CONNECTOR_CURVE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_ARROW_START ; - HelpID = SID_CONNECTOR_CURVE_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_ARROW_END ; - HelpID = SID_CONNECTOR_CURVE_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_ARROWS ; - HelpID = SID_CONNECTOR_CURVE_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_CIRCLE_START ; - HelpID = SID_CONNECTOR_CURVE_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_CIRCLE_END ; - HelpID = SID_CONNECTOR_CURVE_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_CIRCLES ; - HelpID = SID_CONNECTOR_CURVE_CIRCLES ; - }; - }; - }; -}; -FloatingWindow RID_INSERT -{ - HelpId = HID_SD_FW_INSERT ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Einfügen : Einf³gen */ - Text [ en-US ] = "Insert" ; - ToolBox RID_INSERT_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - HelpID = 1 ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_INSERT_DIAGRAM ; - HelpID = SID_INSERT_DIAGRAM; - }; - ToolBoxItem - { - Identifier = SID_INSERT_MATH ; - HelpID = SID_INSERT_MATH ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_FLOATINGFRAME ; - HelpID = SID_INSERT_FLOATINGFRAME ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_OBJECT ; - HelpID = SID_INSERT_OBJECT ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_PLUGIN ; - HelpID = SID_INSERT_PLUGIN ; - }; -#ifdef SOLAR_JAVA - ToolBoxItem - { - Identifier = SID_INSERT_APPLET ; - HelpID = SID_INSERT_APPLET ; - }; -#endif - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_TABLE ; - HelpID = SID_ATTR_TABLE ; - }; - ToolBoxItem - { - Identifier = SID_INSERTFILE ; - HelpID = SID_INSERTFILE ; - }; - ToolBoxItem - { - Identifier = SID_INSERTPAGE ; - HelpID = SID_INSERTPAGE ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_GRAPHIC ; - HelpID = SID_INSERT_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_SOUND ; - HelpID = SID_INSERT_SOUND ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_VIDEO ; - HelpID = SID_INSERT_VIDEO ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_AVMEDIA ; - HelpID = SID_INSERT_AVMEDIA ; - }; - }; - }; -}; -FloatingWindow RID_POSITION -{ - HelpId = HID_SD_FW_POSITION ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Arrange" ; - ToolBox RID_POSITION_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - ITEM_FORMAT_FRAME_TO_TOP - }; - ToolBoxItem - { - Identifier = SID_MOREFRONT ; - HelpID = SID_MOREFRONT ; - }; - ToolBoxItem - { - Identifier = SID_MOREBACK ; - HelpID = SID_MOREBACK ; - }; - ToolBoxItem - { - ITEM_FORMAT_FRAME_TO_BOTTOM - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - Identifier = SID_BEFORE_OBJ ; - HelpID = SID_BEFORE_OBJ ; - }; - ToolBoxItem - { - Identifier = SID_BEHIND_OBJ ; - HelpID = SID_BEHIND_OBJ ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SPACE ; - }; - ToolBoxItem - { - Identifier = SID_REVERSE_ORDER ; - HelpID = SID_REVERSE_ORDER ; - }; - }; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src index a3446a2c58b4..0f3b3c69aeef 100644 --- a/sd/source/ui/app/toolbox.src +++ b/sd/source/ui/app/toolbox.src @@ -27,758 +27,23 @@ #include "app.hrc" #include "cfgids.hxx" -#include "helpids.h" #include <svx/svxids.hrc> - // Werkzeugleiste (Impress) - // Objektleiste (Impress) - // Optionsleiste (Impress) -#include "toolbox2_tmpl.src" - // Werkzeugleiste (Draw (Graphic)) - // Objektleiste (Draw (Graphic)) - // Optionsleiste (Draw (Graphic)) -#undef SD_TOOLBOX -#define SD_TOOLBOX RID_GRAPHIC_TOOLBOX -#include "toolbox2_tmpl.src" - -ToolBox RID_SLIDE_TOOLBOX -{ - HelpId = HID_SD_SLIDE_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_LEFT ; - ItemList = - { - ToolBoxItem - { - Checkable = TRUE ; - Identifier = SID_OBJECT_SELECT ; - HelpID = SID_OBJECT_SELECT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_TOOLBOX ; - HelpID = SID_ZOOM_TOOLBOX ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION ; - HelpID = SID_PRESENTATION ; - }; - TBI_ZOOM_IN - TBI_ZOOM_OUT - }; -}; -ToolBox RID_OUTLINE_TOOLBOX -{ - HelpId = HID_SD_OUTLINE_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_LEFT ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ZOOM_TOOLBOX ; - HelpID = SID_ZOOM_TOOLBOX ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_COLLAPSE_ALL ; - HelpID = SID_OUTLINE_COLLAPSE_ALL ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_EXPAND_ALL ; - HelpID = SID_OUTLINE_EXPAND_ALL ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_COLLAPSE ; - HelpID = SID_OUTLINE_COLLAPSE ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_EXPAND ; - HelpID = SID_OUTLINE_EXPAND ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_FORMAT ; - HelpID = SID_OUTLINE_FORMAT ; - }; - ToolBoxItem - { - Identifier = SID_COLORVIEW ; - HelpID = SID_COLORVIEW ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION ; - HelpID = SID_PRESENTATION ; - }; - TBI_ZOOM_IN - TBI_ZOOM_OUT - }; -}; -ToolBox RID_DRAW_COMMONTASK_TOOLBOX -{ - HelpId = HID_SD_DRAW_COMMONTASK_TOOLBOX ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_INSERTPAGE ; - HelpID = SID_INSERTPAGE ; - }; - ToolBoxItem - { - Identifier = SID_MODIFYPAGE ; - HelpID = SID_MODIFYPAGE ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION_LAYOUT ; - HelpID = SID_PRESENTATION_LAYOUT ; - }; - ToolBoxItem - { - Identifier = SID_DUPLICATE_PAGE ; - HelpID = SID_DUPLICATE_PAGE ; - }; - ToolBoxItem - { - Identifier = SID_EXPAND_PAGE ; - HelpID = SID_EXPAND_PAGE ; - }; - }; -}; -ToolBox RID_BEZIER_TOOLBOX -{ - HelpId = HID_SD_BEZIER_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - ITEM_FORMAT_BEZIER_EDIT - AutoCheck = TRUE ; - Checkable = TRUE ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_MOVE ; - HelpID = SID_BEZIER_MOVE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_INSERT ; - HelpID = SID_BEZIER_INSERT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_DELETE ; - HelpID = SID_BEZIER_DELETE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CUTLINE ; - HelpID = SID_BEZIER_CUTLINE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CONVERT ; - HelpID = SID_BEZIER_CONVERT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_EDGE ; - HelpID = SID_BEZIER_EDGE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_SMOOTH ; - HelpID = SID_BEZIER_SMOOTH ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_SYMMTR ; - HelpID = SID_BEZIER_SYMMTR ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CLOSE ; - HelpID = SID_BEZIER_CLOSE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_ELIMINATE_POINTS ; - HelpID = SID_BEZIER_ELIMINATE_POINTS ; - }; - }; -}; -ToolBox RID_GLUEPOINTS_TOOLBOX -{ - HelpId = HID_SD_GLUEPOINTS_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GLUE_INSERT_POINT ; - HelpID = SID_GLUE_INSERT_POINT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_LEFT ; - HelpID = SID_GLUE_ESCDIR_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_TOP ; - HelpID = SID_GLUE_ESCDIR_TOP ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_RIGHT ; - HelpID = SID_GLUE_ESCDIR_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_BOTTOM ; - HelpID = SID_GLUE_ESCDIR_BOTTOM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_PERCENT ; - HelpID = SID_GLUE_PERCENT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_HORZALIGN_LEFT ; - HelpID = SID_GLUE_HORZALIGN_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_HORZALIGN_CENTER ; - HelpID = SID_GLUE_HORZALIGN_CENTER ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_HORZALIGN_RIGHT ; - HelpID = SID_GLUE_HORZALIGN_RIGHT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_VERTALIGN_TOP ; - HelpID = SID_GLUE_VERTALIGN_TOP ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_VERTALIGN_CENTER ; - HelpID = SID_GLUE_VERTALIGN_CENTER ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_VERTALIGN_BOTTOM ; - HelpID = SID_GLUE_VERTALIGN_BOTTOM ; - }; - }; -}; -ToolBox RID_SLIDE_OBJ_TOOLBOX -{ - HelpId = HID_SD_SLIDE_OBJ_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_REHEARSE_TIMINGS ; - HelpID = SID_REHEARSE_TIMINGS ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_HIDE_SLIDE ; - HelpID = SID_HIDE_SLIDE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PAGES_PER_ROW ; - HelpID = SID_PAGES_PER_ROW ; - }; - }; -}; -ToolBox RID_DRAW_GRAF_TOOLBOX -{ - HelpId = HID_SD_DRAW_GRAF_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GRFFILTER; - HelpID = SID_GRFFILTER; - DropDown = TRUE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_MODE; - HelpID = SID_ATTR_GRAF_MODE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_RED; - HelpID = SID_ATTR_GRAF_RED; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GREEN; - HelpID = SID_ATTR_GRAF_GREEN; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_BLUE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_LUMINANCE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CONTRAST; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GAMMA; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_TRANSPARENCE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - // #i25616# - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE; - HelpID = SID_ATTRIBUTES_LINE; - }; - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA; - HelpID = SID_ATTRIBUTES_AREA; - }; - ToolBoxItem - { - Identifier = SID_ATTR_FILL_SHADOW; - HelpID = SID_ATTR_FILL_SHADOW; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CROP; - HelpID = SID_ATTR_GRAF_CROP; - }; - }; -}; String RID_DRAW_VIEWER_TOOLBOX { Text [ en-US ] = "Function Bar (viewing mode)" ; }; -ToolBox RID_DRAW_VIEWER_TOOLBOX -{ - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_SAVEASDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_EDITDOC ; - }; - ToolBoxItem - { - Identifier = SID_MAIL_SENDDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DIRECTEXPORTDOCASPDF ; - }; - ToolBoxItem - { - Identifier = SID_PRINTDOCDIRECT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_COPY ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_SEARCH_DLG ; - }; - ToolBoxItem - { - Identifier = SID_NAVIGATOR ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_ZOOM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION; - }; - }; - Scroll = TRUE ; -}; - String RID_GRAPHIC_VIEWER_TOOLBOX { Text [ en-US ] = "Function Bar (viewing mode)" ; }; -ToolBox RID_GRAPHIC_VIEWER_TOOLBOX -{ - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_SAVEASDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_EDITDOC ; - }; - ToolBoxItem - { - Identifier = SID_MAIL_SENDDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DIRECTEXPORTDOCASPDF ; - }; - ToolBoxItem - { - Identifier = SID_PRINTDOCDIRECT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_COPY ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_SEARCH_DLG ; - }; - ToolBoxItem - { - Identifier = SID_NAVIGATOR ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_ZOOM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - }; - Scroll = TRUE ; -}; - -ToolBox RID_DRAW_MEDIA_TOOLBOX -{ - HelpId = HID_SD_DRAW_MEDIA_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_AVMEDIA_TOOLBOX; - HelpID = SID_AVMEDIA_TOOLBOX; - }; - }; -}; String RID_DRAW_MEDIA_TOOLBOX { Text [ en-US ] = "Media Playback" ; }; + String RID_DRAW_TABLE_TOOLBOX { TEXT [ de ] = "Tabelle" ; diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src index 7754283332cd..a0def1c18ec7 100755..100644 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.src @@ -29,6 +29,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW { + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -44,6 +45,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW { + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -59,6 +61,7 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW { + HelpID = "sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index d631dcaba2b2..efbd75ac9003 100644 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.src @@ -28,6 +28,8 @@ #include "res_bmp.hrc" #include "app.hrc" #include "animobjs.hrc" +#include "helpids.h" + #define BUTTON_WIDTH 16 #define BUTTON_HEIGHT 14 #define BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT ); @@ -36,7 +38,7 @@ #define MIN_BUTTON_SIZE MAP_APPFONT( MIN_BUTTON_WIDTH, MIN_BUTTON_HEIGHT ); DockingWindow FLT_WIN_ANIMATION { - HelpID = SID_ANIMATION_OBJECTS ; + HelpID = CMD_SID_ANIMATION_OBJECTS ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -57,6 +59,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_FIRST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_FIRST"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDSTART ; @@ -64,6 +67,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REVERSE { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REVERSE"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_REVERSEPLAY ; @@ -72,6 +76,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_STOP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 2 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_STOP ; @@ -80,6 +85,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_PLAY { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 3 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_PLAY ; @@ -87,6 +93,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_LAST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 4 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDEND ; @@ -94,6 +101,7 @@ DockingWindow FLT_WIN_ANIMATION }; NumericField NUM_FLD_BITMAP { + HelpID = "sd:NumericField:FLT_WIN_ANIMATION:NUM_FLD_BITMAP"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 3 + MIN_BUTTON_WIDTH * 5 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 , 12 ) ; @@ -110,6 +118,7 @@ DockingWindow FLT_WIN_ANIMATION }; TimeField TIME_FIELD { + HelpID = "sd:TimeField:FLT_WIN_ANIMATION:TIME_FIELD"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 6 + MIN_BUTTON_WIDTH * 7 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 12 ) ; @@ -132,6 +141,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_LOOP_COUNT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_LOOP_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 12 + MIN_BUTTON_WIDTH * 9 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 100 ) ; @@ -164,6 +174,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ONE_OBJECT { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ONE_OBJECT"; Pos = MAP_APPFONT ( 12 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -180,6 +191,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ALL_OBJECTS { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ALL_OBJECTS"; Pos = MAP_APPFONT ( 31 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -196,6 +208,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_BITMAP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_BITMAP"; Pos = MAP_APPFONT ( 60 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -212,6 +225,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_ALL { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_ALL"; Pos = MAP_APPFONT ( 79 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -248,12 +262,14 @@ DockingWindow FLT_WIN_ANIMATION }; RadioButton RBT_GROUP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_GROUP"; Pos = MAP_APPFONT ( 12 , 167 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Group object" ; }; RadioButton RBT_BITMAP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_BITMAP"; Pos = MAP_APPFONT ( 12 , 181 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Bitmap object" ; @@ -268,6 +284,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_ADJUSTMENT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_ADJUSTMENT"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 196 ) ; Size = MAP_APPFONT ( 72 , 100 ) ; @@ -290,6 +307,7 @@ DockingWindow FLT_WIN_ANIMATION }; PushButton BTN_CREATE_GROUP { + HelpID = "sd:PushButton:FLT_WIN_ANIMATION:BTN_CREATE_GROUP"; Pos = MAP_APPFONT ( 107 , 216 ) ; Size = MAP_APPFONT ( 41 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src index bf9b2d29c651..a574ab9714ca 100644 --- a/sd/source/ui/dlg/brkdlg.src +++ b/sd/source/ui/dlg/brkdlg.src @@ -28,6 +28,7 @@ #include "brkdlg.hrc" ModalDialog DLG_BREAK { + HelpID = "sd:ModalDialog:DLG_BREAK"; OutputSize = TRUE; SVLook = TRUE; Pos = MAP_APPFONT( 84, 34 ); diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index 920be5e8df70..2cb99b4dfd75 100644 --- a/sd/source/ui/dlg/copydlg.src +++ b/sd/source/ui/dlg/copydlg.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "copydlg.hrc" +#include "helpids.h" + ModalDialog DLG_COPY { - HelpID = SID_COPYOBJECTS ; + HelpID = CMD_SID_COPYOBJECTS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 204 , 177 ) ; @@ -63,6 +65,7 @@ ModalDialog DLG_COPY }; NumericField NUM_FLD_COPIES { + HelpID = "sd:NumericField:DLG_COPY:NUM_FLD_COPIES"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 7 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -78,6 +81,7 @@ ModalDialog DLG_COPY }; ImageButton BTN_SET_VIEWDATA { + HelpID = "sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA"; Pos = MAP_APPFONT ( 122 , 6 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; ButtonImage = Image @@ -90,6 +94,7 @@ ModalDialog DLG_COPY }; PushButton BTN_SET_DEFAULT { + HelpID = "sd:PushButton:DLG_COPY:BTN_SET_DEFAULT"; Pos = MAP_APPFONT ( 148 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -97,6 +102,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_ANGLE { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -124,6 +130,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_X { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 37 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -141,6 +148,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_Y { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 53 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -158,6 +166,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_WIDTH { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 98 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -175,6 +184,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_HEIGHT { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 114 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -228,6 +238,7 @@ ModalDialog DLG_COPY }; ListBox LB_START_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_START_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 143 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -243,6 +254,7 @@ ModalDialog DLG_COPY }; ListBox LB_END_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_END_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 159 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index c8c49e9c0d48..5d05b63f6287 100644 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.src @@ -32,7 +32,7 @@ #define DIFF_Y 17 ModalDialog DLG_CUSTOMSHOW { - HelpID = SID_CUSTOMSHOW_DLG ; + HelpID = CMD_SID_CUSTOMSHOW_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 175 + DIFF , 114 + DIFF_Y ) ; @@ -40,6 +40,7 @@ ModalDialog DLG_CUSTOMSHOW Closeable = TRUE ; PushButton BTN_NEW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW"; Pos = MAP_APPFONT ( 120 + DIFF , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -47,6 +48,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_EDIT { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT"; Pos = MAP_APPFONT ( 120 + DIFF , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -54,6 +56,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 120 + DIFF , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -61,6 +64,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_COPY { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY"; Pos = MAP_APPFONT ( 120 + DIFF , 57 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -74,6 +78,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_STARTSHOW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW"; Pos = MAP_APPFONT ( 120 + DIFF , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -89,6 +94,7 @@ ModalDialog DLG_CUSTOMSHOW }; ListBox LB_CUSTOMSHOWS { + HelpID = "sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ; @@ -96,6 +102,7 @@ ModalDialog DLG_CUSTOMSHOW }; CheckBox CBX_USE_CUSTOMSHOW { + HelpID = "sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW"; Pos = MAP_APPFONT ( 6 , 96 + DIFF_Y ) ; Size = MAP_APPFONT ( 112 + DIFF , 12 ) ; TabStop = TRUE ; @@ -138,6 +145,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; Edit EDT_NAME { + HelpID = "sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 38 , 6 ) ; Size = MAP_APPFONT ( 141 , 12 ) ; @@ -145,6 +153,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; MultiListBox LB_PAGES { + HelpID = "sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 35 ) ; Size = MAP_APPFONT ( 75 , 75 ) ; @@ -153,6 +162,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_ADD { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD"; Pos = MAP_APPFONT ( 84 , 67 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~>>" ; @@ -168,6 +178,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 84 , 95 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~<<" ; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 1eb3a3d0cedc..acbf70d8e687 100755 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -102,7 +102,7 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap ) // ==================================================================== // ==================================================================== -UINT32 PageHelpIds[] = +const char* PageHelpIds[] = { HID_SD_AUTOPILOT_PAGE1, HID_SD_AUTOPILOT_PAGE2, @@ -1119,7 +1119,9 @@ void AssistentDlgImpl::ChangePage() USHORT nPage = (USHORT)maAssistentFunc.GetCurrentPage(); if( mpWindow ) + { mpWindow->SetHelpId( PageHelpIds[nPage-1]); + } UpdatePage(); diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src index b4c146eb0df2..6427b9bff297 100644 --- a/sd/source/ui/dlg/dlgass.src +++ b/sd/source/ui/dlg/dlgass.src @@ -48,6 +48,7 @@ ModalDialog DLG_ASS CheckBox CB_PREVIEW { + HelpID = "sd:CheckBox:DLG_ASS:CB_PREVIEW"; Pos = MAP_APPFONT ( 144 , 140 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -56,6 +57,7 @@ ModalDialog DLG_ASS CheckBox CB_STARTWITH { + HelpID = "sd:CheckBox:DLG_ASS:CB_STARTWITH"; Pos = MAP_APPFONT ( 144 , 154 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -84,6 +86,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_EMPTY { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY"; Pos = MAP_APPFONT ( 12 , 48 ); Size = MAP_APPFONT ( 130 , 10 ); TabStop = TRUE; @@ -92,6 +95,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_TEMPLATE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 62 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "~From template"; @@ -99,6 +103,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_OPEN { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN"; Pos = MAP_APPFONT ( 12 , 76 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "O~pen existing presentation"; @@ -106,6 +111,7 @@ ModalDialog DLG_ASS PushButton PB_PAGE1_OPEN { + HelpID = "sd:PushButton:DLG_ASS:PB_PAGE1_OPEN"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 18 , 89 ) ; Size = MAP_APPFONT ( 50 , 18 ) ; @@ -171,6 +177,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE2_LAYOUT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 120 , 40 ) ; @@ -186,6 +193,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM5 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 121 ); Size = MAP_APPFONT ( 59 , 10 ); @@ -194,6 +202,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM1 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 121 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -202,6 +211,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM2 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -211,6 +221,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM3 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -220,6 +231,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM4 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 149 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -256,6 +268,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_EFFECT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 48 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -274,6 +287,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_SPEED { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_SPEED"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 64 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -292,6 +306,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_LIVE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -300,6 +315,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_KIOSK { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 108 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -316,6 +332,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_TIME { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 122 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -349,6 +366,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_BREAK { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 138 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -374,6 +392,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE3_LOGO { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO"; OutputSize = TRUE; Pos = MAP_APPFONT ( 21 , 154 ); Size = MAP_APPFONT ( 111 , 10 ); @@ -410,6 +429,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKNAME { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 59 ) ; @@ -425,6 +445,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKTOPIC { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 88 ) ; @@ -440,6 +461,7 @@ ModalDialog DLG_ASS }; MultiLineEdit EDT_PAGE4_ASKINFORMATION { + HelpID = "sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 117 ) ; @@ -479,6 +501,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE5_SUMMARY { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY"; OutputSize = TRUE; Pos = MAP_APPFONT ( 6 , 154 ); Size = MAP_APPFONT ( 132 , 10 ); @@ -505,6 +528,7 @@ ModalDialog DLG_ASS PushButton BUT_LAST { + HelpID = "sd:PushButton:DLG_ASS:BUT_LAST"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 112 , 170 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -514,6 +538,7 @@ ModalDialog DLG_ASS PushButton BUT_NEXT { + HelpID = "sd:PushButton:DLG_ASS:BUT_NEXT"; DefButton = TRUE ; OutputSize = TRUE ; Pos = MAP_APPFONT ( 165 , 170 ) ; diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src index 5abcd9e8b9b7..cbd1ba56f7cd 100644 --- a/sd/source/ui/dlg/dlgfield.src +++ b/sd/source/ui/dlg/dlgfield.src @@ -28,6 +28,7 @@ #include "dlgfield.hrc" ModalDialog DLG_FIELD_MODIFY { + HelpID = "sd:ModalDialog:DLG_FIELD_MODIFY"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 138 , 154 ) ; @@ -41,6 +42,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_FIX { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -48,6 +50,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_VAR { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -62,6 +65,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_LANGUAGE { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 52 , 65 ) ; Size = MAP_APPFONT ( 80 , 70 ) ; @@ -71,6 +75,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_FORMAT { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 94 ) ; Size = MAP_APPFONT ( 126 , 54 ) ; diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index 631034dd5879..5d6a5c757be5 100644 --- a/sd/source/ui/dlg/dlgsnap.src +++ b/sd/source/ui/dlg/dlgsnap.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "dlgsnap.hrc" +#include "helpids.h" + ModalDialog DLG_SNAPLINE { - HelpID = SID_CAPTUREPOINT ; + HelpID = CMD_SID_CAPTUREPOINT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 140 , 125 ) ; @@ -57,6 +59,7 @@ ModalDialog DLG_SNAPLINE }; PushButton BTN_DELETE { + HelpID = "sd:PushButton:DLG_SNAPLINE:BTN_DELETE"; Pos = MAP_APPFONT ( 88 , 63 ) ; Size = MAP_APPFONT ( 46 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */ @@ -77,6 +80,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_X { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_X"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 14 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -100,6 +104,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_Y { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 30 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -123,6 +128,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_POINT { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT"; Pos = MAP_APPFONT ( 12 , 61 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Point" ; @@ -135,6 +141,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_VERTICAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL"; Pos = MAP_APPFONT ( 12 , 81 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Vertical" ; @@ -147,6 +154,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_HORIZONTAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 65 , 16 ) ; Text [ en-US ] = "Hori~zontal" ; diff --git a/sd/source/ui/dlg/headerfooterdlg.src b/sd/source/ui/dlg/headerfooterdlg.src index df42ff9b7551..6dccc1cf2b6a 100644 --- a/sd/source/ui/dlg/headerfooterdlg.src +++ b/sd/source/ui/dlg/headerfooterdlg.src @@ -103,6 +103,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER"; Pos = MAP_APPFONT ( C1, Y1 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -119,6 +120,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_HEADER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED"; Pos = MAP_APPFONT ( C4, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -135,6 +137,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_DATETIME { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME"; Pos = MAP_APPFONT ( C1, Y2 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -143,6 +146,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_FIXED { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C2, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); Size = MAP_APPFONT ( W2, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -151,6 +155,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_DATETIME_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C4, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -159,6 +164,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_AUTOMATIC { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC"; Pos = MAP_APPFONT ( C2, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ); Size = MAP_APPFONT ( 80, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -167,6 +173,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_FORMAT { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT"; Pos = MAP_APPFONT ( C3, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -183,6 +190,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_LANGUAGE { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE"; Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -199,6 +207,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER"; Pos = MAP_APPFONT ( C1, Y3 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -215,6 +224,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_FOOTER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED"; Pos = MAP_APPFONT ( C4, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -231,6 +241,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_SLIDENUMBER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER"; Pos = MAP_APPFONT ( C1, Y4 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -247,6 +258,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_NOTONTITLE { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE"; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -255,6 +267,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLYTOALL { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; @@ -263,6 +276,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLY { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_PUSHBUTTON_HEIGHT + SPACE_Y ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; diff --git a/sd/source/ui/dlg/ins_paste.src b/sd/source/ui/dlg/ins_paste.src index 0b066f096f87..0668e26f1993 100644 --- a/sd/source/ui/dlg/ins_paste.src +++ b/sd/source/ui/dlg/ins_paste.src @@ -29,6 +29,7 @@ ModalDialog DLG_INSERT_PASTE { + HelpID = "sd:ModalDialog:DLG_INSERT_PASTE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 148 , 90 ) ; @@ -61,6 +62,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_BEFORE { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_BEFORE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "~Before" ; @@ -68,6 +70,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_AFTER { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_AFTER"; Pos = MAP_APPFONT ( 12, 27 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "A~fter" ; diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 4eae011a9ba2..70bd99bd2641 100644 --- a/sd/source/ui/dlg/inspagob.src +++ b/sd/source/ui/dlg/inspagob.src @@ -30,7 +30,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS { - HelpID = DLG_INSERT_PAGES_OBJS ; + HelpID = HID_DLG_INSERT_PAGES_OBJS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 128 ) ; @@ -66,6 +66,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_LINK { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_LINK"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -73,6 +74,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 114 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index cd50a810d3fd..ee6a4c6c19d1 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.src +++ b/sd/source/ui/dlg/layeroptionsdlg.src @@ -27,10 +27,11 @@ #include "app.hrc" #include "layeroptionsdlg.hrc" +#include "helpids.h" ModalDialog DLG_INSERT_LAYER { - HelpID = SID_INSERTLAYER ; + HelpID = CMD_SID_INSERTLAYER ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 172 ) ; @@ -46,6 +47,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_NAME { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -61,6 +63,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_TITLE { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -76,6 +79,7 @@ ModalDialog DLG_INSERT_LAYER MultiLineEdit EDT_DESCRIPTION { + HelpID = "sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 69 ) ; Size = MAP_APPFONT ( 188 , 34 ) ; @@ -86,6 +90,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_VISIBLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE"; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Visible" ; @@ -94,6 +99,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_PRINTABLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE"; Pos = MAP_APPFONT ( 6 , 119 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Printable" ; @@ -102,6 +108,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_LOCKED { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED"; Pos = MAP_APPFONT ( 6 , 132 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Locked" ; diff --git a/sd/source/ui/dlg/masterlayoutdlg.src b/sd/source/ui/dlg/masterlayoutdlg.src index 1e862b63cec6..71cf192b5fd4 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.src +++ b/sd/source/ui/dlg/masterlayoutdlg.src @@ -31,6 +31,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT { + HelpID = "sd:ModalDialog:RID_SD_DLG_MASTER_LAYOUT"; Size = MAP_APPFONT( 89 , 92 ); OutputSize = TRUE; SVLook = TRUE; @@ -46,6 +47,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_HEADER"; Pos = MAP_APPFONT( 6, 16 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -55,6 +57,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_DATE { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_DATE"; Pos = MAP_APPFONT( 6, 29 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -64,6 +67,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_FOOTER"; Pos = MAP_APPFONT( 6, 42 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -73,6 +77,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_PAGE_NUMBER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_PAGE_NUMBER"; Pos = MAP_APPFONT( 6, 55 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index 64e63a33cd59..026a4fd29609 100644 --- a/sd/source/ui/dlg/morphdlg.src +++ b/sd/source/ui/dlg/morphdlg.src @@ -27,6 +27,8 @@ #include "app.hrc" #include "morphdlg.hrc" +#include "helpids.h" + /****************************************************************************** |* |* @@ -34,7 +36,8 @@ \******************************************************************************/ ModalDialog DLG_MORPH { - HelpID = SID_POLYGON_MORPHING ; + HelpID = CMD_SID_POLYGON_MORPHING ; + HelpID = ".uno:Morphing" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 196 , 68 ) ; @@ -74,6 +77,7 @@ ModalDialog DLG_MORPH }; MetricField MTF_STEPS { + HelpID = "sd:MetricField:DLG_MORPH:MTF_STEPS"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -87,6 +91,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ATTRIBUTES { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES"; Pos = MAP_APPFONT ( 12 , 29 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; /* ### ACHTUNG: Neuer Text in Resource? Attributierung überblenden : Attributierung ³berblenden */ @@ -95,6 +100,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ORIENTATION { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ORIENTATION"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 294aa6feb65a..2b21802b7a9e 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -309,6 +309,14 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) // gespeichert ist oder nicht PopupMenu *pMenu = new PopupMenu; + static const char* aHIDs[] = + { + HID_SD_NAVIGATOR_MENU1, + HID_SD_NAVIGATOR_MENU2, + HID_SD_NAVIGATOR_MENU3, + 0 + }; + for( USHORT nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; nID++ ) @@ -316,9 +324,9 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) USHORT nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); if( nRId > 0 ) { + DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); pMenu->InsertItem( nID, String( SdResId( nRId ) ) ); - pMenu->SetHelpId( nID, HID_SD_NAVIGATOR_MENU1 + - nID - NAVIGATOR_DRAGTYPE_URL ); + pMenu->SetHelpId( nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL] ); } } diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src index 041a4524a705..99a9d4f4c17f 100644 --- a/sd/source/ui/dlg/paragr.src +++ b/sd/source/ui/dlg/paragr.src @@ -27,6 +27,7 @@ #include <svx/dialogs.hrc> #include "glob.hrc" +#include "helpids.h" #include "paragr.hrc" TabDialog TAB_PARAGRAPH @@ -105,13 +106,14 @@ TabDialog TAB_PARAGRAPH TabPage RID_TABPAGE_PARA_NUMBERING { - HelpId = RID_TABPAGE_PARA_NUMBERING ; + HelpId = HID_TABPAGE_PARA_NUMBERING ; Hide = TRUE ; Text = "Numbering" ; Size = MAP_APPFONT ( 260 , 185 ) ; TriStateBox CB_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NEW_START"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -119,6 +121,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; TriStateBox CB_NUMBER_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NUMBER_NEW_START"; Pos = MAP_APPFONT ( 15 , 21 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; Disable = TRUE ; @@ -126,6 +129,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; NumericField NF_NEW_START { + HelpID = "sd:NumericField:RID_TABPAGE_PARA_NUMBERING:NF_NEW_START"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 20 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index 830e320ca4ba..73c16148a184 100644 --- a/sd/source/ui/dlg/present.src +++ b/sd/source/ui/dlg/present.src @@ -33,7 +33,7 @@ ModalDialog DLG_START_PRESENTATION { - HelpID = SID_PRESENTATION ; + HelpID = CMD_SID_PRESENTATION ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 256, 205 ) ; @@ -69,6 +69,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_ALL { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80 , 12 ) ; Text [ en-US ] = "All ~slides" ; @@ -76,6 +77,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_AT_DIA { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AT_DIA"; Pos = MAP_APPFONT ( 12 , 26 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; Text [ en-US ] = "~From:" ; @@ -83,6 +85,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_DIAS { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_DIAS"; Border = TRUE ; Pos = MAP_APPFONT ( 82, 24 ) ; Size = MAP_APPFONT ( 111, 80 ) ; @@ -92,6 +95,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_CUSTOMSHOW { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; TabStop = TRUE ; @@ -99,6 +103,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_CUSTOMSHOW { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW"; Border = TRUE ; Pos = MAP_APPFONT ( 32, 53 ) ; Size = MAP_APPFONT ( 161, 80 ) ; @@ -114,6 +119,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_STANDARD { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD"; Pos = MAP_APPFONT ( 12, 84 ) ; Size = MAP_APPFONT ( 81, 12 ) ; Text [ en-US ] = "~Default" ; @@ -121,6 +127,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_WINDOW { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 81 , 12 ) ; Text [ en-US ] = "~Window" ; @@ -128,6 +135,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_AUTO { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO"; Pos = MAP_APPFONT ( 12 , 108 ) ; Size = MAP_APPFONT ( 81 , 12 ) ; Text [ en-US ] = "A~uto" ; @@ -143,6 +151,7 @@ ModalDialog DLG_START_PRESENTATION */ TimeField TMF_PAUSE { + HelpID = "sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE"; Pos = MAP_APPFONT ( 32, 120 ) ; Size = MAP_APPFONT ( 50, 12 ) ; Border = TRUE ; @@ -167,6 +176,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_AUTOLOGO { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO"; Pos = MAP_APPFONT ( 32 , 138 ) ; Size = MAP_APPFONT ( 61 , 12 ) ; TabStop = TRUE ; @@ -181,6 +191,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_MANUEL { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL"; Pos = MAP_APPFONT ( 108 , 84 ) ; Size = MAP_APPFONT ( 139 , 12 ) ; TabStop = TRUE ; @@ -188,6 +199,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_MOUSEPOINTER { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER"; Pos = MAP_APPFONT ( 108, 96 ) ; Size = MAP_APPFONT ( 139, 12 ) ; Text [ en-US ] = "Mouse pointer ~visible" ; @@ -195,6 +207,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_PEN { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_PEN"; Pos = MAP_APPFONT ( 108, 108 ) ; Size = MAP_APPFONT ( 139, 12 ) ; Text [ en-US ] = "Mouse pointer as ~pen" ; @@ -202,6 +215,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_NAVIGATOR { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR"; Pos = MAP_APPFONT ( 108, 120 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -209,6 +223,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_ANIMATION_ALLOWED { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED"; Pos = MAP_APPFONT ( 108, 132 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -216,6 +231,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_CHANGE_PAGE { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE"; Pos = MAP_APPFONT ( 108, 144 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -223,6 +239,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_ALWAYS_ON_TOP { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP"; Pos = MAP_APPFONT ( 108, 156 ) ; Size = MAP_APPFONT ( 145, 12 ) ; /* ### ACHTUNG: Neuer Text in Resource? Präsentation immer im ~Vordergrund : Prõsentation immer im ~Vordergrund */ diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src index dd2ed2e3f63b..7a4f88068e87 100644 --- a/sd/source/ui/dlg/prntopts.src +++ b/sd/source/ui/dlg/prntopts.src @@ -42,6 +42,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DRAW { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -49,6 +50,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_NOTES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -56,6 +58,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HANDOUTS { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -63,6 +66,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_OUTLINE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -82,6 +86,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_COLOR { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR"; Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Default" ; @@ -89,6 +94,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_GRAYSCALE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_GRAYSCALE"; Pos = MAP_APPFONT ( 136 , 28 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Gra~yscale" ; @@ -96,6 +102,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BLACKWHITE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BLACKWHITE"; Pos = MAP_APPFONT ( 136 , 42 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Black & ~white" ; @@ -109,6 +116,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAGENAME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME"; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "~Page name" ; @@ -116,6 +124,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DATE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "D~ate" ; @@ -123,6 +132,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_TIME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Ti~me" ; @@ -130,6 +140,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HIDDEN_PAGES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES"; Pos = MAP_APPFONT ( 12 , 125 ) ; // 120 , 14 Size = MAP_APPFONT ( 90 , 10 ) ; @@ -150,6 +161,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_DEFAULT { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT"; Pos = MAP_APPFONT ( 136 , 83 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -157,6 +169,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGESIZE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE"; Pos = MAP_APPFONT ( 136 , 97 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; Text [ en-US ] = "~Fit to page" ; @@ -164,6 +177,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGETILE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -171,6 +185,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BOOKLET { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET"; Pos = MAP_APPFONT ( 136, 125 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -178,6 +193,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_FRONT { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT"; Pos = MAP_APPFONT ( 145 , 139 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; TabStop = TRUE ; @@ -185,6 +201,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_BACK { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK"; Pos = MAP_APPFONT ( 202 , 139 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -192,6 +209,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAPERBIN { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN"; Pos = MAP_APPFONT ( 136 , 153 ) ; Size = MAP_APPFONT ( 118 , 30 ) ; Text [ en-US ] = "Paper tray from printer s~ettings" ; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index aa0bb5ce9f27..9feb7507bd3f 100755 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -266,9 +266,9 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) { - pDlg->SetHelpId( nHelpId ); + pDlg->SetHelpId( rHelpId ); } // AbstractSdInsertLayerDlg_Impl end diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index fa5e53ebac54..a8c1de96de62 100755 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -169,7 +169,7 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& rHelpId ) ; }; // add for SdInsertPasteDlg diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src index 3aad51674a46..f77132642b8a 100644 --- a/sd/source/ui/dlg/sdpreslt.src +++ b/sd/source/ui/dlg/sdpreslt.src @@ -27,9 +27,11 @@ #include "app.hrc" #include "sdpreslt.hrc" +#include "sdcommands.h" + ModalDialog DLG_PRESLT { - HelpID = SID_PRESENTATION_LAYOUT ; + HelpID = CMD_SID_PRESENTATION_LAYOUT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 212 , 185 ) ; @@ -64,6 +66,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_MASTER_PAGE { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_MASTER_PAGE"; Pos = MAP_APPFONT ( 6 , 158 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; TabStop = TRUE ; @@ -71,6 +74,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 170 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -78,6 +82,7 @@ ModalDialog DLG_PRESLT }; PushButton BTN_LOAD { + HelpID = "sd:PushButton:DLG_PRESLT:BTN_LOAD"; Pos = MAP_APPFONT ( 156 , 155 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index fa951644c580..a567afebdf5c 100644 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.src @@ -32,7 +32,7 @@ TabPage TP_ANIMATION { - HelpID = SID_ANIMATION_EFFECTS ; + HelpID = CMD_SID_ANIMATION_EFFECTS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 260 , 164 ) ; Hide = TRUE; @@ -48,6 +48,7 @@ TabPage TP_ANIMATION }; ListBox LB_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT , MA_ACTIONLB_TOP ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 79 ) ; @@ -66,6 +67,7 @@ TabPage TP_ANIMATION Edit EDT_SOUND { + HelpID = "sd:Edit:TP_ANIMATION:EDT_SOUND"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) , 12 ) ; @@ -77,6 +79,7 @@ TabPage TP_ANIMATION // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben PushButton BTN_SEARCH { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; @@ -112,6 +115,7 @@ TabPage TP_ANIMATION }; ListBox LB_OLE_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_OLE_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT, MA_Y0 + 3 ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 77 ) ; @@ -126,6 +130,7 @@ TabPage TP_ANIMATION }; Edit EDT_BOOKMARK { + HelpID = "sd:Edit:TP_ANIMATION:EDT_BOOKMARK"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -134,6 +139,7 @@ TabPage TP_ANIMATION }; Edit EDT_DOCUMENT { + HelpID = "sd:Edit:TP_ANIMATION:EDT_DOCUMENT"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -142,6 +148,7 @@ TabPage TP_ANIMATION }; Edit EDT_PROGRAM { + HelpID = "sd:Edit:TP_ANIMATION:EDT_PROGRAM"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -150,6 +157,7 @@ TabPage TP_ANIMATION }; Edit EDT_MACRO { + HelpID = "sd:Edit:TP_ANIMATION:EDT_MACRO"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -158,6 +166,7 @@ TabPage TP_ANIMATION }; PushButton BTN_SEEK { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEEK"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src index 639f7524c6d3..14db5a6a7635 100755..100644 --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.src @@ -45,6 +45,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_RULER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER"; Pos = MAP_APPFONT ( 12 , 83 - 69 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -52,6 +53,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_HELPLINES { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES"; Pos = MAP_APPFONT ( 12 , 97 - 69 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -59,6 +61,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_HANDLES_BEZIER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER"; Pos = MAP_APPFONT ( 12 , 111 - 69 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -66,6 +69,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_MOVE_OUTLINE { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE"; Pos = MAP_APPFONT ( 12 , 125 - 69 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -87,6 +91,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_QUICKEDIT { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -94,6 +99,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_PICKTHROUGH { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -107,6 +113,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_TEMPLATE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -120,6 +127,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MASTERPAGE_CACHE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -127,6 +135,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_COPY { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY"; Pos = MAP_APPFONT ( 12 , 93 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -134,6 +143,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MARKED_HIT_MOVES_ALWAYS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS"; Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -141,6 +151,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_CROOK_NO_CONTORTION { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -155,6 +166,7 @@ TabPage TP_OPTIONS_MISC }; ListBox LB_METRIC { + HelpID = "sd:ListBox:TP_OPTIONS_MISC:LB_METRIC"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 117 ) ; Size = MAP_APPFONT ( 50 , 50 ) ; @@ -169,6 +181,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_TABSTOP { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP"; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 117 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -192,6 +205,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_ACTUAL_PAGE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE"; Pos = MAP_APPFONT ( 12 , 145 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -205,6 +219,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_USE_PRINTER_METRICS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS"; // This checkbox and the following one will change places when this // one is wired in into the dialog. At the moment exists only for // translation to work on. @@ -214,6 +229,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_MERGE_PARA_DIST { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_MERGE_PARA_DIST"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 242, 10 ) ; Text [ en-US ] = "Add ~spacing between paragraphs and tables (in current document)"; @@ -248,6 +264,7 @@ TabPage TP_OPTIONS_MISC }; ComboBox CB_SCALE { + HelpID = "sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE"; Hide = TRUE; Pos = MAP_APPFONT ( 72 , 147 ) ; Size = MAP_APPFONT ( 30 , 70 ) ; @@ -269,6 +286,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_WIDTH { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_WIDTH"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 147 ) ; @@ -300,6 +318,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_HEIGHT { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_HEIGHT"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 163 ) ; diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index 53b77ad49eab..f66ba0a9454c 100644 --- a/sd/source/ui/dlg/vectdlg.src +++ b/sd/source/ui/dlg/vectdlg.src @@ -28,6 +28,7 @@ #include "app.hrc" #include "vectdlg.hrc" +#include "helpids.h" /****************************************************************************** |* @@ -37,7 +38,7 @@ ModalDialog DLG_VECTORIZE { - HelpID = SID_VECTORIZE; + HelpID = HID_VECTORIZE_DLG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200, 237 ) ; @@ -70,6 +71,7 @@ ModalDialog DLG_VECTORIZE PushButton BTN_PREVIEW { + HelpID = "sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW"; Pos = MAP_APPFONT ( 144 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -92,6 +94,7 @@ ModalDialog DLG_VECTORIZE NumericField NM_LAYERS { + HelpID = "sd:NumericField:DLG_VECTORIZE:NM_LAYERS"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -115,6 +118,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_REDUCE { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_REDUCE"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 29 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -133,6 +137,7 @@ ModalDialog DLG_VECTORIZE CheckBox CB_FILLHOLES { + HelpID = "sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; TabStop = TRUE ; @@ -148,6 +153,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_FILLHOLES { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 59 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 2db29c725718..f29288ea2b03 100755 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -42,7 +42,7 @@ #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> - +#include <sfx2/msgpool.hxx> #include <svtools/sores.hxx> #include <svtools/insdlg.hxx> #include <sfx2/request.hxx> @@ -454,12 +454,11 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) // intentionally no break! } case SID_INSERT_PLUGIN : - case SID_INSERT_APPLET : case SID_INSERT_FLOATINGFRAME : { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), nSlotId, + pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(), xStorage, &aServerLst ); if ( pDlg ) { diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 43572c2af8a4..437d4bc246a6 100644..100755 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -54,7 +54,7 @@ #include <svx/xlndsit.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnedit.hxx> - +#include "app.hrc" #include "stlsheet.hxx" #include "sdpage.hxx" #include "stlpool.hxx" diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 960f09ff796d..2f30f1554aed 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -64,7 +64,6 @@ public: const ::rtl::OUString& rsTitle); virtual ~PaneDockingWindow (void); - virtual void StateChanged( StateChangedType nType ); virtual void MouseButtonDown (const MouseEvent& rEvent); /** When docked the given range is passed to the parent SplitWindow. diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index f04af6f47168..f8ce5dccc242 100755 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -76,7 +76,7 @@ public: TitledControl* AddControl ( ::std::auto_ptr<TreeNode> pControl, const String& rTitle, - ULONG nHelpId); + const rtl::OString& sHelpId); /** Add a control to the sub panel without a title bar. */ diff --git a/sd/source/ui/notes/NotesChildWindow.src b/sd/source/ui/notes/NotesChildWindow.src index f01a258bf812..14ac956ce9e3 100755 --- a/sd/source/ui/notes/NotesChildWindow.src +++ b/sd/source/ui/notes/NotesChildWindow.src @@ -27,10 +27,11 @@ #include "app.hrc" #include "NotesChildWindow.hrc" +#include "sdcommands.h" DockingWindow FLT_WIN_NOTES { - HelpID = SID_NOTES_WINDOW ; + HelpID = CMD_SID_NOTES_WINDOW ; Border = TRUE ; Hide = FALSE ; SVLook = TRUE ; diff --git a/sd/source/ui/table/TableDesignPane.src b/sd/source/ui/table/TableDesignPane.src index 9ce9470ffa2b..c30bf49f6248 100644 --- a/sd/source/ui/table/TableDesignPane.src +++ b/sd/source/ui/table/TableDesignPane.src @@ -112,6 +112,7 @@ Control DLG_TABLEDESIGNPANE ModalDialog DLG_TABLEDESIGNPANE { + HelpID = "sd:ModalDialog:DLG_TABLEDESIGNPANE"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE ; diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index b46090f1e7eb..854009b00c7e 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -35,7 +35,7 @@ #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> - +#include <sfx2/msgpool.hxx> #include <svl/whiter.hxx> #include <svl/itempool.hxx> #include <svx/svdomedia.hxx> @@ -166,7 +166,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) case SID_TABLE_INSERT_COL_DLG: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, nSlotId) : 0); + ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand()) : 0); if( pDlg.get() && (pDlg->Execute() == 1) ) { diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index ec4eb1e43d4d..ef621db2a22d 100755 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -221,7 +221,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER); - SetSmartHelpId(SmartId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS)); + Window::SetHelpId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS); SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE)); Link aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler)); @@ -231,7 +231,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) ::rtl::OUString::createFromAscii(".uno:VerticalTextState")); // Add this new object as shell to the shell factory. - GetShellManager()->AddSubShell(HID_SD_TASK_PANE_PREVIEW_LAYOUTS,this,this); + GetShellManager()->AddSubShell(SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS,this,this); } diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index 33fd325313a3..9c1c087c8ab1 100755 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -118,7 +118,7 @@ ScrollPanel::~ScrollPanel (void) TitledControl* ScrollPanel::AddControl ( ::std::auto_ptr<TreeNode> pControl, const String& rTitle, - ULONG nHelpId) + const rtl::OString& rHelpId) { // We are interested only in the title. The control itself is // managed by the content object. @@ -128,7 +128,7 @@ TitledControl* ScrollPanel::AddControl ( rTitle, TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); - pTitledControl->GetTitleBar()->SetHelpId(nHelpId); + pTitledControl->GetTitleBar()->SetHelpId(rHelpId); AddControl(::std::auto_ptr<TreeNode>(pTitledControl)); diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index 044b40dcdb4f..8fb24dd83bc2 100755 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -129,7 +129,7 @@ TestPanel::TestPanel (::Window& i_rParent) ::std::auto_ptr<TreeNode>(new Wrapper ( pScrollPanel, Size (200,300), pBox, true)), String::CreateFromAscii ("First ListBox"), - 0); + ""); pBox = new ListBox (pScrollPanel->GetWindow()); for (i=1; i<=20; i++) @@ -143,7 +143,7 @@ TestPanel::TestPanel (::Window& i_rParent) ::std::auto_ptr<TreeNode>(new Wrapper ( pScrollPanel, Size (200,300), pBox, true)), String::CreateFromAscii ("Second ListBox"), - 0); + ""); AddControl (::std::auto_ptr<TreeNode>(pScrollPanel)); @@ -153,7 +153,7 @@ TestPanel::TestPanel (::Window& i_rParent) ::std::auto_ptr<TreeNode>(new Wrapper ( this, Size (100,30), pButton, false)), String::CreateFromAscii ("Button Area"), - 0); + ""); } diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index eb465789e7dc..f499e10b418c 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -681,10 +681,10 @@ namespace struct PanelFactory { ControlFactoryFactory pFactory; - ULONG nHelpID; - PanelFactory( const ControlFactoryFactory i_pFactory, const ULONG i_nHelpID ) + rtl::OString sHelpID; + PanelFactory( const ControlFactoryFactory i_pFactory, const rtl::OString& i_nHelpID ) :pFactory( i_pFactory ) - ,nHelpID( i_nHelpID ) + ,sHelpID( i_nHelpID ) { } }; @@ -722,7 +722,7 @@ Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Referenc ::std::auto_ptr< TreeNode > pNode( pControlFactory->CreateControl( mpImpl->GetToolPanelDeck().GetPanelWindowAnchor() ) ); ENSURE_OR_THROW( ( pNode.get() != NULL ) && ( pNode->GetWindow() != NULL ), "illegal node returned by the control factory" ); - pNode->GetWindow()->SetHelpId( aPanelFactory.nHelpID ); + pNode->GetWindow()->SetHelpId( aPanelFactory.sHelpID ); // create an XToolPanel Reference< XToolPanel > xPanel( new ToolPanel( pNode ) ); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index 8dab51e93a58..d7c96252136c 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -45,6 +45,7 @@ #include "sdresid.hxx" #include "helpids.h" #include <svtools/valueset.hxx> +#include "app.hrc" namespace sd { namespace toolpanel { namespace controls { @@ -73,9 +74,9 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) rBase, pContainer)); pSelector->LateInit(); - pSelector->SetSmartHelpId( SmartId(HID_SD_TASK_PANE_PREVIEW_CURRENT) ); + pSelector->SetHelpId( HID_SD_TASK_PANE_PREVIEW_CURRENT ); GetShellManager()->AddSubShell( - HID_SD_TASK_PANE_PREVIEW_CURRENT, + SHELLID_SD_TASK_PANE_PREVIEW_CURRENT, pSelector.get(), pSelector->GetWindow()); pTitledControl = AddControl ( @@ -90,9 +91,9 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) rBase, pContainer)); pSelector->LateInit(); - pSelector->SetSmartHelpId( SmartId(HID_SD_TASK_PANE_PREVIEW_RECENT) ); + pSelector->SetHelpId( HID_SD_TASK_PANE_PREVIEW_RECENT ); GetShellManager()->AddSubShell( - HID_SD_TASK_PANE_PREVIEW_RECENT, + SHELLID_SD_TASK_PANE_PREVIEW_RECENT, pSelector.get(), pSelector->GetWindow()); pTitledControl = AddControl ( @@ -108,9 +109,9 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) *pDrawViewShell, pContainer)); pSelector->LateInit(); - pSelector->SetSmartHelpId( SmartId(HID_SD_TASK_PANE_PREVIEW_ALL) ); + pSelector->SetHelpId( HID_SD_TASK_PANE_PREVIEW_ALL ); GetShellManager()->AddSubShell( - HID_SD_TASK_PANE_PREVIEW_ALL, + SHELLID_SD_TASK_PANE_PREVIEW_ALL, pSelector.get(), pSelector->GetWindow()); pTitledControl = AddControl ( @@ -129,9 +130,9 @@ MasterPagesPanel::~MasterPagesPanel (void) OSL_ENSURE( pShellManager, "MasterPagesPanel::~MasterPagesPanel: no shell manager anymore - cannot remove sub shells!" ); if ( pShellManager ) { - pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_CURRENT ); - pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_RECENT ); - pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_ALL ); + pShellManager->RemoveSubShell( SHELLID_SD_TASK_PANE_PREVIEW_CURRENT ); + pShellManager->RemoveSubShell( SHELLID_SD_TASK_PANE_PREVIEW_RECENT ); + pShellManager->RemoveSubShell( SHELLID_SD_TASK_PANE_PREVIEW_ALL ); } } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index b321dbf8dd14..6c59f5fa2b51 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -757,11 +757,11 @@ void MasterPagesSelector::ClearPageSet (void) -void MasterPagesSelector::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode ) +void MasterPagesSelector::SetHelpId( const rtl::OString& aId ) { const ::osl::MutexGuard aGuard (maMutex); - mpPageSet->SetSmartHelpId( aId, aMode ); + mpPageSet->SetHelpId( aId ); } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index a2df51f2bd4b..bc3c87f7a6c9 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -121,7 +121,8 @@ public: */ void ClearPageSet (void); - void SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); + using SfxShell::SetHelpId; + void SetHelpId( const rtl::OString& aId ); /** Mark the preview that belongs to the given index as not up-to-date anymore with respect to page content or preview size. 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 ); } |