diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
| commit | e2280d56bfd8f963b4caea5b200a83be8664d5a3 (patch) | |
| tree | ae636225330f808d1b793f17d2fcc07aa1a90e68 /sd/source/ui | |
| parent | 603694c8c2f44ca225bf373fa1c2d977047c4f70 (diff) | |
CWS changehid: #i111874#: change code to support HelpIds as byte strings
Diffstat (limited to 'sd/source/ui')
58 files changed, 438 insertions, 2383 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 217bdd4267cb..3ac3d1f24a07 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -542,24 +542,19 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets(); mpTabPages[ENTRANCE] = new CustomAnimationCreateTabPage( mpTabControl, this, ENTRANCE, rPresets.getEntrancePresets(), bHasText ); - // FIXME: HELPID - mpTabPages[ENTRANCE]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE*/ ); + mpTabPages[ENTRANCE]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_ENTRANCE, mpTabPages[ENTRANCE] ); mpTabPages[EMPHASIS] = new CustomAnimationCreateTabPage( mpTabControl, this, EMPHASIS, rPresets.getEmphasisPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[EMPHASIS]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS*/ ); + mpTabPages[EMPHASIS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_EMPHASIS, mpTabPages[EMPHASIS] ); mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, EXIT, rPresets.getExitPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[EXIT]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_EXIT*/ ); + mpTabPages[EXIT]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EXIT ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_EXIT, mpTabPages[EXIT] ); mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, MOTIONPATH, rPresets.getMotionPathsPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[MOTIONPATH]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH*/ ); + mpTabPages[MOTIONPATH]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MOTIONPATH, mpTabPages[MOTIONPATH] ); mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, MISCEFFECTS, rPresets.getMiscPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[MISCEFFECTS]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS*/ ); + mpTabPages[MISCEFFECTS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MISCEFFECTS, mpTabPages[MISCEFFECTS] ); getCurrentPage()->setDuration( mfDuration ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index b1efd1cf1904..7f942562b951 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -144,8 +144,7 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, c mpControl = new ListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX ); setValue( rValue, aPresetId ); @@ -231,8 +230,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con mpControl = new ColorListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX ); SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -324,8 +322,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const mpControl = new FontNameBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX ); SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem; @@ -504,8 +501,7 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pP mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, CharHeightPropertyBox, implMenuSelectHdl )); mpControl->SetModifyHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX ); OUString aPresetId; setValue( rValue, aPresetId ); @@ -607,8 +603,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, TransparencyPropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX ); Link aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -724,8 +719,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParen mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_ROTATION_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, RotationPropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX ); Link aLink( LINK( this, RotationPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -866,8 +860,7 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, con mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_SCALE_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, ScalePropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX ); Link aLink( LINK( this, ScalePropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -1046,8 +1039,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pPar mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_FONTSTYLE_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpEdit, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, FontStylePropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX ); OUString aPresetId; setValue( rValue, aPresetId ); 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 d64d9b672f7e..84d1d02e45f8 100644 --- 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 54b9ed6ba44c..9a7c7f39fae6 100644 --- 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 Fuzeile.."; \ }; @@ -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\ {\ @@ -987,7 +987,7 @@ MenuItem\ {\ Identifier = SID_MULTI_PANE_GUI ; \ - HelpID = SID_MULTI_PANE_GUI ; \ + HelpId = CMD_SID_MULTI_PANE_GUI ; \ Text = "Multi Pane GUI" ; \ SubMenu = Menu \ {\ @@ -996,21 +996,21 @@ MenuItem\ {\ Identifier = SID_TOOLPANEL ; \ - HelpID = SID_TOOLPANEL ; \ + HelpId = CMD_SID_TOOLPANEL ; \ Check = TRUE ; \ Text = "Tool Panel" ; \ };\ MenuItem\ {\ Identifier = SID_SLIDE_BROWSER ; \ - HelpID = SID_SLIDE_BROWSER ; \ + HelpId = CMD_SID_SLIDE_BROWSER ; \ Check = TRUE ; \ Text = "Slide Browser" ; \ };\ MenuItem\ {\ Identifier = SID_NOTES_WINDOW ; \ - HelpID = SID_NOTES_WINDOW ; \ + HelpId = CMD_SID_NOTES_WINDOW ; \ Check = TRUE ; \ Text = "Notes Window" ; \ };\ 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-Rotationskrper : In 3~D-Rotationskrper */\ 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? ~Bildschirmprsentation : ~Bildschirmprsentation... */\ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmprsentation : ~Bildschirmprsentation... */\ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmprsentation : ~Bildschirmprsentation */\ @@ -85,7 +87,7 @@ MenuItem\ {\ Identifier = SID_CAPTUREPOINT ; \ - HelpID = SID_CAPTUREPOINT ; \ + HelpId = CMD_SID_CAPTUREPOINT ; \ /* ### ACHTUNG: Neuer Text in Resource? F~angpunkt/-linie einfgen... : F~angpunkt/-linie einfgen... */\ /* ### ACHTUNG: Neuer Text in Resource? Fangpunkt oder -linie einfgen : Fangpunkt oder -linie einfgen */\ 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 lschen : Fangobjekt bearbeiten oder lschen */\ 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? ~Lschen : ~Lschen */\ /* ### ACHTUNG: Neuer Text in Resource? Fangobjekt lschen : Fangobjekt lschen */\ 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? Seitengre, Ausrichtung, Rahmen festlegen : Seitengre, 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 ~zurcksetzen : Linienverlauf ~zurcksetzen */\ 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 fr den selektierten Bereich auswhlen : Zeichenattribute fr den selektierten Bereich auswhlen */\ }; @@ -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? ~Gre : ~Gre */\ 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 schlieen : ~Objekt schlieen */\ 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 ~einfgen : Punkte ~einfgen */\ 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 schlieen : ~Objekt schlieen */\ 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? Ausgewhlte Objekte gruppieren : Ausgewhlte 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? Ausgewhlte Objekte kombinieren : Ausgewhlte 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 knnen bearbeitet werden : Objekte der Gruppierung knnen 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 knnen nicht mehr bearbeitet werden : Objekte der Gruppierung knnen 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? ~Prsentationsobjekt... : ~Prsentationsobjekt... */\ /* ### ACHTUNG: Neuer Text in Resource? Selektiertes Prsentationsobjekt bearbeiten : Selektiertes Prsentationsobjekt 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 lschen : Alle selektierten Objekte lschen */\ @@ -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 einfgen : ~Punkt einfgen */\ 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 einfgen... : ~Ebene einfgen... */ 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 lschen... : Ebe~ne lschen... */ 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 32087f993e62..a1b91d0ac832 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -158,58 +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 ); - // FIXME: HELPID - 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 3066355ef95e..7b977836297a 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" ; @@ -483,7 +485,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 { 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? Einfgen : Einfgen */ - 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/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index a5053617288d..29425a3bda71 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -71,8 +71,7 @@ LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) EnableEditMode(); SetSizePixel(Size(0, 0)); SetMaxPageWidth( 150 ); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_TABBAR_LAYERS*/ ); + SetHelpId( HID_SD_TABBAR_LAYERS ); } diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index e545d832b1d9..e64e18697a77 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -271,7 +271,7 @@ void PaneDockingWindow::InitializeTitleToolBox (void) USHORT PaneDockingWindow::AddMenu ( const String& rsMenuName, - ULONG nHelpId, + const rtl::OString& rHelpId, const Link& rCallback) { // Add the menu before the closer button. @@ -282,9 +282,7 @@ USHORT PaneDockingWindow::AddMenu ( rsMenuName, TIB_DROPDOWNONLY, nItemCount>0 ? nItemCount-1 : (USHORT)-1); - // FIXME: HELPID - mpTitleToolBox->SetHelpId( nItemId, ""/*nHelpId*/ ); - (void)nHelpId; + mpTitleToolBox->SetHelpId( nItemId, rHelpId ); mpTitleToolBox->SetClickHdl (rCallback); mpTitleToolBox->SetDropdownClickHdl (rCallback); diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index d631dcaba2b2..58fb31137e34 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 ; diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index 920be5e8df70..6cb04804ea9e 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 ) ; diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index c8c49e9c0d48..871781ad5fa3 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 ) ; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 455cca1d281a..0fa644e3ac95 100644 --- 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, @@ -1120,9 +1120,7 @@ void AssistentDlgImpl::ChangePage() if( mpWindow ) { - // FIXME: HELPID - (void)nPage; - mpWindow->SetHelpId( ""/*PageHelpIds[nPage-1]*/); + mpWindow->SetHelpId( PageHelpIds[nPage-1]); } UpdatePage(); diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index 631034dd5879..2cc106db4b75 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 ) ; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 6669b98c6818..294e61f3fe40 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -240,8 +240,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent maTabCtrl.Show(); mpSlideTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pSlide, false ); - // FIXME: HELPID - mpSlideTabPage->SetHelpId( ""/*HID_SD_TABPAGE_HEADERFOOTER_SLIDE*/ ); + mpSlideTabPage->SetHelpId( HID_SD_TABPAGE_HEADERFOOTER_SLIDE ); maTabCtrl.SetTabPage( RID_SD_TABPAGE_HEADERFOOTER_SLIDE, mpSlideTabPage ); Size aSiz = mpSlideTabPage->GetSizePixel(); @@ -254,8 +253,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent } mpNotesHandoutsTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pNotes, true ); - // FIXME: HELPID - mpNotesHandoutsTabPage->SetHelpId( ""/*HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT*/ ); + mpNotesHandoutsTabPage->SetHelpId( HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT ); maTabCtrl.SetTabPage( RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT, mpNotesHandoutsTabPage ); aSiz = mpNotesHandoutsTabPage->GetSizePixel(); diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 4eae011a9ba2..99cfee3de049 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 ) ; diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index cd50a810d3fd..e57876093570 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 ) ; diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index 64e63a33cd59..7bdebec16bf7 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 ) ; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index c019ab330c71..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,10 +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 ) ) ); - // FIXME: HELPID - 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..65ac21c5142f 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,7 +106,7 @@ 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 ) ; diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index 830e320ca4ba..74f6db89fe55 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 ) ; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index f95c4027d7f8..c8bc8f49a28e 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -268,11 +268,9 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) { - // FIXME: HELPID - (void)nHelpId; - 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 44f5b0813a04..c5c1489d0529 100644 --- 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..c8b0ee73b135 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 ) ; diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index fa951644c580..92516026884b 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; diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index 53b77ad49eab..757233d9d33b 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 ) ; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 931ff3a10cb8..d28ac5afc1b8 100644 --- 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> @@ -431,12 +431,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/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 03e6cf96c0f0..f469e51c6826 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -91,7 +91,7 @@ public: callback to the value of GetCurItemId() when called at the given tool box. */ - USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback); + USHORT AddMenu (const String& rsMenuName, const rtl::OString& rHelpId, const Link& rCallback); /** Set the title of the docking window to the given string. Use this method when the title is not yet known at the time of construction diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 019e06d9dd44..b22b7bfbccbc 100644 --- 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/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 9524cdddf748..c9d691161b4d 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -79,7 +79,7 @@ public: void AddControl ( ::std::auto_ptr<TreeNode> pControl, const String& rTitle, - ULONG nHelpId); + const rtl::OString& sHelpId); void AddControl (::std::auto_ptr<TreeNode> pControl); virtual void Paint (const Rectangle& rRect); diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx index f2c573a21c06..76d153b04de7 100644 --- a/sd/source/ui/inc/taskpane/ToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanel.hxx @@ -79,7 +79,7 @@ public: sal_uInt32 AddControl ( ::std::auto_ptr<ControlFactory> pControlFactory, const String& rTitle, - ULONG nHelpId, + const rtl::OString& sHelpId, const TitledControl::ClickHandler& rClickHandler); virtual void Resize (void); 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/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index c81abe4b0931..fe6f9483b8b6 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -76,10 +76,8 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: SetMapMode(aMap); // HelpId setzen - // FIXME: HELPID - SetHelpId( ""/*HID_SD_WIN_PRESENTATION*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_SD_WIN_PRESENTATION*/ ); + SetHelpId( HID_SD_WIN_PRESENTATION ); + SetUniqueId( HID_SD_WIN_PRESENTATION ); maPauseTimer.SetTimeoutHdl( LINK( this, ShowWindow, PauseTimeoutHdl ) ); maPauseTimer.SetTimeout( 1000 ); 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 2ba3ac742d18..57db3e7c1345 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -261,8 +261,7 @@ LayoutMenu::LayoutMenu ( | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER); - // FIXME: HELPID - Window::SetHelpId(""/*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)); @@ -272,7 +271,7 @@ LayoutMenu::LayoutMenu ( ::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 72b40e57e611..582c975dfbb8 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -122,7 +122,7 @@ void ScrollPanel::ListHasChanged (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. @@ -132,9 +132,7 @@ TitledControl* ScrollPanel::AddControl ( rTitle, TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); - // FIXME: HELPID - pTitledControl->GetTitleBar()->SetHelpId(""/*nHelpId*/); - (void)nHelpId; + pTitledControl->GetTitleBar()->SetHelpId(rHelpId); AddControl(::std::auto_ptr<TreeNode>(pTitledControl)); diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index bb9a65a5b728..ecd5ac3b3b48 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -98,7 +98,7 @@ void SubToolPanel::ListHasChanged (void) void SubToolPanel::AddControl ( ::std::auto_ptr<TreeNode> pControl, const String& rTitle, - ULONG nHelpId) + const rtl::OString& sHelpId) { pControl->GetWindow()->AddEventListener ( LINK(this,SubToolPanel,WindowEventListener)); @@ -112,9 +112,7 @@ void SubToolPanel::AddControl ( TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); pTitledControl->GetWindow()->SetParent(this); - // FIXME: HELPID - pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); - (void)nHelpId; + pTitledControl->GetWindow()->SetHelpId(sHelpId); ::std::auto_ptr<TreeNode> pChild (pTitledControl); // Add a down link only for the first control so that when diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index a00142fa81c1..d80beba7cd10 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -362,8 +362,7 @@ TaskPaneViewShell::TaskPaneViewShell ( GetParentWindow()->SetBackground(Wallpaper()); mpContentWindow->SetBackground(Wallpaper()); - // FIXME: HELPID - GetParentWindow()->SetHelpId(""/*HID_SD_TASK_PANE*/); + GetParentWindow()->SetHelpId(HID_SD_TASK_PANE); PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(GetDockingWindow()); if (pDockingWindow != NULL) diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index e2786e23a0c5..dd11e025f285 100644 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -128,7 +128,7 @@ TestPanel::TestPanel (TreeNode* pParent) ::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++) @@ -142,7 +142,7 @@ TestPanel::TestPanel (TreeNode* pParent) ::std::auto_ptr<TreeNode>(new Wrapper ( pScrollPanel, Size (200,300), pBox, true)), String::CreateFromAscii ("Second ListBox"), - 0); + ""); AddControl (::std::auto_ptr<TreeNode>(pScrollPanel)); @@ -152,7 +152,7 @@ TestPanel::TestPanel (TreeNode* pParent) ::std::auto_ptr<TreeNode>(new Wrapper ( this, Size (100,30), pButton, false)), String::CreateFromAscii ("Button Area"), - 0); + ""); } diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 7a640788f9c7..15747aeb9476 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -75,7 +75,7 @@ ToolPanel::~ToolPanel (void) sal_uInt32 ToolPanel::AddControl ( ::std::auto_ptr<ControlFactory> pControlFactory, const String& rTitle, - ULONG nHelpId, + const rtl::OString& sHelpId, const TitledControl::ClickHandler& rClickHandler) { TitledControl* pTitledControl = new TitledControl ( @@ -117,9 +117,7 @@ sal_uInt32 ToolPanel::AddControl ( rFocusManager.RegisterLink(pChild->GetWindow(),pFirst, KEY_DOWN); } - // FIXME: HELPID - pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); - (void)nHelpId; + pTitledControl->GetWindow()->SetHelpId(sHelpId); return mpControlContainer->AddControl (pChild); } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index b2e0048af64a..d2b63045c960 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -66,10 +66,9 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) rBase, pContainer)); pSelector->LateInit(); - // FIXME: HELPID - pSelector->SetHelpId( ""/*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 ( @@ -84,10 +83,9 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) rBase, pContainer)); pSelector->LateInit(); - // FIXME: HELPID - pSelector->SetHelpId( ""/*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 ( @@ -103,10 +101,9 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) *pDrawViewShell, pContainer)); pSelector->LateInit(); - // FIXME: HELPID - pSelector->SetHelpId( ""/*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 ( diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index d94e1dfd2b1f..ad12cbcf7870 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -791,7 +791,6 @@ void MasterPagesSelector::SetHelpId( const rtl::OString& aId ) { const ::osl::MutexGuard aGuard (maMutex); - // FIXME: HELPID mpPageSet->SetHelpId( aId ); } diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index c076b6680501..8193ae3004d2 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -95,10 +95,8 @@ ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) { FreeResource(); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_UNDODELETEWARNING_DLG*/ ); - // FIXME: HELPID - maDisableCB.SetHelpId( ""/*HID_SD_UNDODELETEWARNING_CBX*/ ); + SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); + maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index f6591b15188c..aa1a0f53c15a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -133,10 +133,8 @@ ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) { FreeResource(); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_UNDODELETEWARNING_DLG*/ ); - // FIXME: HELPID - maDisableCB.SetHelpId( ""/*HID_SD_UNDODELETEWARNING_CBX*/ ); + SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); + maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 54d8fa0bcd94..8d932c4be047 100644 --- 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,26 +597,20 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_NOTESMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_NOTESMODE*/ ); + GetActiveWindow()->SetHelpId( HID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( HID_NOTESMODE ); } else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_HANDOUTMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_HANDOUTMODE*/ ); + GetActiveWindow()->SetHelpId( HID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE ); } else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); + GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL ); } } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 7071ea522002..629b712e4ad2 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -61,7 +61,7 @@ #include <sfx2/dispatch.hxx> #include <svtools/cliplistener.hxx> #include <svx/float3d.hxx> - +#include "helpids.h" #include "app.hrc" #include "helpids.h" #include "strings.hrc" @@ -347,20 +347,16 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if( eDocType == DOCUMENT_TYPE_DRAW ) { SetHelpId( SD_IF_SDGRAPHICVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDGRAPHICVIEWSHELL*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDGRAPHICVIEWSHELL*/ ); + GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDGRAPHICVIEWSHELL ); } else { if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_NOTESMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_NOTESMODE*/ ); + GetActiveWindow()->SetHelpId( HID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( HID_NOTESMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -368,10 +364,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_HANDOUTMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_HANDOUTMODE*/ ); + GetActiveWindow()->SetHelpId( HID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -379,10 +373,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); - // FIXME: HELPID - 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/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 53afc793786e..7feca5213a24 100644 --- 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> @@ -179,10 +179,8 @@ void OutlineViewShell::Construct(DrawDocShell* ) SetName (aName); SetHelpId( SD_IF_SDOUTLINEVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDOUTLINEVIEWSHELL*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDOUTLINEVIEWSHELL*/ ); + GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL ); } diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 68ea51a9a914..679c28bb3a93 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -113,14 +113,12 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USH if ( nWinStyle & WB_HSCROLL ) { bHorz = TRUE; - // FIXME: HELPID - SetHelpId( ""/*HID_SD_RULER_HORIZONTAL*/ ); + SetHelpId( HID_SD_RULER_HORIZONTAL ); } else { bHorz = FALSE; - // FIXME: HELPID - SetHelpId( ""/*HID_SD_RULER_VERTICAL*/ ); + SetHelpId( HID_SD_RULER_VERTICAL ); } } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 7092fcfc0b7e..7cae5d452a1b 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -100,8 +100,7 @@ Window::Window(::Window* pParent) // Hilfe-ID setzen // SetHelpId(HID_SD_WIN_DOCUMENT); - // FIXME: HELPID - SetUniqueId(""/*HID_SD_WIN_DOCUMENT*/); + SetUniqueId(HID_SD_WIN_DOCUMENT); // #i78183# Added after discussed with AF EnableRTL(FALSE); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 1350054bcdb5..d9d074eee395 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -102,8 +102,7 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : EnableEditMode(); SetSizePixel(Size(0, 0)); SetMaxPageWidth( 150 ); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_TABBAR_PAGES*/ ); + SetHelpId( HID_SD_TABBAR_PAGES ); } /************************************************************************* |