CWS changehid: #i111874#: change code to support HelpIds as byte strings

46 files changed, 948 insertions, 1055 deletions

diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 3508ea026637..fc7b318965b0 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -69,7 +69,6 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
 {
     sal_uInt32              nUniqId;
     String                  aExtraData;
-    Timer                   aTimer;
     const SfxItemSet*       pInputSet;
     SfxItemSet*             pOutputSet;
 
@@ -77,8 +76,6 @@ private:
     SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined
     SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined
 
-    DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* );
-
     SAL_DLLPRIVATE void SetDialogData_Impl();
     SAL_DLLPRIVATE void GetDialogData_Impl();
     SAL_DLLPRIVATE void init();
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index f0dd2248c456..8d99d6efd9f4 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -122,7 +122,7 @@ friend class SfxViewFrame;
     DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
 
     SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord );
-    SAL_DLLPRIVATE sal_uInt32 _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
+    SAL_DLLPRIVATE void _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
     SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*);
 
 protected:
@@ -237,7 +237,7 @@ public:
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
     SAL_DLLPRIVATE void SetMenu_Impl();
-    SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
+    SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
     SAL_DLLPRIVATE BOOL IsUpdated_Impl() const;
     SAL_DLLPRIVATE void DebugOutput_Impl() const;
     SAL_DLLPRIVATE void ResetObjectBars_Impl();
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index d17553e2b2d0..ac267c7c6d45 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -305,7 +305,7 @@ public:
             Pointer to an array of help ids. For each element in _pControlId, there must be
             a corresponding element herein.
     */
-    void                    SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId );
+    void                    SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
     void                    SetDialogHelpId( const sal_Int32 _nHelpId );
     void                    CreateMatcher( const String& rName );
 
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index ee1c81daa603..98c282562354 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -122,7 +122,7 @@ public:
     void                EndInsert();
     void                CheckItem( USHORT, BOOL );
     void                RemoveItem( USHORT );
-    void                InsertItem( USHORT, const String&, MenuItemBits,
+    void                InsertItem( USHORT, const String&, MenuItemBits, const rtl::OString& rHelpId,
                                 USHORT nPos = MENU_APPEND );
     void                InsertSeparator( USHORT nPos = MENU_APPEND );
     void                RemoveDisabledEntries();
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index efbc2d2c75af..10fbd222a2ed 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -29,6 +29,9 @@
 
 #include <tools/rtti.hxx>
 #include <sfx2/shell.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
 
 //--------------------------------------------------------------------
 
@@ -287,6 +290,8 @@ public:
     USHORT          GetValue() const { return nValue; }
     const SfxType*  GetType() const { return pType; }
     const char*     GetUnoName() const { return pUnoName; }
+    SFX2_DLLPUBLIC rtl::OString    GetCommand() const;
+    SFX2_DLLPUBLIC rtl::OUString    GetCommandString() const;
 
     USHORT          GetFormalArgumentCount() const { return nArgDefCount; }
     const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index 0d11462685d5..a041f6687c62 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -55,7 +55,7 @@ public:
     void                    SetCurrentFilter(const String&);
 
     /// Set dialog help id at FileDlgHelper
-    void                    SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId );
+    void                    SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId );
     /// Set control help ids at FileDlgHelper
     void                    SetDialogHelpId( const INT32 _nHelpId );
 private:
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
new file mode 100644
index 000000000000..bdf27baac7b3
--- /dev/null
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -0,0 +1,345 @@
+/*************************************************************************

+ *

+ * 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.

+ *

+ ************************************************************************/

+#ifndef SFX2_SFXCOMMANDS_HRC

+#define SFX2_SFXCOMMANDS_HRC

+

+#define CMD_SID_VIEWSHELL0                          ".uno:_SwitchViewShell0"

+#define CMD_SID_VIEWSHELL1                          ".uno:_SwitchViewShell1"

+#define CMD_SID_VIEWSHELL2                          ".uno:_SwitchViewShell2"

+#define CMD_SID_VIEWSHELL3                          ".uno:_SwitchViewShell3"

+#define CMD_SID_VIEWSHELL4                          ".uno:_SwitchViewShell4"

+#define CMD_SID_ABOUT                               ".uno:About"

+#define CMD_SID_ACTIVATE                            ".uno:Activate"

+#define CMD_SID_HELPBALLOONS                        ".uno:ActiveHelp"

+#define CMD_SID_STYLE_FAMILY                        ".uno:ActualStyleFamily"

+#define CMD_SID_NEWDOC                              ".uno:NewDoc"

+#define CMD_SID_CREATELINK                          ".uno:AddBookmark"

+#define CMD_SID_NEWDOCDIRECT                        ".uno:AddDirect"

+#define CMD_SID_TEMPLATE_ADDRESSBOKSOURCE           ".uno:AddressBookSource"

+#define CMD_SID_BASICIDE_ADDWATCH                   ".uno:AddWatch"

+#define CMD_SID_DOCINFO_AUTHOR                      ".uno:Author"

+#define CMD_SID_AUTOHIDE                            ".uno:AutoHide"

+#define CMD_SID_AUTOPILOTMENU                       ".uno:AutoPilotMenu"

+#define CMD_SID_GALLERY_BG_BRUSH                    ".uno:BackgroundImage"

+#define CMD_SID_BACKSPACE                           ".uno:Backspace"

+#define CMD_SID_BASICBREAK                          ".uno:BasicBreak"

+#define CMD_SID_BASICIDE_APPEAR                     ".uno:BasicIDEAppear"

+#define CMD_SID_BASICSTEPINTO                       ".uno:BasicStepInto"

+#define CMD_SID_BASICSTEPOUT                        ".uno:BasicStepOut"

+#define CMD_SID_BASICSTEPOVER                       ".uno:BasicStepOver"

+#define CMD_SID_BASICSTOP                           ".uno:BasicStop"

+#define CMD_SID_BROWSER                             ".uno:Beamer"

+#define CMD_SID_BASICIDE_BRKPNTSCHANGED             ".uno:BreakPointsChanged"

+#define CMD_SID_BROWSE_BACKWARD                     ".uno:BrowseBackward"

+#define CMD_SID_BROWSE_FORWARD                      ".uno:BrowseForward"

+#define CMD_SID_BROWSER_MODE                        ".uno:BrowseView"

+#define CMD_SID_BUILD_VERSION                       ".uno:BuildVersion"

+#define CMD_SID_CAPTION                             ".uno:Caption"

+#define CMD_SID_STYLE_FAMILY1                       ".uno:CharStyle"

+#define CMD_SID_CHECK_KEY                           ".uno:CheckKey"

+#define CMD_SID_BASICIDE_CHOOSEMACRO                ".uno:ChooseMacro"

+#define CMD_SID_CLEARHISTORY                        ".uno:ClearHistory"

+#define CMD_SID_CLOSEWINS                           ".uno:CloseWins"

+#define CMD_SID_CLOSEDOCS                           ".uno:CloseDocs"

+#define CMD_SID_CLOSEDOC                            ".uno:CloseDoc"

+#define CMD_SID_CLOSEWIN                            ".uno:CloseWin"

+#define CMD_SID_CLOSING                             ".uno:Closing"

+#define CMD_SID_DOCINFO_COMMENTS                    ".uno:Comments"

+#define CMD_SID_OFFICE_COMMERCIAL_USE               ".uno:CommercialUse"

+#define CMD_SID_DOCUMENT_COMPARE                    ".uno:CompareDocuments"

+#define CMD_SID_BASICCOMPILE                        ".uno:CompileBasic"

+#define CMD_SID_CONFIG                              ".uno:ConfigureDialog"

+#define CMD_SID_CONTEXT                             ".uno:Context"

+#define CMD_SID_COPY                                ".uno:Copy"

+#define CMD_SID_CRASH                               ".uno:Crash"

+#define CMD_SID_BASICIDE_CREATEMACRO                ".uno:CreateMacro"

+#define CMD_SID_CURRENT_URL                         ".uno:CurrentURL"

+#define CMD_SID_CURSORENDOFSCREEN                   ".uno:CursorEndOfScreen"

+#define CMD_SID_CURSORTOPOFSCREEN                   ".uno:CursorTopOfScreen"

+#define CMD_SID_OFFICE_CUSTOMERNUMBER               ".uno:CustomerNumber"

+#define CMD_SID_CUT                                 ".uno:Cut"

+#define CMD_SID_DEFAULTFILEPATH                     ".uno:DefaultFilePath"

+#define CMD_SID_DEFAULTFILENAME                     ".uno:DefaultFileName"

+#define CMD_SID_DELETE                              ".uno:Delete"

+#define CMD_SID_BASICIDE_DELETECURRENT              ".uno:DeleteCurrent"

+#define CMD_SID_STYLE_DELETE                        ".uno:DeleteStyle"

+#define CMD_SID_STYLE_DESIGNER                      ".uno:DesignerDialog"

+#define CMD_SID_STYLE_DRAGHIERARCHIE                ".uno:DragHierarchy"

+#define CMD_SID_EDITDOC                             ".uno:EditDoc"

+#define CMD_SID_BASICIDE_EDITMACRO                  ".uno:EditMacro"

+#define CMD_SID_STYLE_EDIT                          ".uno:EditStyle"

+#define CMD_FID_SEARCH_NOW                          ".uno:ExecuteSearch"

+#define CMD_SID_EXTENDEDHELP                        ".uno:ExtendedHelp"

+#define CMD_SID_FILE_NAME                           ".uno:FileName"

+#define CMD_SID_FOCUSURLBOX                         ".uno:FocusUrlBox"

+#define CMD_SID_FORMATMENU                          ".uno:FormatMenu"

+#define CMD_SID_STYLE_FAMILY3                       ".uno:FrameStyle"

+#define CMD_SID_FRAMETITLE                          ".uno:FrameTitle"

+#define CMD_SID_PROGFILENAME                        ".uno:FullName"

+#define CMD_SID_DOCFULLNAME                         ".uno:FullName"

+#define CMD_SID_WIN_FULLSCREEN                      ".uno:FullScreen"

+#define CMD_SID_FILLFRAME                           ".uno:GetFrameWindow"

+#define CMD_SID_CURSORDOWN                          ".uno:GoDown"

+#define CMD_SID_CURSORPAGEDOWN                      ".uno:GoDownBlock"

+#define CMD_SID_CURSORPAGEDOWN_SEL                  ".uno:GoDownBlockSel"

+#define CMD_SID_CURSORDOWN_SEL                      ".uno:GoDownSel"

+#define CMD_SID_CURSORLEFT                          ".uno:GoLeft"

+#define CMD_SID_CURSORPAGELEFT                      ".uno:GoLeftBlock"

+#define CMD_SID_CURSORPAGELEFT_SEL                  ".uno:GoLeftBlockSel"

+#define CMD_SID_CURSORLEFT_SEL                      ".uno:GoLeftSel"

+#define CMD_SID_CURSORRIGHT                         ".uno:GoRight"

+#define CMD_SID_CURSORRIGHT_SEL                     ".uno:GoRightSel"

+#define CMD_SID_CURSORENDOFFILE                     ".uno:GoToEndOfData"

+#define CMD_SID_CURSORENDOFFILE_SEL                 ".uno:GoToEndOfDataSel"

+#define CMD_SID_CURSOREND                           ".uno:GoToEndOfRow"

+#define CMD_SID_CURSOREND_SEL                       ".uno:GoToEndOfRowSel"

+#define CMD_SID_CURSORTOPOFFILE                     ".uno:GoToStart"

+#define CMD_SID_CURSORHOME                          ".uno:GoToStartOfRow"

+#define CMD_SID_CURSORHOME_SEL                      ".uno:GoToStartOfRowSel"

+#define CMD_SID_CURSORTOPOFFILE_SEL                 ".uno:GoToStartSel"

+#define CMD_SID_CURSORUP                            ".uno:GoUp"

+#define CMD_SID_CURSORPAGEUP                        ".uno:GoUpBlock"

+#define CMD_SID_CURSORPAGEUP_SEL                    ".uno:GoUpBlockSel"

+#define CMD_SID_CURSORUP_SEL                        ".uno:GoUpSel"

+#define CMD_SID_HELP_ANNOTATE                       ".uno:HelpAnnotate"

+#define CMD_SID_HELP_BOOKMARK                       ".uno:HelpBookmark"

+#define CMD_SID_HELP_HELPFILEBOX                    ".uno:HelpChooseFile"

+#define CMD_SID_HELP_DOWNLOAD                       ".uno:HelpDownload"

+#define CMD_SID_HELP_PI                             ".uno:HelperDialog"

+#define CMD_SID_HELPINDEX                           ".uno:HelpIndex"

+#define CMD_SID_HELPMENU                            ".uno:HelpMenu"

+#define CMD_SID_HELPONHELP                          ".uno:HelpOnHelp"

+#define CMD_SID_HELP_SEARCH                         ".uno:HelpSearch"

+#define CMD_SID_HELPTIPS                            ".uno:HelpTip"

+#define CMD_SID_HELP_ZOOMIN                         ".uno:HelpZoomIn"

+#define CMD_SID_HELP_ZOOMOUT                        ".uno:HelpZoomOut"

+#define CMD_SID_BASICIDE_HIDECURPAGE                ".uno:HideCurPage"

+#define CMD_SID_HYPERLINK_DIALOG                    ".uno:HyperlinkDialog"

+#define CMD_SID_INSERTDOC                           ".uno:InsertDoc"

+#define CMD_SID_HYPERLINK_INSERT                    ".uno:InsertHyperlink"

+#define CMD_SID_INSERT_FLOATINGFRAME                ".uno:InsertObjectFloatingFrame"

+#define CMD_SID_INTERNET_ONLINE                     ".uno:InternetOnline"

+#define CMD_SID_INTERNET_SEARCH                     ".uno:InternetSearch"

+#define CMD_SID_DOC_LOADING                         ".uno:IsLoading"

+#define CMD_SID_IMG_LOADING                         ".uno:IsLoadingImages"

+#define CMD_SID_PRINTOUT                            ".uno:IsPrinting"

+#define CMD_SID_JUMPTOMARK                          ".uno:JumpToMark"

+#define CMD_SID_DOCINFO_KEYWORDS                    ".uno:Keywords"

+#define CMD_SID_BASICIDE_LIBLOADED                  ".uno:LibLoaded"

+#define CMD_SID_BASICIDE_LIBREMOVED                 ".uno:LibRemoved"

+#define CMD_SID_BASICIDE_LIBSELECTED                ".uno:LibSelect"

+#define CMD_SID_BASICIDE_LIBSELECTOR                ".uno:LibSelector"

+#define CMD_SID_OFFICE_PLK                          ".uno:LicenceKey"

+#define CMD_SID_CONFIGACCEL                         ".uno:LoadAccel"

+#define CMD_SID_BASICLOAD                           ".uno:LoadBasic"

+#define CMD_SID_LOADCONFIG                          ".uno:LoadConfiguration"

+#define CMD_SID_CONFIGEVENT                         ".uno:LoadEvents"

+#define CMD_SID_CONFIGMENU                          ".uno:LoadMenu"

+#define CMD_SID_CONFIGSTATUSBAR                     ".uno:LoadStatusBar"

+#define CMD_SID_TOOLBOXOPTIONS                      ".uno:LoadToolBox"

+#define CMD_SID_LOGOUT                              ".uno:Logout"

+#define CMD_SID_SCRIPTORGANIZER                     ".uno:ScriptOrganizer"

+#define CMD_SID_MACROORGANIZER                      ".uno:MacroOrganizer"

+#define CMD_SID_RUNMACRO                            ".uno:RunMacro"

+#define CMD_SID_BASICCHOOSER                        ".uno:MacroDialog"

+#define CMD_SID_MAIL_NOTIFY                         ".uno:MailReceipt"

+#define CMD_SID_MAIL_CHILDWIN                       ".uno:MailWindow"

+#define CMD_SID_BASICIDE_MATCHGROUP                 ".uno:MatchGroup"

+#define CMD_SID_TOGGLE_MENUBAR                      ".uno:MenuBarVisible"

+#define CMD_SID_DOCUMENT_MERGE                      ".uno:MergeDocuments"

+#define CMD_SID_ATTR_METRIC                         ".uno:MetricUnit"

+#define CMD_SID_MODIFIED                            ".uno:Modified"

+#define CMD_SID_DOC_MODIFIED                        ".uno:ModifiedStatus"

+#define CMD_SID_BASICIDE_MODULEDLG                  ".uno:ModuleDialog"

+#define CMD_SID_BASICIDE_NAMECHANGEDONTAB           ".uno:NameChangedOnTab"

+#define CMD_SID_NAVIGATOR                           ".uno:Navigator"

+#define CMD_SID_RESTORE_EDITING_VIEW                ".uno:RestoreEditingView"

+#define CMD_SID_BASICIDE_NEWDIALOG                  ".uno:NewDialog"

+#define CMD_SID_BASICIDE_NEWMODULE                  ".uno:NewModule"

+#define CMD_SID_CREATE_BASICOBJECT                  ".uno:NewObject"

+#define CMD_SID_STYLE_NEW                           ".uno:NewStyle"

+#define CMD_SID_NEWWINDOW                           ".uno:NewWindow"

+#define CMD_SID_BASICIDE_OBJCAT                     ".uno:ObjectCatalog"

+#define CMD_SID_OBJECT                              ".uno:ObjectMenue"

+#define CMD_SID_OLD_PALK                            ".uno:OldPALK"

+#define CMD_SID_OPENDOC                             ".uno:Open"

+#define CMD_SID_WEBHTML                             ".uno:WebHtml"

+#define CMD_SID_OPENHYPERLINK                       ".uno:OpenHyperlink"

+#define CMD_SID_DOCINFO_TITLE                       ".uno:DocInfoTitle"

+#define CMD_SID_OPENTEMPLATE                        ".uno:OpenTemplate"

+#define CMD_SID_OPENURL                             ".uno:OpenUrl"

+#define CMD_SID_OPTIONS                             ".uno:Options"

+#define CMD_SID_ORGANIZER                           ".uno:Organizer"

+#define CMD_SID_STYLE_FAMILY4                       ".uno:PageStyle"

+#define CMD_SID_STYLE_FAMILY2                       ".uno:ParaStyle"

+#define CMD_SID_PARTWIN                             ".uno:PartWindow"

+#define CMD_SID_PASTE                               ".uno:Paste"

+#define CMD_SID_CLIPBOARD_FORMAT_ITEMS              ".uno:ClipboardFormatItems"

+#define CMD_SID_PASTE_SPECIAL                       ".uno:PasteSpecial"

+#define CMD_SID_DOCPATH                             ".uno:DocPath"

+#define CMD_SID_PICKLIST                            ".uno:PickList"

+#define CMD_SID_PLAYMACRO                           ".uno:PlayMacro"

+#define CMD_SID_PLUGINS_ACTIVE                      ".uno:PlugInsActive"

+#define CMD_SID_PRINTDOC                            ".uno:Print"

+#define CMD_SID_PRINTDOCDIRECT                      ".uno:PrintDefault"

+#define CMD_SID_PRINTER_NAME                        ".uno:Printer"

+#define CMD_SID_SETUPPRINTER                        ".uno:PrinterSetup"

+#define CMD_SID_PRINTPREVIEW                        ".uno:PrintPreview"

+#define CMD_SID_OFFICE_PRIVATE_USE                  ".uno:PrivateUse"

+#define CMD_SID_DOCINFO                             ".uno:SetDocumentProperties"

+#define CMD_SID_QUITAPP                             ".uno:Quit"

+#define CMD_SID_DOC_READONLY                        ".uno:ReadOnly"

+#define CMD_SID_RECORDMACRO                         ".uno:MacroRecorder"

+#define CMD_SID_STOP_RECORDING                      ".uno:StopRecording"

+#define CMD_SID_RECORDING_FLOATWINDOW               ".uno:MacroRecordingFloat"

+#define CMD_SID_REDO                                ".uno:Redo"

+#define CMD_SID_DELETE_BASICOBJECT                  ".uno:ReleaseObject"

+#define CMD_SID_RELOAD                              ".uno:Reload"

+#define CMD_SID_BASICIDE_REMOVEWATCH                ".uno:RemoveWatch"

+#define CMD_SID_BASICIDE_RENAMECURRENT              ".uno:RenameCurrent"

+#define CMD_SID_REPAINT                             ".uno:Repaint"

+#define CMD_SID_REPEAT                              ".uno:RepeatAction"

+#define CMD_SID_RUBY_DIALOG                         ".uno:RubyDialog"

+#define CMD_SID_BASICRUN                            ".uno:RunBasic"

+#define CMD_SID_STARTSW                             ".uno:RunStarWriter"

+#define CMD_SID_SAVEDOC                             ".uno:Save"

+#define CMD_SID_SAVEDOCS                            ".uno:SaveAll"

+#define CMD_SID_SAVEASDOC                           ".uno:SaveAs"

+#define CMD_SID_DOCTEMPLATE                         ".uno:SaveAsTemplate"

+#define CMD_SID_BASICSAVEAS                         ".uno:SaveBasicAs"

+#define CMD_SID_EXPORT_DIALOG                       ".uno:ExportDialog"

+#define CMD_SID_IMPORT_DIALOG                       ".uno:ImportDialog"

+#define CMD_SID_SAVECONFIG                          ".uno:SaveConfiguration"

+#define CMD_SID_DOC_SAVED                           ".uno:Saved"

+#define CMD_SID_BASICIDE_SBXDELETED                 ".uno:SbxDeleted"

+#define CMD_SID_BASICIDE_SBXINSERTED                ".uno:SbxInserted"

+#define CMD_SID_BASICIDE_SBXRENAMED                 ".uno:SbxRenamed"

+#define CMD_SID_MAIL_SCROLLBODY_PAGEDOWN            ".uno:ScrollBodyPageDown"

+#define CMD_SID_SEARCH_DLG                          ".uno:SearchDialog"

+#define CMD_SID_SEARCH_OPTIONS                      ".uno:SearchOptions"

+#define CMD_SID_SEARCH_ITEM                         ".uno:SearchProperties"

+#define CMD_SID_SELECTALL                           ".uno:SelectAll"

+#define CMD_FN_FAX                                  ".uno:SendFax"

+#define CMD_SID_MAIL_SENDDOC                        ".uno:SendMail"

+#define CMD_SID_MAIL_SENDDOCASPDF                   ".uno:SendMailDocAsPDF"

+#define CMD_SID_MAIL_SENDDOCASFORMAT                ".uno:SendMailDocAsFormat"

+#define CMD_SID_MAIL_SENDDOCASMS                    ".uno:SendMailDocAsMS"

+#define CMD_SID_MAIL_SENDDOCASOOO                   ".uno:SendMailDocAsOOo"

+#define CMD_SID_SETOPTIONS                          ".uno:SetOptions"

+#define CMD_SID_OFFICE_PALK                         ".uno:SetPALK"

+#define CMD_SID_SHOW_BROWSER                        ".uno:ShowBrowser"

+#define CMD_SID_SHOWPOPUPS                          ".uno:ShowPopups"

+#define CMD_SID_BASICIDE_SHOWSBX                    ".uno:ShowSbx"

+#define CMD_SID_SOURCEVIEW                          ".uno:SourceView"

+#define CMD_SID_ONLINE_REGISTRATION_DLG             ".uno:StartRegistrationDialog"

+#define CMD_SID_STATUSBARTEXT                       ".uno:StatusBar"

+#define CMD_SID_TOGGLESTATUSBAR                     ".uno:StatusBarVisible"

+#define CMD_SID_BASICIDE_STAT_DATE                  ".uno:StatusGetDate"

+#define CMD_SID_BASICIDE_STAT_POS                   ".uno:StatusGetPosition"

+#define CMD_SID_BASICIDE_STAT_TITLE                 ".uno:StatusGetTitle"

+#define CMD_SID_BASICIDE_STOREALLMODULESOURCES      ".uno:StoreAllModuleSources"

+#define CMD_SID_BASICIDE_STOREMODULESOURCE          ".uno:StoreModuleSource"

+#define CMD_SID_STYLE_APPLY                         ".uno:StyleApplyState"

+#define CMD_SID_STYLE_CATALOG                       ".uno:StyleCatalog"

+#define CMD_SID_STYLE_NEW_BY_EXAMPLE                ".uno:StyleNewByExample"

+#define CMD_SID_STYLE_UPDATE_BY_EXAMPLE             ".uno:StyleUpdateByExample"

+#define CMD_SID_STYLE_WATERCAN                      ".uno:StyleWatercanMode"

+#define CMD_SID_VIEWSHELL                           ".uno:SwitchViewShell"

+#define CMD_SID_TASKBAR                             ".uno:TaskBarVisible"

+#define CMD_SID_STYLE_FAMILY5                       ".uno:ListStyle"

+#define CMD_SID_TIPWINDOW                           ".uno:TipsDialog"

+#define CMD_SID_DOCTITLE                            ".uno:Title"

+#define CMD_SID_TITLE                               ".uno:Title"

+#define CMD_SID_BASICIDE_TOGGLEBRKPNT               ".uno:ToggleBreakPoint"

+#define CMD_SID_BASICIDE_SHOWWINDOW                 ".uno:BasicIDEShowWindow"

+#define CMD_SID_EDITMACRO                           ".uno:ToolsMacroEdit"

+#define CMD_SID_UNDO                                ".uno:Undo"

+#define CMD_SID_FORMATPAINTBRUSH                    ".uno:FormatPaintbrush"

+#define CMD_SID_ATTR_UNDO_COUNT                     ".uno:UndoCount"

+#define CMD_SID_BASICIDE_UPDATEALLMODULESOURCES     ".uno:UpdateAllModuleSources"

+#define CMD_SID_BASICIDE_UPDATEMODULESOURCE         ".uno:UpdateModuleSource"

+#define CMD_SID_BASICIDE_MANAGEBRKPNTS              ".uno:ManageBreakPoints"

+#define CMD_SID_BASICIDE_TOGGLEBRKPNTENABLED        ".uno:ToggleBreakPointEnabled"

+#define CMD_SID_UPDATE_VERSION                      ".uno:UpdateVersion"

+#define CMD_SID_VERSION                             ".uno:VersionDialog"

+#define CMD_SID_SIGNATURE                           ".uno:Signature"

+#define CMD_SID_MACRO_SIGNATURE                     ".uno:MacroSignature"

+#define CMD_SID_VERSION_VISIBLE                     ".uno:VersionVisible"

+#define CMD_SID_VIEW_DATA_SOURCE_BROWSER            ".uno:ViewDataSourceBrowser"

+#define CMD_SID_WIN_VISIBLE                         ".uno:WinVisible"

+#define CMD_SID_MDIWINDOWLIST                       ".uno:WindowList"

+#define CMD_SID_ZOOM_IN                             ".uno:ZoomMinus"

+#define CMD_SID_ZOOM                                ".uno:Zooming"

+#define CMD_SID_ZOOM_NEXT                           ".uno:ZoomNext"

+#define CMD_SID_ZOOM_OUT                            ".uno:ZoomPlus"

+#define CMD_SID_ZOOM_PREV                           ".uno:ZoomPrevious"

+#define CMD_SID_ZOOM_TOOLBOX                        ".uno:ZoomToolBox"

+#define CMD_SID_EXPORTDOC                           ".uno:ExportTo"

+#define CMD_SID_EXPORTDOCASPDF                      ".uno:ExportToPDF"

+#define CMD_SID_DIRECTEXPORTDOCASPDF                ".uno:ExportDirectToPDF"

+#define CMD_SID_IMAGE_ORIENTATION                   ".uno:ImageOrientation"

+#define CMD_SID_SAVE_VERSION_ON_CLOSE               ".uno:SaveVersionOnClose"

+#define CMD_SID_ADDONS                              ".uno:Addons"

+#define CMD_SID_SHOW_IME_STATUS_WINDOW              ".uno:ShowImeStatusWindow"

+#define CMD_SID_UPDATE_CONFIG                       ".uno:UpdateConfiguration"

+#define CMD_SID_HELP_SUPPORTPAGE                    ".uno:HelpSupport"

+#define CMD_SID_HELP_TUTORIALS                      ".uno:HelpTutorials"

+#define CMD_SID_ADDONHELP                           ".uno:AddonHelp"

+#define CMD_SID_FORMATMENUSTATE                     ".uno:FormatMenuState"

+#define CMD_SID_INET_DLG                            ".uno:InternetDialog"

+#define CMD_SID_ONLINE_REGISTRATION                 ".uno:OnlineRegistrationDlg"

+#define CMD_SID_OFFICE_CHECK_PLZ                    ".uno:CheckPLZ"

+#define CMD_SID_ADDRESS_DATA_SOURCE                 ".uno:AutoPilotAddressDataSource"

+#define CMD_FN_BUSINESS_CARD                        ".uno:InsertBusinessCard"

+#define CMD_FN_LABEL                                ".uno:InsertLabels"

+#define CMD_FN_XFORMS_INIT                          ".uno:NewXForms"

+#define CMD_SID_SD_AUTOPILOT                        ".uno:AutoPilotPresentations"

+#define CMD_SID_NEWSD                               ".uno:NewPresentation"

+#define CMD_SID_COMP_BIBLIOGRAPHY                   ".uno:BibliographyComponent"

+#define CMD_SID_MINIMIZED                           ".uno:Minimized"

+#define CMD_SID_AUTO_CORRECT_DLG                    ".uno:AutoCorrectDlg"

+#define CMD_SID_OPTIONS_TREEDIALOG                  ".uno:OptionsTreeDialog"

+#define CMD_SID_TERMINATE_INPLACEACTIVATION         ".uno:TerminateInplaceActivation"

+#define CMD_SID_RECENTFILELIST                      ".uno:RecentFileList"

+#define CMD_SID_AVAILABLE_TOOLBARS                  ".uno:AvailableToolbars"

+#define CMD_SID_AVMEDIA_PLAYER                      ".uno:AVMediaPlayer"

+#define CMD_SID_INSERT_AVMEDIA                      ".uno:InsertAVMedia"

+#define CMD_SID_MORE_DICTIONARIES                   ".uno:MoreDictionaries"

+#define CMD_SID_ACTIVATE_STYLE_APPLY                ".uno:ActivateStyleApply"

+#define CMD_SID_DOCKWIN_0                           ".uno:DockingWindow0"

+#define CMD_SID_DOCKWIN_1                           ".uno:DockingWindow1"

+#define CMD_SID_DOCKWIN_2                           ".uno:DockingWindow2"

+#define CMD_SID_DOCKWIN_3                           ".uno:DockingWindow3"

+#define CMD_SID_DOCKWIN_4                           ".uno:DockingWindow4"

+#define CMD_SID_DOCKWIN_5                           ".uno:DockingWindow5"

+#define CMD_SID_DOCKWIN_6                           ".uno:DockingWindow6"

+#define CMD_SID_DOCKWIN_7                           ".uno:DockingWindow7"

+#define CMD_SID_DOCKWIN_8                           ".uno:DockingWindow8"

+#define CMD_SID_DOCKWIN_9                           ".uno:DockingWindow9"

+#define CMD_SID_PASTE_UNFORMATTED                   ".uno:PasteUnformatted"

+

+#endif

diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index d82abeefe8bc..f3d773f98afc 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -133,10 +133,10 @@ public:
                                             const String *pUserButtonText=0 ) = 0;
     virtual CreateTabPage               GetTabPageCreatorFunc( USHORT nId ) = 0;
     virtual GetTabPageRanges            GetTabPageRangesFunc( USHORT nId ) = 0;
-    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
             const SvObjectServerList* pList = 0 )=0;
-    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
     virtual  SfxAbstractPasteDialog*         CreatePasteDialog( Window* pParent )=0;
     virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0;
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx
index b19f78c6184b..608361a1e777 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfxhelp.hxx
@@ -45,15 +45,10 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
     SfxHelp_Impl*   pImp;
 
 private:
-    // FIXME: HELPID
-    // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow );
     SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow );
-    // FIXME: HELPID
-    // SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId );
+    SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId );
 
     SAL_DLLPRIVATE String GetHelpModuleName_Impl();
-    // FIXME: HELPID
-    // SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName );
     SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName );
 
 public:
@@ -63,15 +58,11 @@ public:
     inline void             SetTicket( const String& rTicket )  { aTicket = rTicket; }
     inline void             SetUser( const String& rUser )      { aUser = rUser; }
 
-    // FIXME: HELPID
-    //virtual XubString       GetHelpText( ULONG nHelpId, const Window* pWindow );
     virtual XubString       GetHelpText( const String&, const Window* pWindow );
 
-    // FIXME: HELPID
-    // static String           CreateHelpURL( ULONG nHelpId, const String& rModuleName );
     static String           CreateHelpURL( const String& aCommandURL, const String& rModuleName );
     using Help::OpenHelpAgent;
-    static void             OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId );
+    static void             OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId );
     static String           GetDefaultHelpModule();
     static ::rtl::OUString  GetCurrentModuleIdentifier();
 };
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 10a920852848..785eea211f4f 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -6356,7 +6356,7 @@ SfxBoolItem TaskBarVisible SID_TASKBAR
 ]
 
 //--------------------------------------------------------------------------
-SfxTemplateItem TemplateFamily5 SID_STYLE_FAMILY5
+SfxTemplateItem ListStyle SID_STYLE_FAMILY5
 
 [
     /* flags: */
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 0858e66e7347..47750cd73f78 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -626,169 +626,6 @@ String RID_ENVTOOLBOX
     Text [ en-US ] = "Function Bar" ;
 };
 
-ToolBox RID_ENVTOOLBOX
-{
-    HelpId = RID_ENVTOOLBOX ;
-    ButtonType = BUTTON_SYMBOL ;
-    LineSpacing = TRUE ;
-    Border = TRUE ;
-    Scroll = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Customize = TRUE ;
-    FloatingMode = FALSE ;
-    Hide = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Align = BOXALIGN_TOP ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_OPENURL ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_NEWDOCDIRECT ;
-            DropDown = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_NEWDOC ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OPENDOC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SAVEDOC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SAVEASDOC ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EDITDOC ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_DIRECTEXPORTDOCASPDF ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_PRINTDOCDIRECT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FAX ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_CUT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_COPY ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_PASTE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_UNDO ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_REDO ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_NAVIGATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_STYLE_DESIGNER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_HYPERLINK_DIALOG ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_HYPERLINK_INSERT ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_WIN_FULLSCREEN ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_RECORDMACRO;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_GALLERY ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_AVMEDIA_PLAYER ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_CLOSEDOC;
-            Hide = TRUE;
-        };
-    };
-};
-
 String RID_SPECIALCONFIG_ERROR
 {
     Text [ en-US ] = "An error has occurred in the special configuration.\nPlease contact your administrator." ;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 2abcdffe0169..decb3dd186f0 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -350,12 +350,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
             {
-                ULONG nHelpId = ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) ? 66056 : 0;
-                if ( 66056 == nHelpId )
+                if ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE )
                 {
                     // show Support page with new URL
-                    // FIXME: HELPID
-                    String sHelpURL = SfxHelp::CreateHelpURL( String()/*nHelpId*/, String() );
+                    String sHelpURL = SfxHelp::CreateHelpURL( String::CreateFromAscii(".uno:HelpSupport"), String() );
                     String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) );
                     sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp");
                     sHelpURL += sParams;
@@ -363,8 +361,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                     pHelp->Start( sHelpURL, NULL );
                 }
                 else
-                    // FIXME: HELPID
-                    pHelp->Start( String()/*nHelpId*/, NULL ); // show start page
+                    pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page
                 bDone = TRUE;
             }
             break;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 6b8dfe3a023c..9289920b8e09 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2105,32 +2105,24 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
     xFrame->setName( DEFINE_CONST_UNICODE("OFFICE_HELP") );
     lcl_disableLayoutOfFrame(xFrame);
 
-    // FIXME: HELPID
-    aToolBox.SetHelpId( ""/*HID_HELP_TOOLBOX*/ );
+    aToolBox.SetHelpId( HID_HELP_TOOLBOX );
 
     aToolBox.InsertItem( TBI_INDEX, aIndexOffText );
-    // FIXME: HELPID
-    aToolBox.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ );
+    aToolBox.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
     aToolBox.InsertSeparator();
     aToolBox.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) );
-    // FIXME: HELPID
-    aToolBox.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ );
+    aToolBox.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
     aToolBox.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) );
-    // FIXME: HELPID
-    aToolBox.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ );
+    aToolBox.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
     aToolBox.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) );
-    // FIXME: HELPID
-    aToolBox.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ );
+    aToolBox.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
     aToolBox.InsertSeparator();
     aToolBox.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) );
-    // FIXME: HELPID
-    aToolBox.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ );
+    aToolBox.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
     aToolBox.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) );
-    // FIXME: HELPID
-    aToolBox.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ );
+    aToolBox.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
     aToolBox.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ) );
-    // FIXME: HELPID
-    aToolBox.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ );
+    aToolBox.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
 
     InitToolBoxImages();
     aToolBox.Show();
@@ -2146,9 +2138,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
 
     SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
 
-    if ( aOnStartupCB.GetHelpId() == 0 )
-        // FIXME: HELPID
-        aOnStartupCB.SetHelpId( ""/*HID_HELP_ONSTARTUP_BOX*/ );
+    if ( !aOnStartupCB.GetHelpId().getLength() )
+        aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX );
 }
 
 // -----------------------------------------------------------------------
@@ -2604,40 +2595,32 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             else
                 aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId(
                     bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ );
+            aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
             aMenu.InsertSeparator();
             aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ),
                 Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ );
+            aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
             aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() );
             aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ),
                 Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ );
+            aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
             aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() );
             aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ),
                 Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ );
+            aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
             aMenu.InsertSeparator();
             aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ),
                 Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ );
+            aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
             aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
                 Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ );
+            aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
             aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ),
                 Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ );
+            aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
             aMenu.InsertSeparator();
             aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_SELECTIONMODE, ""/*HID_HELP_TEXT_SELECTION_MODE*/ );
+            aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE );
             Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
             URL aURL;
             aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode");
@@ -2657,8 +2640,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             aMenu.InsertSeparator();
             aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
                 Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) );
-            // FIXME: HELPID
-            aMenu.SetHelpId( TBI_COPY, ""/*SID_COPY*/ );
+            aMenu.SetHelpId( TBI_COPY, ".uno:Copy" );
             aMenu.EnableItem( TBI_COPY, HasSelection() );
 
             if ( bIsDebug )
@@ -3243,8 +3225,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
     aWinPos             ( 0, 0 ),
     sTitle              ( pParent->GetText() )
 {
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_HELP_WINDOW*/ );
+    SetHelpId( HID_HELP_WINDOW );
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
 
     pHelpInterceptor->InitWaiter( this );
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index a4d134df27fa..23fb100c7895 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -284,7 +284,7 @@ void SvxOpenGraphicDialog::SetCurrentFilter(const String&   rStr)
     mpImpl->aFileDlg.SetCurrentFilter(rStr);
 }
 
-void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId )
+void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId )
 {
     mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId );
 }
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 9c246c592b82..a18521e3a289 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "sfxhelp.hxx"
-
+#include <set>
 #include <algorithm>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -76,6 +76,7 @@
 #include <sfx2/sfxuno.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/frame.hxx>
+#include <rtl/string.hxx>
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -221,13 +222,13 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
 class SfxHelpOptions_Impl : public utl::ConfigItem
 {
 private:
-    SvULongsSort*   m_pIds;
+    std::set < rtl::OString > m_aIds;
 
 public:
                     SfxHelpOptions_Impl();
                     ~SfxHelpOptions_Impl();
 
-    BOOL            HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; }
+    bool            HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; }
     virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     virtual void            Commit();
 };
@@ -254,7 +255,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
 
 SfxHelpOptions_Impl::SfxHelpOptions_Impl()
     : ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
-    , m_pIds( NULL )
 {
     Sequence< ::rtl::OUString > aNames = GetPropertyNames();
     Sequence< Any > aValues = GetProperties( aNames );
@@ -275,11 +275,15 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
                         ::rtl::OUString aCodedList;
                         if ( pValues[nProp] >>= aCodedList )
                         {
-                            String aTmp( aCodedList );
-                            USHORT nCount = aTmp.GetTokenCount( ',' );
-                            m_pIds = new SvULongsSort();
-                            for ( USHORT n=0; n<nCount; n++ )
-                                m_pIds->Insert( (ULONG) aTmp.GetToken( n, ',' ).ToInt64() );
+                            rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 );
+                            sal_Int32 nIndex = 0;
+                            do
+                            {
+                                rtl::OString aToken = aTmp.getToken( 0, ',', nIndex );
+                                if ( aToken.getLength() )
+                                    m_aIds.insert( aToken );
+                            }
+                            while ( nIndex >= 0 );
                         }
                         else {
                             DBG_ERRORFILE( "Wrong property type!" );
@@ -299,7 +303,6 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
 
 SfxHelpOptions_Impl::~SfxHelpOptions_Impl()
 {
-    delete m_pIds;
 }
 
 
@@ -326,8 +329,6 @@ public:
     ~SfxHelp_Impl();
 
     SfxHelpOptions_Impl*    GetOptions();
-    // FIXME: HELPID
-    // String                   GetHelpText( ULONG nHelpId, const String& rModule );    // get "Active Help"
     String                  GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
     sal_Bool                HasModule( const ::rtl::OUString& rModule );            // module installed
     sal_Bool                IsHelpInstalled();                                      // module list not empty
@@ -371,19 +372,6 @@ void SfxHelp_Impl::Load()
     }
 }
 
-#if 0
-// FIXME: HELPID
-String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule )
-{
-    // create help url
-    String aHelpURL = SfxHelp::CreateHelpURL( nHelpId, rModule );
-    // added 'active' parameter
-    aHelpURL.Insert( String( DEFINE_CONST_UNICODE("&Active=true") ), aHelpURL.SearchBackward( '#' ) );
-    // load help string
-    return SfxContentHelper::GetActiveHelpString( aHelpURL );
-}
-#endif
-
 String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule )
 {
     // create help url
@@ -585,79 +573,6 @@ String SfxHelp::GetHelpModuleName_Impl()
     return sModuleName;
 }
 
-#if 0
-// FIXME: HELPID
-String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName )
-{
-    String aModuleName( rModuleName );
-    if ( aModuleName.Len() == 0 )
-        aModuleName = getDefaultModule_Impl();
-
-    // build up the help URL
-    String aHelpURL;
-    if ( aTicket.Len() )
-    {
-        // if there is a ticket, we are inside a plugin, so a special Help URL must be sent
-        aHelpURL = DEFINE_CONST_UNICODE("vnd.sun.star.cmd:help?");
-        aHelpURL += DEFINE_CONST_UNICODE("HELP_Request_Mode=contextIndex&HELP_Session_Mode=context&HELP_CallMode=portal&HELP_Device=html");
-
-        if ( !nHelpId )
-        {
-            // no help id -> start page
-            aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=start");
-        }
-        else
-        {
-            aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=");
-            aHelpURL += String::CreateFromInt64( nHelpId );
-        }
-
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_ProgramID=");
-        aHelpURL += aModuleName;
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_User=");
-        aHelpURL += aUser;
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_Ticket=");
-        aHelpURL += aTicket;
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_Language=");
-        aHelpURL += aLanguageStr;
-        if ( aCountryStr.Len() )
-        {
-            aHelpURL += DEFINE_CONST_UNICODE("&HELP_Country=");
-            aHelpURL += aCountryStr;
-        }
-    }
-    else
-    {
-        sal_Bool bHasAnchor = sal_False;
-        String aAnchor;
-        aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
-        aHelpURL += aModuleName;
-
-        if ( !nHelpId )
-            aHelpURL += String::CreateFromAscii("/start");
-        else
-        {
-            aHelpURL += '/';
-            aHelpURL += String::CreateFromInt64( nHelpId );
-
-            String aTempURL = aHelpURL;
-            AppendConfigToken_Impl( aTempURL, sal_True );
-            bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor );
-        }
-
-        AppendConfigToken_Impl( aHelpURL, sal_True );
-
-        if ( bHasAnchor )
-        {
-            aHelpURL += '#';
-            aHelpURL += aAnchor;
-        }
-    }
-
-    return aHelpURL;
-}
-#endif
-
 String  SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName )
 {
     // build up the help URL
@@ -667,28 +582,7 @@ String  SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM
 
     String aModuleName( rModuleName );
     if ( aModuleName.Len() == 0 )
-    {
-        // no active module (quicklaunch?) -> detect default module
-        SvtModuleOptions aModOpt;
-        if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-            aModuleName = DEFINE_CONST_UNICODE("swriter");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
-            aModuleName = DEFINE_CONST_UNICODE("scalc");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
-            aModuleName = DEFINE_CONST_UNICODE("simpress");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
-            aModuleName = DEFINE_CONST_UNICODE("sdraw");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
-            aModuleName = DEFINE_CONST_UNICODE("smath");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) )
-            aModuleName = DEFINE_CONST_UNICODE("schart");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) )
-            aModuleName = DEFINE_CONST_UNICODE("sbasic");
-        else
-        {
-            DBG_ERRORFILE( "no installed module found" );
-        }
-    }
+        aModuleName = getDefaultModule_Impl();
 
     aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
     aHelpURL += aModuleName;
@@ -701,7 +595,7 @@ String  SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM
         aHelpURL += String( rtl::Uri::encode( aCommandURL,
                                               rtl_UriCharClassRelSegment,
                                               rtl_UriEncodeKeepEscapes,
-                                              RTL_TEXTENCODING_ASCII_US ));
+                                              RTL_TEXTENCODING_UTF8 ));
 
         String aTempURL = aHelpURL;
         AppendConfigToken_Impl( aTempURL, sal_True );
@@ -769,6 +663,49 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask   ,
     return pHelpWindow;
 }
 
+XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow )
+{
+    String sModuleName = GetHelpModuleName_Impl();
+    String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
+
+    ByteString aNewHelpId;
+
+    if ( pWindow && !sHelpText.Len() )
+    {
+        // no help text found -> try with parent help id.
+        Window* pParent = pWindow->GetParent();
+        while ( pParent )
+        {
+            aNewHelpId = pParent->GetHelpId();
+            sHelpText = pImp->GetHelpText( String( aNewHelpId, RTL_TEXTENCODING_UTF8 ), sModuleName );
+            if ( sHelpText.Len() > 0 )
+                pParent = NULL;
+            else
+                pParent = pParent->GetParent();
+        }
+
+        if ( bIsDebug && !sHelpText.Len() )
+            aNewHelpId.Erase();
+    }
+
+    // add some debug information?
+    if ( bIsDebug )
+    {
+        sHelpText += DEFINE_CONST_UNICODE("\n-------------\n");
+        sHelpText += String( sModuleName );
+        sHelpText += DEFINE_CONST_UNICODE(": ");
+        sHelpText += aCommandURL;
+        if ( aNewHelpId.Len() )
+        {
+            sHelpText += DEFINE_CONST_UNICODE(" - ");
+            sHelpText += String( aNewHelpId, RTL_TEXTENCODING_UTF8 );
+        }
+    }
+
+    return sHelpText;
+}
+
+
 BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
 {
     // check if help is available
@@ -790,34 +727,33 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
     INetProtocol nProtocol = aParser.GetProtocol();
     if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP )
     {
-        // #i90162 Accept anything that is not invalid as help id, as both
-        // uno: URLs used as commands/help ids in the Office and the scheme
-        // used in extension help ids (e.g. com.foocorp.foo-ext:FooDialogButton)
-        // are accepted as INET_PROT_UNO respectively INET_PROT_GENERIC
-        bool bAcceptAsURL = ( nProtocol != INET_PROT_NOT_VALID );
-
-        // #i94891 As in some extensions help ids like foo.bar.dummy without
-        // any : have been used that worked before the fix of #i90162 (see
-        // above) strings containing . will be also accepted to avoid brea-
-        // king the help of existing extensions.
-        if( !bAcceptAsURL )
-            bAcceptAsURL = ( rURL.Search( '.' ) != STRING_NOTFOUND );
-
-        if ( bAcceptAsURL )
-        {
-            aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) );
-        }
-        else
+        String aHelpModuleName( GetHelpModuleName_Impl() );
+        aHelpURL  = CreateHelpURL_Impl( rURL, aHelpModuleName );
+        if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
         {
-            // FIXME: HELPID
-            aHelpURL  = CreateHelpURL_Impl( String()/*0*/, GetHelpModuleName_Impl( ) );
-
-            // pb i91715: strings begin with ".HelpId:" are not words of the basic ide
-            // they are helpid-strings used by the testtool -> so we ignore them
-            static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") );
-            if ( rURL.Search( sHelpIdScheme ) != 0 )
-                sKeyword = ::rtl::OUString( rURL );
+            // no help found -> try with parent help id.
+            Window* pParent = pWindow->GetParent();
+            while ( pParent )
+            {
+                ByteString aHelpId = pParent->GetHelpId();
+                aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName );
+                if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+                    break;
+                else
+                {
+                    pParent = pParent->GetParent();
+                    if ( !pParent )
+                        // create help url of start page ( helpid == 0 -> start page)
+                        aHelpURL = CreateHelpURL( String(), aHelpModuleName );
+                }
+            }
         }
+
+        // pb i91715: strings begin with ".HelpId:" are not words of the basic ide
+        // they are helpid-strings used by the testtool -> so we ignore them
+        static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") );
+        if ( rURL.Search( sHelpIdScheme ) != 0 )
+            sKeyword = ::rtl::OUString( rURL );
     }
 
     Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
@@ -847,6 +783,12 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
     if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
         return FALSE;
 
+#ifdef DBG_UTIL
+    ByteString aTmp("SfxHelp: HelpId = ");
+    aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 );
+    DBG_TRACE( aTmp.GetBuffer() );
+#endif
+
     pHelpWindow->SetHelpURL( aHelpURL );
     pHelpWindow->loadHelpContent(aHelpURL);
     if ( sKeyword.getLength() > 0 )
@@ -859,110 +801,6 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
     return TRUE;
 }
 
-#if 0
-// FIXME: HELPID
-BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow )
-{
-    String aHelpModuleName( GetHelpModuleName_Impl() );
-    String aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName );
-    if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
-    {
-        // no help found -> try with parent help id.
-        Window* pParent = pWindow->GetParent();
-        while ( pParent )
-        {
-            nHelpId = pParent->GetSmartUniqueOrHelpId().GetNum();
-            aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName );
-
-            if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
-                break;
-            else
-            {
-                pParent = pParent->GetParent();
-                if ( !pParent )
-                    // create help url of start page ( helpid == 0 -> start page)
-                    aHelpURL = CreateHelpURL( 0, aHelpModuleName );
-            }
-        }
-    }
-
-    return Start( aHelpURL, pWindow );
-}
-#endif
-
-#if 0
-// FIXME: HELPID
-XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow )
-{
-    String aModuleName = GetHelpModuleName_Impl();
-    String aHelpText = pImp->GetHelpText( nHelpId, aModuleName );
-    ULONG nNewHelpId = 0;
-
-    if ( pWindow && aHelpText.Len() == 0 )
-    {
-        // no help text found -> try with parent help id.
-        Window* pParent = pWindow->GetParent();
-        while ( pParent )
-        {
-            nNewHelpId = pParent->GetHelpId();
-            aHelpText = pImp->GetHelpText( nNewHelpId, aModuleName );
-
-            if ( aHelpText.Len() > 0 )
-                pParent = NULL;
-            else
-                pParent = pParent->GetParent();
-        }
-
-        if ( bIsDebug && aHelpText.Len() == 0 )
-            nNewHelpId = 0;
-    }
-
-    if ( bIsDebug )
-    {
-        aHelpText += DEFINE_CONST_UNICODE("\n\n");
-        aHelpText += aModuleName;
-        aHelpText += DEFINE_CONST_UNICODE(" - ");
-        aHelpText += String::CreateFromInt64( nHelpId );
-        if ( nNewHelpId )
-        {
-            aHelpText += DEFINE_CONST_UNICODE(" - ");
-            aHelpText += String::CreateFromInt64( nNewHelpId );
-        }
-    }
-
-    return aHelpText;
-}
-#endif
-
-XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* )
-{
-    String sModuleName = GetHelpModuleName_Impl();
-    String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
-
-    // add some debug information?
-    if ( bIsDebug )
-    {
-        sHelpText += DEFINE_CONST_UNICODE("\n-------------\n");
-        sHelpText += String( sModuleName );
-        sHelpText += DEFINE_CONST_UNICODE(": ");
-        sHelpText += aCommandURL;
-    }
-
-    return sHelpText;
-}
-
-#if 0
-// FIXME: HELPID
-String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName )
-{
-    String aURL;
-    SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-    if ( pHelp )
-        aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName );
-    return aURL;
-}
-#endif
-
 String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName )
 {
     String aURL;
@@ -972,36 +810,25 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN
     return aURL;
 }
 
-void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId )
+void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId )
 {
-// FIXME HELPID
-#if 0
-        SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-        if ( pHelp )
-            pHelp->OpenHelpAgent( nHelpId );
-#else
-(void)nHelpId;
-#endif
+    SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
+    if ( pHelp )
+        pHelp->OpenHelpAgent( sHelpId );
 }
 
-// FIXME: HELPID
-#if 0
-void SfxHelp::OpenHelpAgent( ULONG nHelpId )
+void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
 {
     if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
     {
-//      SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-//      if ( pHelp )
-//      {
             SfxHelpOptions_Impl *pOpt = pImp->GetOptions();
-            if ( !pOpt->HasId( nHelpId ) )
+            if ( !pOpt->HasId( sHelpId ) )
                 return;
 
             try
             {
                 URL aURL;
-                // FIXME: HELPID
-                aURL.Complete = CreateHelpURL_Impl( String()/*nHelpId*/, GetHelpModuleName_Impl() );
+                aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() );
                 Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
                     ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY );
                 xTrans->parseStrict(aURL);
@@ -1027,10 +854,8 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
             {
                 DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" );
             }
-//      }
     }
 }
-#endif
 
 String SfxHelp::GetDefaultHelpModule()
 {
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index e66dd2c56eaf..444be02127b3 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -281,7 +281,11 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
             if ( !pView )
                 pView = SfxViewFrame::Current();
             if ( pView )
-              SfxHelp::OpenHelpAgent( &pView->GetFrame(), rReq.GetSlot() );
+            {
+                rtl::OString aCmd(".uno:");
+                aCmd += rSlot.GetUnoName();
+                SfxHelp::OpenHelpAgent( &pView->GetFrame(), aCmd );
+            }
 
             SfxExecFunc pFunc = rSlot.GetExecFnc();
             rShell.CallExec( pFunc, rReq );
@@ -1675,14 +1679,14 @@ void SfxDispatcher::SetMenu_Impl()
 }
 
 //--------------------------------------------------------------------
-long SfxDispatcher::Update_Impl( sal_Bool bForce )
+void SfxDispatcher::Update_Impl( sal_Bool bForce )
 {
     SFX_STACK(SfxDispatcher::Update_Impl);
 
     Flush();
 
     if ( !pImp->pFrame || pImp->bUILocked )
-        return 0;
+        return;
 
     SFX_APP();  // -Wall is this required???
     SfxDispatcher *pDisp = this;
@@ -1704,7 +1708,7 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
     }
 
     if ( !bUpdate || pImp->pFrame->GetFrame().IsClosing_Impl() )
-        return 0;
+        return;
 
     SfxViewFrame* pTop = pImp->pFrame ? pImp->pFrame->GetTopViewFrame() : NULL;
     sal_Bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this;
@@ -1778,12 +1782,11 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
     if ( xLayoutManager.is() )
         xLayoutManager->unlock();
 
-    return 1;
+    return;
 }
 
-sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin )
+void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin )
 {
-    sal_uInt32 nHelpId = 0;
     SFX_APP();
     SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
     sal_Bool bIsActive = sal_False;
@@ -1798,7 +1801,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
     }
 
     if ( pImp->pParent && !pImp->bQuiet /* && bUIActive */ )
-        nHelpId = pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
+        pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
 
     for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
         pImp->aObjBars[n].nResId = 0;
@@ -1807,7 +1810,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
     // bQuiet : own shells aren't considered for UI and SlotServer
     // bNoUI: own Shells aren't considered fors UI
     if ( pImp->bQuiet || pImp->bNoUI || (pImp->pFrame && pImp->pFrame->GetObjectShell()->IsPreview()) )
-        return nHelpId;
+        return;
 
     sal_uInt32 nStatBarId=0;
     SfxShell *pStatusBarShell = NULL;
@@ -1818,8 +1821,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
     {
         SfxShell *pShell = GetShell( nShell-1 );
         SfxInterface *pIFace = pShell->GetInterface();
-        if (pShell->GetHelpId())
-            nHelpId = pShell->GetHelpId();
 
         // don't consider shells if "Hidden" oder "Quiet"
         sal_Bool bReadOnlyShell = IsReadOnlyShell_Impl( nShell-1 );
@@ -1950,8 +1951,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
             pImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings );
         }
     }
-
-    return nHelpId;
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 0aa4df6902ee..6b05c03160ff 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -29,9 +29,6 @@
 #include "precompiled_sfx2.hxx"
 #include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
-#ifndef GCC
-#endif
-
 #include <sfx2/msg.hxx>
 
 //====================================================================
@@ -63,4 +60,16 @@ USHORT SfxSlot::GetWhich( const SfxItemPool &rPool ) const
     return nMasterSlotId;
 }
 
+::rtl::OString SfxSlot::GetCommand() const
+{
+    rtl::OString sRet(".uno:");
+    sRet += pUnoName;
+    return sRet;
+}
+
+::rtl::OUString SfxSlot::GetCommandString() const
+{
+    rtl::OString aCmd(GetCommand());
+    return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 );
+}
 
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 1d1ef73ad8cf..73284dbd9806 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -297,9 +297,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
 
     FreeResource();
 
-    // explizite Help-Id
-    // FIXME: HELPID
-    SetHelpId( ""/*SID_ABOUT*/ );
+    SetHelpId( ".uno:About" );
 
     //#112429# replace occurences of "StarOffice" in the "StarSuite" version
     String sCopyright( aCopyrightText.GetText() );
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index d85a01870074..df1f13155513 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -160,9 +160,6 @@ void SfxModalDialog::GetDialogData_Impl()
 void SfxModalDialog::init()
 {
     GetDialogData_Impl();
-    aTimer.SetTimeout( 100 );
-    aTimer.SetTimeoutHdl( LINK( this, SfxModalDialog, TimerHdl_Impl ) );
-    aTimer.Start();
 }
 
 // -----------------------------------------------------------------------
@@ -214,13 +211,7 @@ SfxModalDialog::~SfxModalDialog()
 */
 
 {
-/*
-    SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
-    if ( pHelpPI )
-        pHelpPI->ResetTopic();
-*/
     SetDialogData_Impl();
-    aTimer.Stop();
     delete pOutputSet;
 }
 
@@ -233,16 +224,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxModalDialog, TimerHdl_Impl, Timer*, EMPTYARG )
-{
-/*
-    SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
-    if ( pHelpPI )
-        pHelpPI->LoadTopic( GetHelpId() );
- */
-    return 0L;
-}
-
 void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
 {
     DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
@@ -373,7 +354,6 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
 {
     pImp->pMgr = pCW;
     pImp->bConstructed = FALSE;
-    // FIXME: HELPID
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
@@ -393,7 +373,6 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
 {
     pImp->pMgr = pCW;
     pImp->bConstructed = FALSE;
-    // FIXME: HELPID
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
@@ -418,16 +397,15 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt )
         pBindings->SetActiveFrame( pImp->pMgr->GetFrame() );
         pImp->pMgr->Activate_Impl();
         Window* pWindow = rEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            // FIXME: HELPID
-            nHelpId = 0; // pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
     }
     else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
     {
@@ -521,16 +499,15 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt )
         pBindings->SetActiveFrame( pImp->pMgr->GetFrame() );
         pImp->pMgr->Activate_Impl();
         Window* pWindow = rEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            // FIXME: HELPID
-            nHelpId = 0; //pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
     }
     else if ( rEvt.GetType() == EVENT_LOSEFOCUS )
     {
@@ -563,7 +540,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
 {
     pImp->pMgr = pCW;
     pImp->bConstructed = FALSE;
-    // FIXME: HELPID
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
@@ -584,7 +560,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
 {
     pImp->pMgr = pCW;
     pImp->bConstructed = FALSE;
-    // FIXME: HELPID
     SetUniqueId( GetHelpId() );
     SetHelpId("");
     if ( pBindinx )
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index f1e100e17cf5..78844d335f6a 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -76,7 +76,6 @@
 #define CB_URL                          ( RC_DIALOG_BEGIN + 64 )
 
 #define STR_INTERNET                    ( RC_DIALOG_BEGIN + 65 )
-#define RID_AUTOHIDE                    ( RC_DIALOG_BEGIN + 66 )
 
 #define DLG_ONLINE_REGISTER             ( RC_DIALOG_BEGIN + 68 )
 #define DLG_VERSIONS                    ( RC_DIALOG_BEGIN + 69 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index a54d2c340d04..53e232a7c63c 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -231,22 +231,7 @@ ModalDialog RID_URLOPEN
         Left = TRUE ;
     };
 };
-Menu RID_AUTOHIDE
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = SID_AUTOHIDE ;
-            HelpID = SID_AUTOHIDE ;
-            Text [ en-US ] = "Hide" ;
-        };
-    };
-};
-String RID_AUTOHIDE
-{
-    Text [ en-US ] = "Don't Hide" ;
-};
+
 String SID_NAVIGATOR
 {
     Text [ en-US ] = "Navigator";
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 8ad551278a27..499987f5ff3b 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -46,6 +46,7 @@
 #include <sfx2/viewsh.hxx>
 #include "sfxhelp.hxx"
 #include <sfx2/objsh.hxx>
+#include <sfx2/msgpool.hxx>
 
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -918,13 +919,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
 */
 
 {
-    // FIXME: HELPID
-    ULONG nId = 0;// GetHelpId();
-    if ( !nId && pCW )
-        nId = pCW->GetType();
-    SetHelpId( "" );
-    // FIXME: HELPID
-    SetUniqueId( ""/*nId*/ );
+    if ( GetHelpId().getLength() )
+    {
+        SetUniqueId( GetHelpId() );
+        SetHelpId("");
+    }
+    else
+    {
+        SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+        SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+        const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() );
+        if ( pSlot )
+        {
+            rtl::OString aCmd(".uno:");
+            aCmd += pSlot->GetUnoName();
+            SetUniqueId( aCmd );
+        }
+    }
 
     pImp = new SfxDockingWindow_Impl;
     pImp->bConstructed = FALSE;
@@ -962,9 +973,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
 */
 
 {
-    // FIXME: HELPID
-    SetUniqueId( GetHelpId() );
-    SetHelpId("");
+    if ( GetHelpId().getLength() )
+    {
+        SetUniqueId( GetHelpId() );
+        SetHelpId("");
+    }
+    else
+    {
+        SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+        SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+        const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() );
+        if ( pSlot )
+        {
+            rtl::OString aCmd(".uno:");
+            aCmd += pSlot->GetUnoName();
+            SetUniqueId( aCmd );
+        }
+    }
 
     pImp = new SfxDockingWindow_Impl;
     pImp->bConstructed = FALSE;
@@ -1846,16 +1871,15 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
             pMgr->Activate_Impl();
 
         Window* pWindow = rEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            // FIXME: HELPID
-            //nHelpId = pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
 
         // In VCL geht Notify zun"achst an das Fenster selbst,
         // also base class rufen, sonst erf"ahrt der parent nichts
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 2785a38305cd..6512bac43b7e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -218,55 +218,55 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
 {
     //!!! todo: cache the help strings (here or TRA)
 
-    ULONG nHelpId = 0;
+    rtl::OString sHelpId;
     // mapping from element id -> help id
     switch ( aEvent.ElementId )
     {
         case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION :
-            nHelpId = HID_FILESAVE_AUTOEXTENSION;
+            sHelpId = HID_FILESAVE_AUTOEXTENSION;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD :
-            nHelpId = HID_FILESAVE_SAVEWITHPASSWORD;
+            sHelpId = HID_FILESAVE_SAVEWITHPASSWORD;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS :
-            nHelpId = HID_FILESAVE_CUSTOMIZEFILTER;
+            sHelpId = HID_FILESAVE_CUSTOMIZEFILTER;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_READONLY :
-            nHelpId = HID_FILEOPEN_READONLY;
+            sHelpId = HID_FILEOPEN_READONLY;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_LINK :
-            nHelpId = HID_FILEDLG_LINK_CB;
+            sHelpId = HID_FILEDLG_LINK_CB;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_PREVIEW :
-            nHelpId = HID_FILEDLG_PREVIEW_CB;
+            sHelpId = HID_FILEDLG_PREVIEW_CB;
             break;
 
         case ExtendedFilePickerElementIds::PUSHBUTTON_PLAY :
-            nHelpId = HID_FILESAVE_DOPLAY;
+            sHelpId = HID_FILESAVE_DOPLAY;
             break;
 
         case ExtendedFilePickerElementIds::LISTBOX_VERSION_LABEL :
         case ExtendedFilePickerElementIds::LISTBOX_VERSION :
-            nHelpId = HID_FILEOPEN_VERSION;
+            sHelpId = HID_FILEOPEN_VERSION;
             break;
 
         case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE_LABEL :
         case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE :
-            nHelpId = HID_FILESAVE_TEMPLATE;
+            sHelpId = HID_FILESAVE_TEMPLATE;
             break;
 
         case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE_LABEL :
         case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE :
-            nHelpId = HID_FILEOPEN_IMAGE_TEMPLATE;
+            sHelpId = HID_FILEOPEN_IMAGE_TEMPLATE;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_SELECTION :
-            nHelpId = HID_FILESAVE_SELECTION;
+            sHelpId = HID_FILESAVE_SELECTION;
             break;
 
         default:
@@ -276,8 +276,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
     OUString aHelpText;
     Help* pHelp = Application::GetHelp();
     if ( pHelp )
-        // FIXME: HELPID
-        aHelpText = String( pHelp->GetHelpText( String()/*nHelpId*/, NULL ) );
+        aHelpText = String( pHelp->GetHelpText( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8), NULL ) );
     return aHelpText;
 }
 
@@ -1223,7 +1222,7 @@ void SAL_CALL PickerThread_Impl::run()
 }
 
 // ------------------------------------------------------------------------
-void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId )
+void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
 {
     DBG_ASSERT( _pControlId && _pHelpId, "FileDialogHelper_Impl::setControlHelpIds: invalid array pointers!" );
     if ( !_pControlId || !_pHelpId )
@@ -1239,10 +1238,8 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
         {
             while ( *_pControlId )
             {
-                // calc the help id of the element
                 ::rtl::OUString sId( sHelpIdPrefix );
-                sId += ::rtl::OUString::valueOf( *_pHelpId );
-                // set the help id
+                sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 );
                 xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) );
 
                 ++_pControlId; ++_pHelpId;
@@ -1256,7 +1253,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
 }
 
 // ------------------------------------------------------------------------
-void FileDialogHelper_Impl::setDialogHelpId( const sal_Int32 _nHelpId )
+void FileDialogHelper_Impl::setDialogHelpId( sal_Int32 _nHelpId )
 {
     svt::SetDialogHelpId( mxFileDlg, _nHelpId );
 }
@@ -2458,7 +2455,7 @@ void FileDialogHelper::CreateMatcher( const String& rFactory )
 }
 
 // ------------------------------------------------------------------------
-void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId )
+void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
 {
     mpImp->setControlHelpIds( _pControlId, _pHelpId );
 }
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index b023b8fb53a9..bfd94595feee 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -140,8 +140,8 @@ namespace sfx2
 
         void                    correctVirtualDialogType();
 
-        void                    setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId );
-        void                    setDialogHelpId( const sal_Int32 _nHelpId );
+        void                    setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
+        void                    setDialogHelpId( sal_Int32 nId );
 
         sal_Bool                CheckFilterOptionsCapability( const SfxFilter* _pFilter );
 
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index b271d1e04dc7..d7f258e7ccb3 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -51,8 +51,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd ,
         WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
 
-    // FIXME: HELPID
-    pWindow->SetHelpId ( ""/*HID_NAVIGATOR_WINDOW*/ );
+    pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW );
     pWindow->SetOutputSizePixel( Size( 270, 240 ) );
 
     ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index fa5fa62a2ee4..90ed1a139cbb 100644
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.src
@@ -28,10 +28,11 @@
 #include <sfx2/sfx.hrc>
 #include "dialog.hrc"
 #include "newstyle.hrc"
+#include "sfx2/sfxcommands.h"
 
 ModalDialog DLG_NEW_STYLE_BY_EXAMPLE
 {
-    HelpId = SID_STYLE_NEW_BY_EXAMPLE ;
+    HelpId = CMD_SID_STYLE_NEW_BY_EXAMPLE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 177 , 112 ) ;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 065b407c6769..3c7a58cd09f9 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -664,8 +664,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
     aCancelBtn.Show();
     aHelpBtn.Show();
     aResetBtn.Show();
-    // FIXME: HELPID
-    aResetBtn.SetHelpId( ""/*HID_TABDLG_RESET_BTN*/ );
+    aResetBtn.SetHelpId( HID_TABDLG_RESET_BTN );
 
     if ( pUserBtn )
     {
@@ -681,8 +680,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
         String aStd( SfxResId( STR_STANDARD_SHORTCUT ) );
         aBaseFmtBtn.SetText( aStd );
         aBaseFmtBtn.SetClickHdl( LINK( this, SfxTabDialog, BaseFmtHdl ) );
-        // FIXME: HELPID
-        aBaseFmtBtn.SetHelpId( ""/*HID_TABDLG_STANDARD_BTN*/ );
+        aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN );
 
         // bFmt = tempor"ares Flag im Ctor() "ubergeben,
         // wenn bFmt == 2, dann auch TRUE,
@@ -789,8 +787,7 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable)
         pImpl->pApplyButton->SetText( String( SfxResId( STR_APPLY ) ) );
         pImpl->pApplyButton->Show();
 
-        // FIXME: HELPID
-        pImpl->pApplyButton->SetHelpId( ""/*HID_TABDLG_APPLY_BTN*/ );
+        pImpl->pApplyButton->SetHelpId( HID_TABDLG_APPLY_BTN );
     }
     else
     {
@@ -1783,16 +1780,15 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt )
         if ( pViewFrame )
         {
             Window* pWindow = rNEvt.GetWindow();
-            ULONG nHelpId  = 0;
-            while ( !nHelpId && pWindow )
+            rtl::OString sHelpId;
+            while ( !sHelpId.getLength() && pWindow )
             {
-                // FIXME: HELPID
-                // nHelpId = pWindow->GetHelpId();
+                sHelpId = pWindow->GetHelpId();
                 pWindow = pWindow->GetParent();
             }
 
-            if ( nHelpId )
-                SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), nHelpId );
+            if ( sHelpId.getLength() )
+                SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), sHelpId );
         }
     }
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 4777798aef2b..a3d9fd7b4ed2 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -778,10 +778,8 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx
     bHierarchical           ( FALSE ),
     bBindingUpdate          ( TRUE )
 {
-    // FIXME: HELPID
-    aFmtLb.SetHelpId( ""/*HID_TEMPLATE_FMT*/ );
-    // FIXME: HELPID
-    aFilterLb.SetHelpId( ""/*HID_TEMPLATE_FILTER*/ );
+    aFmtLb.SetHelpId( HID_TEMPLATE_FMT );
+    aFilterLb.SetHelpId( HID_TEMPLATE_FILTER );
     aFmtLb.SetWindowBits( WB_SORT | WB_HIDESELECTION );
     Font aFont = aFmtLb.GetFont();
     aFont.SetWeight( WEIGHT_NORMAL );
@@ -2210,32 +2208,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
     // HilfePI antriggern, wenn von Call als Handler und Bereich erlaubt ist
     if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) )
     {
-#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS
-        SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI();
-        if ( pHelpPI && pListBox && IsInitialized() &&
-             GetSelectedEntry().Len() )
-        {
-            const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
-            const SfxStyleFamily eFam = pItem->GetFamily();
-            DBG_ASSERT(pStyleSheetPool, "Kein Pool");
-            // SfxStyleSheetBase* pStyle = pStyleSheetPool
-            //      ? pStyleSheetPool->Find( GetSelectedEntry(), eFam ) : 0;
-            SfxStyleSheetBase *pStyle;
-            if ( pStyleSheetPool )
-                pStyle = pStyleSheetPool->Find ( GetSelectedEntry(), eFam );
-            else
-                pStyle = 0;
-
-            if ( pStyle )
-            {
-                String aHelpFile;
-                ULONG nHelpId=pStyle->GetHelpId(aHelpFile);
-                if ( nHelpId )
-                    pHelpPI->LoadTopic( nHelpId );
-            }
-        }
-#endif
-
         // nur, wenn Giesskanne an ist
         if ( IsInitialized() &&
              IsCheckedItem(SID_STYLE_WATERCAN) &&
@@ -2361,8 +2333,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
     Font aFont=aFilterLb.GetFont();
     aFont.SetWeight( WEIGHT_NORMAL );
     aFilterLb.SetFont( aFont );
-    // FIXME: HELPID
-    m_aActionTbL.SetHelpId( ""/*HID_TEMPLDLG_TOOLBOX_LEFT*/ );
+    m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT );
 }
 
 // ------------------------------------------------------------------------
@@ -2376,19 +2347,18 @@ void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
 
 void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyItem *pItem)
 {
-    USHORT nHelpId = 0;
+    rtl::OString sHelpId;
     switch( (USHORT) pItem->GetFamily() )
     {
-        case SFX_STYLE_FAMILY_CHAR: nHelpId = SID_STYLE_FAMILY1; break;
-        case SFX_STYLE_FAMILY_PARA: nHelpId = SID_STYLE_FAMILY2; break;
-        case SFX_STYLE_FAMILY_FRAME:nHelpId = SID_STYLE_FAMILY3; break;
-        case SFX_STYLE_FAMILY_PAGE: nHelpId = SID_STYLE_FAMILY4; break;
-        case SFX_STYLE_FAMILY_PSEUDO: nHelpId = SID_STYLE_FAMILY5; break;
-        default: DBG_ERROR("unbekannte StyleFamily"); break;
+        case SFX_STYLE_FAMILY_CHAR:     sHelpId = ".uno:CharStyle"; break;
+        case SFX_STYLE_FAMILY_PARA:     sHelpId = ".uno:ParaStyle"; break;
+        case SFX_STYLE_FAMILY_FRAME:    sHelpId = ".uno:FrameStyle"; break;
+        case SFX_STYLE_FAMILY_PAGE:     sHelpId = ".uno:PageStyle"; break;
+        case SFX_STYLE_FAMILY_PSEUDO:   sHelpId = ".uno:ListStyle"; break;
+        default: DBG_ERROR("unknown StyleFamily"); break;
     }
     m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0);
-    // FIXME: HELPID
-    m_aActionTbL.SetHelpId( nId, ""/*nHelpId*/ );
+    m_aActionTbL.SetHelpId( nId, sHelpId );
 }
 
 // ------------------------------------------------------------------------
@@ -2687,21 +2657,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
             uno::Any aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleNewByExample"));
             ::rtl::OUString sLabel = lcl_GetLabel( aCommand );
             pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel );
-            // FIXME: HELPID
-            pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, ""/*HID_TEMPLDLG_NEWBYEXAMPLE*/);
+            pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
 
             aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleUpdateByExample"));
             sLabel = lcl_GetLabel( aCommand );
 
             pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel );
-            // FIXME: HELPID
-            pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, ""/*HID_TEMPLDLG_UPDATEBYEXAMPLE*/);
+            pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
 
             aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles"));
             sLabel = lcl_GetLabel( aCommand );
             pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
-            // FIXME: HELPID
-            pMenu->SetHelpId(SID_TEMPLATE_LOAD, ""/*SID_TEMPLATE_LOAD*/);
+            pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles");
 
             pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl));
             pMenu->Execute( pBox,
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index a4adcd77b6d3..e5b4f1fd9cdf 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -57,7 +57,7 @@ ImageList IMG_LST_STYLE_DESIGNER_HC
  // RID_STYLECATALOG ------------------------------------------------------
 ModalDialog RID_STYLECATALOG
 {
-    HelpId = SID_STYLE_CATALOG ;
+    HelpId = CMD_SID_STYLE_CATALOG ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 181 , 134 ) ;
@@ -146,7 +146,7 @@ DockingWindow DLG_STYLE_DESIGNER
 {
     Text [ en-US ] = "Styles and Formatting" ;
 
-    HelpId = SID_STYLE_DESIGNER ;
+    HelpId = CMD_SID_STYLE_DESIGNER ;
     OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 838168e64526..7e8fd688af52 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -44,7 +44,6 @@
 #define STR_NOSTARTPRINTER                  (RID_SFX_DOC_START+ 8)
 #define MSG_CONFIRM_FILTER                  (RID_SFX_DOC_START+11)
 #define MSG_CONFIRM_OVERWRITE_TEMPLATE      (RID_SFX_DOC_START+12)
-#define MSG_QUERY_LOAD_TEMPLATE             (RID_SFX_DOC_START+13)
 
 #define STR_DELETE_REGION                   (RID_SFX_DOC_START+14)
 #define STR_DELETE_TEMPLATE                 (RID_SFX_DOC_START+15)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index d17b62c9b52a..497d4ccd7c97 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -43,14 +43,6 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE
     DefButton = WB_DEF_NO ;
     Message [ en-US ] = "Name already in use.\nDo you want to overwrite document template?" ;
 };
-QueryBox MSG_QUERY_LOAD_TEMPLATE
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-    HelpId = MSG_QUERY_LOAD_TEMPLATE;
-
-    Message [ en-US ] = "The Styles in this document do not match your current Styles. Should your current Styles be applied to this document?";
-};
 String STR_DELETE_REGION
 {
     Text [ en-US ] = "Are you sure you want to delete the region \"$1\"?" ;
diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src
index 91d966fbd2d5..3192de44c19a 100644
--- a/sfx2/source/doc/doctdlg.src
+++ b/sfx2/source/doc/doctdlg.src
@@ -28,10 +28,11 @@
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #include "doctdlg.hrc"
+#include <sfx2/sfxcommands.h>
 
 ModalDialog DLG_DOC_TEMPLATE
 {
-    HelpId = SID_DOCTEMPLATE ;
+    HelpId = CMD_SID_DOCTEMPLATE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 280 , 128 ) ;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 1d57e0b9c761..719dc5b8d223 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -245,9 +245,8 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
             // * always work with an own instance, even if we get only NULL in this ctor
     }
 
-    // FIXME: HELPID
-    aLeftLb.SetHelpId( ""/*HID_CTL_ORGANIZER_LEFT*/ );
-    aRightLb.SetHelpId( ""/*HID_CTL_ORGANIZER_RIGHT*/ );
+    aLeftLb.SetHelpId( HID_CTL_ORGANIZER_LEFT );
+    aRightLb.SetHelpId( HID_CTL_ORGANIZER_RIGHT );
 
     String aWorkPath = SvtPathOptions().GetWorkPath();
     if ( aWorkPath.Len() )
diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index 2c9975de9bb8..d9ef886f59bb 100644
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -37,7 +37,7 @@
 
 ModalDialog DLG_ORGANIZE
 {
-    HelpId = SID_ORGANIZER ;
+    HelpId = CMD_SID_ORGANIZER ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 271 , 162 ) ;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 3ad0cc51a923..f7df58ffd397 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -384,7 +384,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&,
 ::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException)
 {
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_FLOATINGFRAME, mxObj );
+    VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString::createFromAscii(".uno:InsertObjectFloatingFrame"), mxObj );
     if ( pDlg )
         pDlg->Execute();
     return 0;
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 3b1ebde3f1ae..d3235b1c7a7f 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -177,8 +177,7 @@ SfxPreviewWin::SfxPreviewWin(
     Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh )
     : Window(pParent, rResId), rDocShell( rDocSh )
 {
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_PREVIEW_FRAME*/ );
+    SetHelpId( HID_PREVIEW_FRAME );
 
     // adjust contrast mode initially
     bool bUseContrast = UseHighContrastSetting();
diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src
index 146f9f630570..63c9f49110dd 100644
--- a/sfx2/source/doc/new.src
+++ b/sfx2/source/doc/new.src
@@ -28,12 +28,14 @@
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #include "new.hrc"
+#include <sfx2/sfxcommands.h>
+
  // pragma ----------------------------------------------------------------
 
  // DLG_NEW_FILE ----------------------------------------------------------
 ModalDialog DLG_NEW_FILE
 {
-    HelpId = SID_NEWDOC ;
+    HelpId = CMD_SID_NEWDOC ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 336 , 96 ) ;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index e73594af1e10..2e5968d83077 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -365,17 +365,6 @@ void  SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT)
     {
         SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool();
         SetOrganizerSearchMask(pStylePool);
-#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS
-        SfxStyleSheetBase *pStyle = (*pStylePool)[nIdx2];
-        if(pStyle)
-        {
-            String aHelpFile;
-            ULONG nHelpId=pStyle->GetHelpId(aHelpFile);
-            SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI();
-            if ( pHelpPI && nHelpId )
-                pHelpPI->LoadTopic( nHelpId );
-        }
-#endif
     }
 }
 
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index a254deb24c52..3e6a529bc67e 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -31,7 +31,7 @@
 #include "querytemplate.hxx"
 #include "sfxresid.hxx"
 #include "doc.hrc"
-
+#include "helpid.hrc"
 #include <vcl/svapp.hxx>
 
 namespace sfx2
@@ -41,8 +41,7 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) :
     MessBox ( pParent, 0, Application::GetDisplayName(), rMessage )
 {
     SetImage( QueryBox::GetStandardImage() );
-    // FIXME: HELPID
-    SetHelpId( ""/*MSG_QUERY_LOAD_TEMPLATE*/ );
+    SetHelpId( HID_QUERY_LOAD_TEMPLATE );
 
     AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES,
             BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 29ad461d18da..86353e4ca968 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -30,330 +30,323 @@
 // include ------------------------------------------------------------------
 
 #include <svl/solar.hrc>
+#include <sfx2/sfxcommands.h>
 
 // Help-Ids -----------------------------------------------------------------
 
-#define HID_GLOBAL_FALLBACK                         0xFFFFFFFF
+#define HID_FILTER_SELECT                                     "SFX2_HID_FILTER_SELECT"
+#define HID_USERDEFBMP                                        "SFX2_HID_USERDEFBMP"
+#define HID_DOCINFO_EDT                                       "SFX2_HID_DOCINFO_EDT"
+#define HID_PASSWD                                            "SFX2_HID_PASSWD"
+#define HID_PRINTMONITOR                                      "SFX2_HID_PRINTMONITOR"
+#define HID_CONFIG_OBJECTBAR                                  "SFX2_HID_CONFIG_OBJECTBAR"
+#define HID_MANAGE_STYLES                                     "SFX2_HID_MANAGE_STYLES"
+#define HID_CONFIG_EVENT                                      "SFX2_HID_CONFIG_EVENT"
+#define HID_DOCINFODESC                                       "SFX2_HID_DOCINFODESC"
+#define HID_DOCINFODOC                                        "SFX2_HID_DOCINFODOC"
+#define HID_DOCINFOUSER                                       "SFX2_HID_DOCINFOUSER"
+#define HID_BOOKMARKPROPS                                     "SFX2_HID_BOOKMARKPROPS"
+#define HID_BOOKGROUPPROPS                                    "SFX2_HID_BOOKGROUPPROPS"
+#define HID_BOOKFILEPROPS                                     "SFX2_HID_BOOKFILEPROPS"
+#define HID_NEWS_SERVERPROPS                                  "SFX2_HID_NEWS_SERVERPROPS"
+#define HID_NEWS_RULEPAGE                                     "SFX2_HID_NEWS_RULEPAGE"
+#define HID_MAILINTRAYPROPS                                   "SFX2_HID_MAILINTRAYPROPS"
+#define HID_DOCINFORELOAD                                     "SFX2_HID_DOCINFORELOAD"
+#define HID_NEWS_GROUPPAGE                                    "SFX2_HID_NEWS_GROUPPAGE"
+#define HID_NEWS_SERVERPAGE                                   "SFX2_HID_NEWS_SERVERPAGE"
+#define HID_FILEDLG_STANDARD                                  "SFX2_HID_FILEDLG_STANDARD"
+#define HID_FILEDLG_MANAGER                                   "SFX2_HID_FILEDLG_MANAGER"
+#define HID_FILEDLG_URL                                       "SFX2_HID_FILEDLG_URL"
+#define HID_FILEDLG_FILE                                      "SFX2_HID_FILEDLG_FILE"
+#define HID_FILEDLG_USE_PASSWD                                "SFX2_HID_FILEDLG_USE_PASSWD"
+#define HID_FILEDLG_READ_ONLY                                 "SFX2_HID_FILEDLG_READ_ONLY"
+#define HID_EXPLORERCONTROL                                   "SFX2_HID_EXPLORERCONTROL"
+#define HID_BROWSERCONTROL                                    "SFX2_HID_BROWSERCONTROL"
+#define HID_CTL_ORGANIZER_LEFT                                "SFX2_HID_CTL_ORGANIZER_LEFT"
+#define HID_CTL_ORGANIZER_RIGHT                               "SFX2_HID_CTL_ORGANIZER_RIGHT"
+#define HID_EXPLMAILSRV_GENERAL_PAGE                          "SFX2_HID_EXPLMAILSRV_GENERAL_PAGE"
+#define HID_EXPLMAILSRV_PROTOCOL_PAGE                         "SFX2_HID_EXPLMAILSRV_PROTOCOL_PAGE"
+#define HID_EXPLMAILSRV_DATAMATCH_PAGE                        "SFX2_HID_EXPLMAILSRV_DATAMATCH_PAGE"
+#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE                      "SFX2_HID_EXPLMAILSRV_SENDJOURNAL_PAGE"
+#define HID_EXPLMAIL_GENERAL_PAGE                             "SFX2_HID_EXPLMAIL_GENERAL_PAGE"
+#define HID_NEWS_CTL_RULES                                    "SFX2_HID_NEWS_CTL_RULES"
+#define HID_NEWS_CTL_GROUPS                                   "SFX2_HID_NEWS_CTL_GROUPS"
+#define HID_CONFIG_OBJECTBAR_CTL                              "SFX2_HID_CONFIG_OBJECTBAR_CTL"
+#define HID_NEWS_QUICKSEARCH                                  "SFX2_HID_NEWS_QUICKSEARCH"
+#define HID_NEWS_SERVERVIEWPROPS                              "SFX2_HID_NEWS_SERVERVIEWPROPS"
+#define HID_NEWS_SHOWARTICLEPROPS                             "SFX2_HID_NEWS_SHOWARTICLEPROPS"
+#define HID_NEWS_SHOWGROUPPROPS                               "SFX2_HID_NEWS_SHOWGROUPPROPS"
+#define HID_NEWS_USER                                         "SFX2_HID_NEWS_USER"
+#define HID_MULTISELECTION_GENERAL_PAGE                       "SFX2_HID_MULTISELECTION_GENERAL_PAGE"
+#define HID_LINK_GENERAL_PAGE                                 "SFX2_HID_LINK_GENERAL_PAGE"
+#define HID_LINK_ADDRESS_PAGE                                 "SFX2_HID_LINK_ADDRESS_PAGE"
+#define HID_FOLDER_GENERAL_PAGE                               "SFX2_HID_FOLDER_GENERAL_PAGE"
+#define HID_FILE_GENERAL_PAGE                                 "SFX2_HID_FILE_GENERAL_PAGE"
+#define HID_FTP_GENERAL_PAGE                                  "SFX2_HID_FTP_GENERAL_PAGE"
+#define HID_PRINT_OPTIONS                                     "SFX2_HID_PRINT_OPTIONS"
+#define HID_PREVIEW_FRAME                                     "SFX2_HID_PREVIEW_FRAME"
+#define HID_DOCINFO_FRAME                                     "SFX2_HID_DOCINFO_FRAME"
+#define HID_EXPLORER_FRAME                                    "SFX2_HID_EXPLORER_FRAME"
+#define HID_APP_WIN                                           "SFX2_HID_APP_WIN"
+#define HID_TEMPLATE_FMT                                      "SFX2_HID_TEMPLATE_FMT"
+#define HID_TEMPLATE_FILTER                                   "SFX2_HID_TEMPLATE_FILTER"
+#define HID_FTPSERVER_PAGE                                    "SFX2_HID_FTPSERVER_PAGE"
+#define HID_DLG_SFX_EXP_SEARCH                                "SFX2_HID_DLG_SFX_EXP_SEARCH"
+#define HID_TP_SFX_EXP_SEARCH_CRITERIA                        "SFX2_HID_TP_SFX_EXP_SEARCH_CRITERIA"
+#define HID_TP_SFX_EXP_SEARCH_PLACE                           "SFX2_HID_TP_SFX_EXP_SEARCH_PLACE"
+#define HID_SEARCH_DLG_TABLB                                  "SFX2_HID_SEARCH_DLG_TABLB"
+#define HID_TEMPLDLG_NEWBYEXAMPLE                             "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"
+#define HID_TEMPLDLG_UPDATEBYEXAMPLE                          "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"
+#define HID_TEMPLDLG_WATERCAN                                 "SFX2_HID_TEMPLDLG_WATERCAN"
+#define HID_DESKTOP                                           "SFX2_HID_DESKTOP"
+#define HID_EXPLORERTOOLSTOOLBOX                              "SFX2_HID_EXPLORERTOOLSTOOLBOX"
+#define HID_EXPLOREROBJECTTOOLBOX                             "SFX2_HID_EXPLOREROBJECTTOOLBOX"
+#define HID_RECORDINGTOOLBOX                                  "SFX2_HID_RECORDINGTOOLBOX"
+#define HID_FULLSCREENTOOLBOX                                 "SFX2_HID_FULLSCREENTOOLBOX"
+#define HID_HELPBAR                                           "SFX2_HID_HELPBAR"
+#define HID_ENVTOOLBOX                                        "SFX2_HID_ENVTOOLBOX"
+#define HID_FRAMESETEDIT_TOOLBOX                              "SFX2_HID_FRAMESETEDIT_TOOLBOX"
+#define HID_NAVIGATOR_WINDOW                                  "SFX2_HID_NAVIGATOR_WINDOW"
+#define HID_TABDLG_RESET_BTN                                  "SFX2_HID_TABDLG_RESET_BTN"
+#define HID_TABDLG_STANDARD_BTN                               "SFX2_HID_TABDLG_STANDARD_BTN"
+#define HID_HELPAGENT_TIP_BOX                                 "SFX2_HID_HELPAGENT_TIP_BOX"
+#define HID_TEMPLDLG_TOOLBOX_LEFT                             "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"
+#define HID_TEMPLDLG_TOOLBOX_RIGHT                            "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT"
+#define HID_EXPLORER_SRCH_COUNT                               "SFX2_HID_EXPLORER_SRCH_COUNT"
+#define HID_BEAMER_SORT_ASCENDING                             "SFX2_HID_BEAMER_SORT_ASCENDING"
+#define HID_BEAMER_SORT_DESCENDING                            "SFX2_HID_BEAMER_SORT_DESCENDING"
+#define HID_EXPLORER_SRCH_LATEST_COUNT                        "SFX2_HID_EXPLORER_SRCH_LATEST_COUNT"
+#define HID_CONFIG_EVENT_OFFICE_BASED                         "SFX2_HID_CONFIG_EVENT_OFFICE_BASED"
+#define HID_CONFIG_EVENT_DOCUMENT_BASED                       "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED"
+#define HID_ORGANIZE_NEW                                      "SFX2_HID_ORGANIZE_NEW"
+#define HID_ORGANIZE_DELETE                                   "SFX2_HID_ORGANIZE_DELETE"
+#define HID_ORGANIZE_EDIT                                     "SFX2_HID_ORGANIZE_EDIT"
+#define HID_ORGANIZE_COPY_FROM                                "SFX2_HID_ORGANIZE_COPY_FROM"
+#define HID_ORGANIZE_COPY_TO                                  "SFX2_HID_ORGANIZE_COPY_TO"
+#define HID_ORGANIZE_PRINT                                    "SFX2_HID_ORGANIZE_PRINT"
+#define HID_ORGANIZE_PRINTER_SETUP                            "SFX2_HID_ORGANIZE_PRINTER_SETUP"
+#define HID_ORGANIZE_RESCAN                                   "SFX2_HID_ORGANIZE_RESCAN"
+#define HID_STYLIST_NEW                                       "SFX2_HID_STYLIST_NEW"
+#define HID_STYLIST_EDIT                                      "SFX2_HID_STYLIST_EDIT"
+#define HID_STYLIST_DELETE                                    "SFX2_HID_STYLIST_DELETE"
+#define HID_EXPLORERMENU_ARRANGEICONS                         "SFX2_HID_EXPLORERMENU_ARRANGEICONS"
+#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID                  "SFX2_HID_EXPLORERMENU_ARRANGEICONS_ONGRID"
+#define HID_EXPLORERMENU_FIXEDICONPOS                         "SFX2_HID_EXPLORERMENU_FIXEDICONPOS"
+#define HID_EXPLORERMENU_OPEN                                 "SFX2_HID_EXPLORERMENU_OPEN"
+#define HID_EXPLORERMENU_PRINT                                "SFX2_HID_EXPLORERMENU_PRINT"
+#define HID_EXPLORERMENU_SEARCH                               "SFX2_HID_EXPLORERMENU_SEARCH"
+#define HID_EXPLORERMENU_COPY                                 "SFX2_HID_EXPLORERMENU_COPY"
+#define HID_EXPLORERMENU_DELETE                               "SFX2_HID_EXPLORERMENU_DELETE"
+#define HID_EXPLORERMENU_CREATELINK                           "SFX2_HID_EXPLORERMENU_CREATELINK"
+#define HID_EXPLORERMENU_EDITPROPERTIES                       "SFX2_HID_EXPLORERMENU_EDITPROPERTIES"
+#define HID_EXPLORERMENU_DOWNLOAD                             "SFX2_HID_EXPLORERMENU_DOWNLOAD"
+#define HID_EXPLORERMENU_STDTEMPLATE                          "SFX2_HID_EXPLORERMENU_STDTEMPLATE"
+#define HID_EXPLORERDLG_FILELIST                              "SFX2_HID_EXPLORERDLG_FILELIST"
+#define HID_PDFOLDERS_WORKPLACE                               "SFX2_HID_PDFOLDERS_WORKPLACE"
+#define HID_PDFOLDERS_EXPLORER                                "SFX2_HID_PDFOLDERS_EXPLORER"
+#define HID_PDFOLDERS_STANDARD                                "SFX2_HID_PDFOLDERS_STANDARD"
+#define HID_PDFOLDERS_ROOT                                    "SFX2_HID_PDFOLDERS_ROOT"
+#define HID_PDFOLDERS_DESKTOP                                 "SFX2_HID_PDFOLDERS_DESKTOP"
+#define HID_CNTMENU_REMOVE_GROUP                              "SFX2_HID_CNTMENU_REMOVE_GROUP"
+#define HID_CNTMENU_CLEAR_CACHE                               "SFX2_HID_CNTMENU_CLEAR_CACHE"
+#define HID_CNT_SYNC_INFO_DLG                                 "SFX2_HID_CNT_SYNC_INFO_DLG"
+#define HID_CNT_REMOVE_REMOVEDLIST                            "SFX2_HID_CNT_REMOVE_REMOVEDLIST"
+#define HID_CNT_ABORT_DIALOG                                  "SFX2_HID_CNT_ABORT_DIALOG"
+#define HID_CNT_PAGE_PRJ_DATAEXCHANGE                         "SFX2_HID_CNT_PAGE_PRJ_DATAEXCHANGE"
+#define HID_CHAOSDOC_OBJECTBAR_FILE                           "SFX2_HID_CHAOSDOC_OBJECTBAR_FILE"
+#define HID_CHAOSDOC_OBJECTBAR_MESSAGE                        "SFX2_HID_CHAOSDOC_OBJECTBAR_MESSAGE"
+#define HID_CHAOSDOC_MN_PART_OPEN                             "SFX2_HID_CHAOSDOC_MN_PART_OPEN"
+#define HID_CHAOSDOC_MN_PART_DELETE                           "SFX2_HID_CHAOSDOC_MN_PART_DELETE"
+#define HID_CHAOSDOC_MN_PART_RENAME                           "SFX2_HID_CHAOSDOC_MN_PART_RENAME"
+#define HID_CHAOSDOC_MN_PART_SAVEAS                           "SFX2_HID_CHAOSDOC_MN_PART_SAVEAS"
+#define HID_EXPLORER_DOCVIEW_ICON                             "SFX2_HID_EXPLORER_DOCVIEW_ICON"
+#define HID_EXPLORER_DOCVIEW_DETAILS                          "SFX2_HID_EXPLORER_DOCVIEW_DETAILS"
+#define HID_CHAOSDOC_WIN                                      "SFX2_HID_CHAOSDOC_WIN"
+#define HID_CHAOSDOC_WIN_HEADER                               "SFX2_HID_CHAOSDOC_WIN_HEADER"
+#define HID_CHAOSDOC_WIN_PARTS                                "SFX2_HID_CHAOSDOC_WIN_PARTS"
+#define HID_CHAOSDOC_WIN_BODY                                 "SFX2_HID_CHAOSDOC_WIN_BODY"
+#define HID_CNT_INSERT_COLUMN                                 "SFX2_HID_CNT_INSERT_COLUMN"
+#define HID_CNT_REMOVE_COLUMN                                 "SFX2_HID_CNT_REMOVE_COLUMN"
+#define HID_CNT_OPT_WIDTH                                     "SFX2_HID_CNT_OPT_WIDTH"
+#define HID_CNT_SORT_ASC                                      "SFX2_HID_CNT_SORT_ASC"
+#define HID_CNT_SORT_DESC                                     "SFX2_HID_CNT_SORT_DESC"
+#define HID_CNT_RULEPG_OPEN_DIR                               "SFX2_HID_CNT_RULEPG_OPEN_DIR"
+#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK                    "SFX2_HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK"
+#define HID_CHAOSDOC_MN_HEADER_COPYLINK                       "SFX2_HID_CHAOSDOC_MN_HEADER_COPYLINK"
+#define HID_CLEAN_CACHE                                       "SFX2_HID_CLEAN_CACHE"
+#define HID_SBOX_LOCATION                                     "SFX2_HID_SBOX_LOCATION"
+#define HID_SBOX_SUBSCRIBTION                                 "SFX2_HID_SBOX_SUBSCRIBTION"
+#define HID_SBOX_CDF_SUBSCRIBTION                             "SFX2_HID_SBOX_CDF_SUBSCRIBTION"
+#define HID_SBOX_SCHEDULE                                     "SFX2_HID_SBOX_SCHEDULE"
+#define HID_SBOX_NOTIFICATION                                 "SFX2_HID_SBOX_NOTIFICATION"
+#define HID_SBOX_SDC_GENERAL                                  "SFX2_HID_SBOX_SDC_GENERAL"
+#define HID_BRWBOX_HEADERBAR                                  "SFX2_HID_BRWBOX_HEADERBAR"
+#define HID_CANNOT_CREATE_BMK_HERE                            "SFX2_HID_CANNOT_CREATE_BMK_HERE"
+#define HID_CREATE_BOOKMARK                                   "SFX2_HID_CREATE_BOOKMARK"
+#define HID_TASKBAR                                           "SFX2_HID_TASKBAR"
+#define HID_TASKBUTTONBAR                                     "SFX2_HID_TASKBUTTONBAR"
+#define HID_TASKTOOLBAR                                       "SFX2_HID_TASKTOOLBAR"
+#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION                      "SFX2_HID_CHAOSDOC_SHOW_FSYS_EXTENSION"
+#define HID_CNT_FILE                                          "SFX2_HID_CNT_FILE"
+#define HID_CHAOSDOC_MN_BODY_OPENLINK                         "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK"
+#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK                   "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK"
+#define HID_CHAOSDOC_MN_BODY_DOWNLOAD                         "SFX2_HID_CHAOSDOC_MN_BODY_DOWNLOAD"
+#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK                      "SFX2_HID_CHAOSDOC_MN_BODY_ADDBOOKMARK"
+#define HID_OPEN_MENU_CNT                                     "SFX2_HID_OPEN_MENU_CNT"
+#define HID_CNT_OPEN_AS_TEMPLATE                              "SFX2_HID_CNT_OPEN_AS_TEMPLATE"
+#define HID_CNT_OPEN_AS_DOC                                   "SFX2_HID_CNT_OPEN_AS_DOC"
+#define HID_PDFOLDERS_TEMPLATE                                "SFX2_HID_PDFOLDERS_TEMPLATE"
+#define HID_EXPLORER_ROOT                                     "SFX2_HID_EXPLORER_ROOT"
+#define HID_RESET_URL                                         "SFX2_HID_RESET_URL"
+#define HID_PHONE_DIALOG                                      "SFX2_HID_PHONE_DIALOG"
+#define HID_QB_RESOLVE_LINK                                   "SFX2_HID_QB_RESOLVE_LINK"
+#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD                      "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_BOLD"
+#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC                    "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC"
+#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER                     "SFX2_HID_CHAOSDOC_MN_HEADER_BIG_HEADER"
+#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER                "SFX2_HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER"
+#define HID_CNT_MARK_THREAD_MARKED                            "SFX2_HID_CNT_MARK_THREAD_MARKED"
+#define HID_CNT_MARK_THREAD_UNMARKED                          "SFX2_HID_CNT_MARK_THREAD_UNMARKED"
+#define HID_CNT_DLG_SEARCH_BT_SHOW                            "SFX2_HID_CNT_DLG_SEARCH_BT_SHOW"
+#define HID_CNT_DLG_SEARCH_BT_UPDATE                          "SFX2_HID_CNT_DLG_SEARCH_BT_UPDATE"
+#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE                     "SFX2_HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE"
+#define HID_CNT_DLG_SEARCH_BT_STOP                            "SFX2_HID_CNT_DLG_SEARCH_BT_STOP"
+#define HID_CNT_PAGE_HEADER                                   "SFX2_HID_CNT_PAGE_HEADER"
+#define HID_CNT_DLG_ADDRESS                                   "SFX2_HID_CNT_DLG_ADDRESS"
+#define HID_EXPLORERMENU_AUTO_ARRANGEICONS                    "SFX2_HID_EXPLORERMENU_AUTO_ARRANGEICONS"
+#define HID_EXPLORERMENU_AUTO_ADJUSTICONS                     "SFX2_HID_EXPLORERMENU_AUTO_ADJUSTICONS"
+#define HID_EXPLORERMENU_FREE_POSITIONING                     "SFX2_HID_EXPLORERMENU_FREE_POSITIONING"
+#define HID_CNT_TARGET_MENU                                   "SFX2_HID_CNT_TARGET_MENU"
+#define HID_CNT_PAGE_DESCRIPTION                              "SFX2_HID_CNT_PAGE_DESCRIPTION"
+#define HID_CNT_LB_HEADER                                     "SFX2_HID_CNT_LB_HEADER"
+#define HID_CNT_LB_DESCRIPTION                                "SFX2_HID_CNT_LB_DESCRIPTION"
+#define HID_GROUPVIEW_BIG_SYMBOLS                             "SFX2_HID_GROUPVIEW_BIG_SYMBOLS"
+#define HID_GROUPVIEW_SMALL_SYMBOLS                           "SFX2_HID_GROUPVIEW_SMALL_SYMBOLS"
+#define HID_GROUPVIEW_ADD_GROUP                               "SFX2_HID_GROUPVIEW_ADD_GROUP"
+#define HID_GROUPVIEW_REMOVE_GROUP                            "SFX2_HID_GROUPVIEW_REMOVE_GROUP"
+#define HID_GROUPVIEW_RENAME_GROUP                            "SFX2_HID_GROUPVIEW_RENAME_GROUP"
+#define HID_GROUPVIEW_ADD_BOOKMARK                            "SFX2_HID_GROUPVIEW_ADD_BOOKMARK"
+#define HID_GROUPVIEW_TREE                                    "SFX2_HID_GROUPVIEW_TREE"
+#define HID_GROUPVIEW_ADD_AS_FOLDER                           "SFX2_HID_GROUPVIEW_ADD_AS_FOLDER"
+#define HID_GROUPVIEW_ADD_AS_BMK                              "SFX2_HID_GROUPVIEW_ADD_AS_BMK"
+#define HID_GROUPVIEW_REMOVE_BMK                              "SFX2_HID_GROUPVIEW_REMOVE_BMK"
+#define HID_GROUPVIEW_CONTENT_BIG                             "SFX2_HID_GROUPVIEW_CONTENT_BIG"
+#define HID_GROUPVIEW_CONTENT_SMALL                           "SFX2_HID_GROUPVIEW_CONTENT_SMALL"
+#define HID_GROUPVIEW_CONTENT_TREE                            "SFX2_HID_GROUPVIEW_CONTENT_TREE"
+#define HID_GROUPVIEW_SHOW_DOCS                               "SFX2_HID_GROUPVIEW_SHOW_DOCS"
+#define HID_EDIT_TEMPLATE                                     "SFX2_HID_EDIT_TEMPLATE"
+#define HID_PDFOLDERS_GRAPHICS                                "SFX2_HID_PDFOLDERS_GRAPHICS"
+#define HID_FILEDLG_AUTOCOMPLETEBOX                           "SFX2_HID_FILEDLG_AUTOCOMPLETEBOX"
+#define HID_FILEDLG_SAVE_BTN                                  "SFX2_HID_FILEDLG_SAVE_BTN"
+#define HID_FILEDLG_SAVE_FILENAME                             "SFX2_HID_FILEDLG_SAVE_FILENAME"
+#define HID_FILEDLG_SAVE_FILETYPE                             "SFX2_HID_FILEDLG_SAVE_FILETYPE"
+#define HID_FILEDLG_INSERT_BTN                                "SFX2_HID_FILEDLG_INSERT_BTN"
+#define HID_FILEDLG_PATH_BTN                                  "SFX2_HID_FILEDLG_PATH_BTN"
+#define HID_FILEDLG_PATH_FILENAME                             "SFX2_HID_FILEDLG_PATH_FILENAME"
+#define HID_FILEDLG_FOLDER_BTN                                "SFX2_HID_FILEDLG_FOLDER_BTN"
+#define HID_FILEDLG_FOLDER_FILENAME                           "SFX2_HID_FILEDLG_FOLDER_FILENAME"
+#define HID_FILEDLG_SRCHFOLDER_BTN                            "SFX2_HID_FILEDLG_SRCHFOLDER_BTN"
+#define HID_PDFOLDERS_GROUPS                                  "SFX2_HID_PDFOLDERS_GROUPS"
+#define HID_OPEN_CHOOSE_FILTER                                "SFX2_HID_OPEN_CHOOSE_FILTER"
+#define HID_PDFOLDERS_BOOKMARKS                               "SFX2_HID_PDFOLDERS_BOOKMARKS"
+#define HID_PDFOLDERS_FAVORITES_ADD                           "SFX2_HID_PDFOLDERS_FAVORITES_ADD"
+#define HID_PDFOLDERS_FAVORITES_REMOVE                        "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE"
+#define HID_PDFOLDERS_HISTORY                                 "SFX2_HID_PDFOLDERS_HISTORY"
+#define HID_FILEDLG_EDIT_FAVORITES                            "SFX2_HID_FILEDLG_EDIT_FAVORITES"
+#define HID_FILEDLG_NEW_FAVORITE                              "SFX2_HID_FILEDLG_NEW_FAVORITE"
+#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX                    "SFX2_HID_FILEDLG_EDIT_FAVORITES_LISTBOX"
+#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR                  "SFX2_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR"
+#define HID_CNT_CB_FORCE_BODY_EXPORT                          "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT"
+#define HID_CNT_PAGE_REPSTATE_CONTROL                         "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL"
+#define HID_TASKSTATUSBAR                                     "SFX2_HID_TASKSTATUSBAR"
+#define HID_CNT_PAGE_HEADER_TABBAR                            "SFX2_HID_CNT_PAGE_HEADER_TABBAR"
+#define HID_CNT_PAGE_SUBSCR_TABBAR                            "SFX2_HID_CNT_PAGE_SUBSCR_TABBAR"
+#define HID_CHAOSDOC_MN_PART_PRINT                            "SFX2_HID_CHAOSDOC_MN_PART_PRINT"
+#define HID_STATUSINDICATOR_TEXT                              "SFX2_HID_STATUSINDICATOR_TEXT"
+#define HID_STATUSINDICATOR_PROGRESS                          "SFX2_HID_STATUSINDICATOR_PROGRESS"
+#define HID_CNT_VALUE_ADDED_NONE                              "SFX2_HID_CNT_VALUE_ADDED_NONE"
+#define HID_CNT_VALUE_ADDED_DOCINFO                           "SFX2_HID_CNT_VALUE_ADDED_DOCINFO"
+#define HID_CNT_VALUE_ADDED_FULL                              "SFX2_HID_CNT_VALUE_ADDED_FULL"
+#define HID_CNT_MESSAGE_STOREMODE_REMOTE                      "SFX2_HID_CNT_MESSAGE_STOREMODE_REMOTE"
+#define HID_CNT_MESSAGE_STOREMODE_LOCAL                       "SFX2_HID_CNT_MESSAGE_STOREMODE_LOCAL"
+#define HID_CNT_VIEW_ALL_ARTICLES                             "SFX2_HID_CNT_VIEW_ALL_ARTICLES"
+#define HID_CNT_VIEW_UNREAD_ARTICLES                          "SFX2_HID_CNT_VIEW_UNREAD_ARTICLES"
+#define HID_CNT_VIEW_READ_ARTICLES                            "SFX2_HID_CNT_VIEW_READ_ARTICLES"
+#define HID_CNT_VIEW_MARKED_ARTICLES                          "SFX2_HID_CNT_VIEW_MARKED_ARTICLES"
+#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES               "SFX2_HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES"
+#define HID_CNT_VIEW_ALL_FOLDERS                              "SFX2_HID_CNT_VIEW_ALL_FOLDERS"
+#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS                       "SFX2_HID_CNT_VIEW_SUBSCRIBED_FOLDERS"
+#define HID_CNT_VIEW_ACTIVE_FOLDERS                           "SFX2_HID_CNT_VIEW_ACTIVE_FOLDERS"
+#define HID_CNT_SENT_VIEW_ALL_ARTICLES                        "SFX2_HID_CNT_SENT_VIEW_ALL_ARTICLES"
+#define HID_CNT_SENT_VIEW_SENT_ARTICLES                       "SFX2_HID_CNT_SENT_VIEW_SENT_ARTICLES"
+#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES                     "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES"
+#define HID_CNT_SENT_VIEW_MARKED_ARTICLES                     "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES"
+#define HID_MAILWIN_SEND_BUTTON                               "SFX2_HID_MAILWIN_SEND_BUTTON"
+#define HID_MAILWIN_CLOSE_BUTTON                              "SFX2_HID_MAILWIN_CLOSE_BUTTON"
+#define HID_MAILWIN_ROLE_BOX                                  "SFX2_HID_MAILWIN_ROLE_BOX"
+#define HID_MAILWIN_ADDRESS_EDIT                              "SFX2_HID_MAILWIN_ADDRESS_EDIT"
+#define HID_MAILWIN_ADDRESS_BOX                               "SFX2_HID_MAILWIN_ADDRESS_BOX"
+#define HID_MAILWIN_SUBJECT_EDIT                              "SFX2_HID_MAILWIN_SUBJECT_EDIT"
+#define HID_MAILWIN_FROM_EDIT                                 "SFX2_HID_MAILWIN_FROM_EDIT"
+#define HID_MAILWIN_PRIO_BOX                                  "SFX2_HID_MAILWIN_PRIO_BOX"
+#define HID_TABDLG_APPLY_BTN                                  "SFX2_HID_TABDLG_APPLY_BTN"
+#define HID_TP_COMMONPRINTOPTIONS                             "SFX2_HID_TP_COMMONPRINTOPTIONS"
+#define HID_FILEDLG_LINK_CB                                   "SFX2_HID_FILEDLG_LINK_CB"
+#define HID_FILEDLG_PREVIEW_CB                                "SFX2_HID_FILEDLG_PREVIEW_CB"
+#define HID_HELP_WINDOW                                       "SFX2_HID_HELP_WINDOW"
+#define HID_HELP_LISTBOX                                      "SFX2_HID_HELP_LISTBOX"
+#define HID_HELP_TABCONTROL                                   "SFX2_HID_HELP_TABCONTROL"
+#define HID_HELP_TOOLBOX                                      "SFX2_HID_HELP_TOOLBOX"
+#define HID_HELP_TOOLBOXITEM_INDEX                            "SFX2_HID_HELP_TOOLBOXITEM_INDEX"
+#define HID_HELP_TOOLBOXITEM_START                            "SFX2_HID_HELP_TOOLBOXITEM_START"
+#define HID_HELP_TOOLBOXITEM_BACKWARD                         "SFX2_HID_HELP_TOOLBOXITEM_BACKWARD"
+#define HID_HELP_TOOLBOXITEM_FORWARD                          "SFX2_HID_HELP_TOOLBOXITEM_FORWARD"
+#define HID_HELP_TOOLBOXITEM_PRINT                            "SFX2_HID_HELP_TOOLBOXITEM_PRINT"
+#define HID_HELP_TOOLBOXITEM_BOOKMARKS                        "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"
+#define HID_HELP_TABPAGE_CONTENTS                             "SFX2_HID_HELP_TABPAGE_CONTENTS"
+#define HID_HELP_TABPAGE_INDEX                                "SFX2_HID_HELP_TABPAGE_INDEX"
+#define HID_HELP_TABPAGE_SEARCH                               "SFX2_HID_HELP_TABPAGE_SEARCH"
+#define HID_HELP_TABPAGE_BOOKMARKS                            "SFX2_HID_HELP_TABPAGE_BOOKMARKS"
+#define HID_TBXCONTROL_FILENEW                                "SFX2_HID_TBXCONTROL_FILENEW"
+#define HID_ORGANIZE_STDTEMPLATE_ADD                          "SFX2_HID_ORGANIZE_STDTEMPLATE_ADD"
+#define HID_ORGANIZE_STDTEMPLATE_DEL                          "SFX2_HID_ORGANIZE_STDTEMPLATE_DEL"
+#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG                     "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"
+#define HID_HELP_BOOKMARKS_OPEN                               "SFX2_HID_HELP_BOOKMARKS_OPEN"
+#define HID_HELP_BOOKMARKS_RENAME                             "SFX2_HID_HELP_BOOKMARKS_RENAME"
+#define HID_HELP_BOOKMARKS_DELETE                             "SFX2_HID_HELP_BOOKMARKS_DELETE"
+#define HID_CLOSE_WARNING                                     "SFX2_HID_CLOSE_WARNING"
+#define HID_DID_SAVE_PACKED_XML                               "SFX2_HID_DID_SAVE_PACKED_XML"
+#define HID_HELP_TREELISTBOX_CONTENTS                         "SFX2_HID_HELP_TREELISTBOX_CONTENTS"
+#define HID_CUSTOMIZETOOLBOX                                  "SFX2_HID_CUSTOMIZETOOLBOX"
+#define HID_CUSTOMIZETOOLBOX_FUNCTIONS                        "SFX2_HID_CUSTOMIZETOOLBOX_FUNCTIONS"
+#define HID_CUSTOMIZETOOLBOX_TOOLBOX                          "SFX2_HID_CUSTOMIZETOOLBOX_TOOLBOX"
+#define HID_HELP_TEXT_SELECTION_MODE                          "SFX2_HID_HELP_TEXT_SELECTION_MODE"
 
-#define HID_FILTER_SELECT                           (HID_SFX_START +   0)
-#define HID_USERDEFBMP                              (HID_SFX_START +   1)
-#define HID_DOCINFO_EDT                             (HID_SFX_START +   2)
-#define HID_PASSWD                                  (HID_SFX_START +   3)
-#define HID_PRINTMONITOR                            (HID_SFX_START +   4)
-#define HID_CONFIG_OBJECTBAR                        (HID_SFX_START +   5)
-#define HID_MANAGE_STYLES                           (HID_SFX_START +   6)
-#define HID_CONFIG_EVENT                            (HID_SFX_START +   7)
-#define HID_DOCINFODESC                             (HID_SFX_START +   8)
-#define HID_DOCINFODOC                              (HID_SFX_START +   9)
-#define HID_DOCINFOUSER                             (HID_SFX_START +  10)
-#define HID_BOOKMARKPROPS                           (HID_SFX_START +  14)
-#define HID_BOOKGROUPPROPS                          (HID_SFX_START +  15)
-#define HID_BOOKFILEPROPS                           (HID_SFX_START +  16)
-#define HID_NEWS_SERVERPROPS                        (HID_SFX_START +  20)
-#define HID_NEWS_RULEPAGE                           (HID_SFX_START +  21)
-#define HID_MAILINTRAYPROPS                         (HID_SFX_START +  23)
-#define HID_DOCINFORELOAD                           (HID_SFX_START +  24)
-#define HID_NEWS_GROUPPAGE                          (HID_SFX_START +  25)
-#define HID_NEWS_SERVERPAGE                         (HID_SFX_START +  26)
-#define HID_FILEDLG_STANDARD                        (HID_SFX_START +  27)
-#define HID_FILEDLG_MANAGER                         (HID_SFX_START +  28)
-#define HID_FILEDLG_URL                             (HID_SFX_START +  29)
-#define HID_FILEDLG_FILE                            (HID_SFX_START +  30)
-#define HID_FILEDLG_USE_PASSWD                      (HID_SFX_START +  31)
-#define HID_FILEDLG_READ_ONLY                       (HID_SFX_START +  32)
-#define HID_EXPLORERCONTROL                         (HID_SFX_START +  33)
-#define HID_BROWSERCONTROL                          (HID_SFX_START +  34)
-#define HID_CTL_ORGANIZER_LEFT                      (HID_SFX_START +  35)
-#define HID_CTL_ORGANIZER_RIGHT                     (HID_SFX_START +  36)
-#define HID_EXPLMAILSRV_GENERAL_PAGE                (HID_SFX_START +  37)
-#define HID_EXPLMAILSRV_PROTOCOL_PAGE               (HID_SFX_START +  38)
-#define HID_EXPLMAILSRV_DATAMATCH_PAGE              (HID_SFX_START +  39)
-#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE            (HID_SFX_START +  40)
-#define HID_EXPLMAIL_GENERAL_PAGE                   (HID_SFX_START +  41)
-#define HID_NEWS_CTL_RULES                          (HID_SFX_START +  42)
-#define HID_NEWS_CTL_GROUPS                         (HID_SFX_START +  43)
-#define HID_CONFIG_OBJECTBAR_CTL                    (HID_SFX_START +  44)
-#define HID_NEWS_QUICKSEARCH                        (HID_SFX_START +  45)
-#define HID_NEWS_SERVERVIEWPROPS                    (HID_SFX_START +  46)
-#define HID_NEWS_SHOWARTICLEPROPS                   (HID_SFX_START +  47)
-#define HID_NEWS_SHOWGROUPPROPS                     (HID_SFX_START +  48)
-#define HID_NEWS_USER                               (HID_SFX_START +  49)
-#define HID_MULTISELECTION_GENERAL_PAGE             (HID_SFX_START +  50)
-#define HID_LINK_GENERAL_PAGE                       (HID_SFX_START +  51)
-#define HID_LINK_ADDRESS_PAGE                       (HID_SFX_START +  52)
-#define HID_FOLDER_GENERAL_PAGE                     (HID_SFX_START +  53)
-#define HID_FILE_GENERAL_PAGE                       (HID_SFX_START +  54)
-#define HID_FTP_GENERAL_PAGE                        (HID_SFX_START +  55)
-#define HID_PRINT_OPTIONS                           (HID_SFX_START +  56)
-#define HID_PREVIEW_FRAME                           (HID_SFX_START +  57)
-#define HID_DOCINFO_FRAME                           (HID_SFX_START +  58)
-#define HID_EXPLORER_FRAME                          (HID_SFX_START +  59)
-#define HID_APP_WIN                                 (HID_SFX_START +  60)
-#define HID_TEMPLATE_FMT                            (HID_SFX_START +  61)
-#define HID_TEMPLATE_FILTER                         (HID_SFX_START +  62)
-#define HID_FTPSERVER_PAGE                          (HID_SFX_START +  63)
-#define HID_DLG_SFX_EXP_SEARCH                      (HID_SFX_START +  65)
-#define HID_TP_SFX_EXP_SEARCH_CRITERIA              (HID_SFX_START +  66)
-#define HID_TP_SFX_EXP_SEARCH_PLACE                 (HID_SFX_START +  67)
-#define HID_SEARCH_DLG_TABLB                        (HID_SFX_START +  68)
-#define HID_TEMPLDLG_NEWBYEXAMPLE                   (HID_SFX_START +  69)
-#define HID_TEMPLDLG_UPDATEBYEXAMPLE                (HID_SFX_START +  70)
-#define HID_TEMPLDLG_WATERCAN                       (HID_SFX_START +  71)
-#define HID_DESKTOP                                 (HID_SFX_START +  78)
-#define HID_EXPLORERTOOLSTOOLBOX                    (HID_SFX_START +  79)
-#define HID_EXPLOREROBJECTTOOLBOX                   (HID_SFX_START +  80)
-#define HID_RECORDINGTOOLBOX                        (HID_SFX_START +  81)
-#define HID_FULLSCREENTOOLBOX                       (HID_SFX_START +  82)
-#define HID_HELPBAR                                 (HID_SFX_START +  83)
-#define HID_ENVTOOLBOX                              (HID_SFX_START +  84)
-#define HID_FRAMESETEDIT_TOOLBOX                    (HID_SFX_START +  85)
-#define HID_NAVIGATOR_WINDOW                        (HID_SFX_START +  86)
-#define HID_TABDLG_RESET_BTN                        (HID_SFX_START +  89)
-#define HID_TABDLG_STANDARD_BTN                     (HID_SFX_START +  90)
-#define HID_HELPAGENT_TIP_BOX                       (HID_SFX_START +  91)
-#define HID_TEMPLDLG_TOOLBOX_LEFT                   (HID_SFX_START +  92)
-#define HID_TEMPLDLG_TOOLBOX_RIGHT                  (HID_SFX_START +  93)
-#define HID_EXPLORER_SRCH_COUNT                     (HID_SFX_START +  94)
-#define HID_BEAMER_SORT_ASCENDING                   (HID_SFX_START +  95)
-#define HID_BEAMER_SORT_DESCENDING                  (HID_SFX_START +  96)
-#define HID_EXPLORER_SRCH_LATEST_COUNT              (HID_SFX_START +  97)
-#define HID_CONFIG_EVENT_OFFICE_BASED               (HID_SFX_START +  98)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED             (HID_SFX_START +  99)
-#define HID_ORGANIZE_NEW                            (HID_SFX_START + 100)
-#define HID_ORGANIZE_DELETE                         (HID_SFX_START + 101)
-#define HID_ORGANIZE_EDIT                           (HID_SFX_START + 102)
-#define HID_ORGANIZE_COPY_FROM                      (HID_SFX_START + 103)
-#define HID_ORGANIZE_COPY_TO                        (HID_SFX_START + 104)
-#define HID_ORGANIZE_PRINT                          (HID_SFX_START + 105)
-#define HID_ORGANIZE_PRINTER_SETUP                  (HID_SFX_START + 106)
-#define HID_ORGANIZE_RESCAN                         (HID_SFX_START + 107)
-#define HID_STYLIST_NEW                             (HID_SFX_START + 108)
-#define HID_STYLIST_EDIT                            (HID_SFX_START + 109)
-#define HID_STYLIST_DELETE                          (HID_SFX_START + 110)
-#define HID_EXPLORERMENU_ARRANGEICONS               (HID_SFX_START + 111)
-#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID        (HID_SFX_START + 112)
-#define HID_EXPLORERMENU_FIXEDICONPOS               (HID_SFX_START + 113)
-#define HID_EXPLORERMENU_OPEN                       (HID_SFX_START + 114)
-#define HID_EXPLORERMENU_PRINT                      (HID_SFX_START + 115)
-#define HID_EXPLORERMENU_SEARCH                     (HID_SFX_START + 116)
-#define HID_EXPLORERMENU_COPY                       (HID_SFX_START + 117)
-#define HID_EXPLORERMENU_DELETE                     (HID_SFX_START + 118)
-#define HID_EXPLORERMENU_CREATELINK                 (HID_SFX_START + 119)
-#define HID_EXPLORERMENU_EDITPROPERTIES             (HID_SFX_START + 120)
-#define HID_EXPLORERMENU_DOWNLOAD                   (HID_SFX_START + 121)
-#define HID_EXPLORERMENU_STDTEMPLATE                (HID_SFX_START + 122)
-#define HID_EXPLORERDLG_FILELIST                    (HID_SFX_START + 124)
-#define HID_PDFOLDERS_WORKPLACE                     (HID_SFX_START + 125)
-#define HID_PDFOLDERS_EXPLORER                      (HID_SFX_START + 126)
-#define HID_PDFOLDERS_STANDARD                      (HID_SFX_START + 127)
-#define HID_PDFOLDERS_ROOT                          (HID_SFX_START + 128)
-#define HID_PDFOLDERS_DESKTOP                       (HID_SFX_START + 129)
-#define HID_CNTMENU_REMOVE_GROUP                    (HID_SFX_START + 130)
-#define HID_CNTMENU_CLEAR_CACHE                     (HID_SFX_START + 131)
-#define HID_CNT_SYNC_INFO_DLG                       (HID_SFX_START + 132)
-#define HID_CNT_REMOVE_REMOVEDLIST                  (HID_SFX_START + 133)
-#define HID_CNT_ABORT_DIALOG                        (HID_SFX_START + 134)
-#define HID_CNT_PAGE_PRJ_DATAEXCHANGE               (HID_SFX_START + 135)
-#define HID_CHAOSDOC_OBJECTBAR_FILE                 (HID_SFX_START + 136)
-#define HID_CHAOSDOC_OBJECTBAR_MESSAGE              (HID_SFX_START + 137)
-#define HID_CHAOSDOC_MN_PART_OPEN                   (HID_SFX_START + 138)
-#define HID_CHAOSDOC_MN_PART_DELETE                 (HID_SFX_START + 139)
-#define HID_CHAOSDOC_MN_PART_RENAME                 (HID_SFX_START + 140)
-#define HID_CHAOSDOC_MN_PART_SAVEAS                 (HID_SFX_START + 141)
-#define HID_EXPLORER_DOCVIEW_ICON                   (HID_SFX_START + 142)
-#define HID_EXPLORER_DOCVIEW_DETAILS                (HID_SFX_START + 143)
-#define HID_CHAOSDOC_WIN                            (HID_SFX_START + 144)
-#define HID_CHAOSDOC_WIN_HEADER                     (HID_SFX_START + 145)
-#define HID_CHAOSDOC_WIN_PARTS                      (HID_SFX_START + 146)
-#define HID_CHAOSDOC_WIN_BODY                       (HID_SFX_START + 147)
-#define HID_CNT_INSERT_COLUMN                       (HID_SFX_START + 148)
-#define HID_CNT_REMOVE_COLUMN                       (HID_SFX_START + 149)
-#define HID_CNT_OPT_WIDTH                           (HID_SFX_START + 150)
-#define HID_CNT_SORT_ASC                            (HID_SFX_START + 151)
-#define HID_CNT_SORT_DESC                           (HID_SFX_START + 152)
-#define HID_CNT_RULEPG_OPEN_DIR                     (HID_SFX_START + 153)
-#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK          (HID_SFX_START + 154)
-#define HID_CHAOSDOC_MN_HEADER_COPYLINK             (HID_SFX_START + 155)
-#define HID_CLEAN_CACHE                             (HID_SFX_START + 156)
-#define HID_SBOX_LOCATION                           (HID_SFX_START + 157)
-#define HID_SBOX_SUBSCRIBTION                       (HID_SFX_START + 158)
-#define HID_SBOX_CDF_SUBSCRIBTION                   (HID_SFX_START + 159)
-#define HID_SBOX_SCHEDULE                           (HID_SFX_START + 160)
-#define HID_SBOX_NOTIFICATION                       (HID_SFX_START + 161)
-#define HID_SBOX_SDC_GENERAL                        (HID_SFX_START + 162)
-#define HID_BRWBOX_HEADERBAR                        (HID_SFX_START + 163)
-#define HID_CANNOT_CREATE_BMK_HERE                  (HID_SFX_START + 164)
-#define HID_CREATE_BOOKMARK                         (HID_SFX_START + 165)
-#define HID_TASKBAR                                 (HID_SFX_START + 166)
-#define HID_TASKBUTTONBAR                           (HID_SFX_START + 167)
-#define HID_TASKTOOLBAR                             (HID_SFX_START + 168)
-#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION            (HID_SFX_START + 169)
-#define HID_CNT_FILE                                (HID_SFX_START + 170)
-#define HID_CHAOSDOC_MN_BODY_OPENLINK               (HID_SFX_START + 171)
-#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK         (HID_SFX_START + 172)
-#define HID_CHAOSDOC_MN_BODY_DOWNLOAD               (HID_SFX_START + 173)
-#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK            (HID_SFX_START + 174)
-#define HID_OPEN_MENU_CNT                           (HID_SFX_START + 175)
-#define HID_CNT_OPEN_AS_TEMPLATE                    (HID_SFX_START + 176)
-#define HID_CNT_OPEN_AS_DOC                         (HID_SFX_START + 177)
-#define HID_PDFOLDERS_TEMPLATE                      (HID_SFX_START + 178)
-#define HID_EXPLORER_ROOT                           (HID_SFX_START + 179)
-#define HID_RESET_URL                               (HID_SFX_START + 180)
-#define HID_PHONE_DIALOG                            (HID_SFX_START + 181)
-#define HID_QB_RESOLVE_LINK                         (HID_SFX_START + 182)
-#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD            (HID_SFX_START + 183)
-#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC          (HID_SFX_START + 184)
-#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER           (HID_SFX_START + 185)
-#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER      (HID_SFX_START + 186)
-#define HID_CNT_MARK_THREAD_MARKED                  (HID_SFX_START + 187)
-#define HID_CNT_MARK_THREAD_UNMARKED                (HID_SFX_START + 188)
-#define HID_CNT_DLG_SEARCH_BT_SHOW                  (HID_SFX_START + 189)
-#define HID_CNT_DLG_SEARCH_BT_UPDATE                (HID_SFX_START + 190)
-#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE           (HID_SFX_START + 191)
-#define HID_CNT_DLG_SEARCH_BT_STOP                  (HID_SFX_START + 192)
-#define HID_CNT_PAGE_HEADER                         (HID_SFX_START + 193)
-#define HID_CNT_DLG_ADDRESS                         (HID_SFX_START + 194)
-#define HID_EXPLORERMENU_AUTO_ARRANGEICONS          (HID_SFX_START + 195)
-#define HID_EXPLORERMENU_AUTO_ADJUSTICONS           (HID_SFX_START + 196)
-#define HID_EXPLORERMENU_FREE_POSITIONING           (HID_SFX_START + 197)
-#define HID_CNT_TARGET_MENU                         (HID_SFX_START + 198)
-#define HID_CNT_PAGE_DESCRIPTION                    (HID_SFX_START + 199)
-#define HID_CNT_LB_HEADER                           (HID_SFX_START + 200)
-#define HID_CNT_LB_DESCRIPTION                      (HID_SFX_START + 201)
-#define HID_GROUPVIEW_BIG_SYMBOLS                   (HID_SFX_START + 202)
-#define HID_GROUPVIEW_SMALL_SYMBOLS                 (HID_SFX_START + 203)
-#define HID_GROUPVIEW_ADD_GROUP                     (HID_SFX_START + 204)
-#define HID_GROUPVIEW_REMOVE_GROUP                  (HID_SFX_START + 205)
-#define HID_GROUPVIEW_RENAME_GROUP                  (HID_SFX_START + 206)
-#define HID_GROUPVIEW_ADD_BOOKMARK                  (HID_SFX_START + 207)
-#define HID_GROUPVIEW_TREE                          (HID_SFX_START + 208)
-#define HID_GROUPVIEW_ADD_AS_FOLDER                 (HID_SFX_START + 209)
-#define HID_GROUPVIEW_ADD_AS_BMK                    (HID_SFX_START + 210)
-#define HID_GROUPVIEW_REMOVE_BMK                    (HID_SFX_START + 211)
-#define HID_GROUPVIEW_CONTENT_BIG                   (HID_SFX_START + 212)
-#define HID_GROUPVIEW_CONTENT_SMALL                 (HID_SFX_START + 213)
-#define HID_GROUPVIEW_CONTENT_TREE                  (HID_SFX_START + 214)
-#define HID_GROUPVIEW_SHOW_DOCS                     (HID_SFX_START + 215)
-#define HID_EDIT_TEMPLATE                           (HID_SFX_START + 216)
-#define HID_PDFOLDERS_GRAPHICS                      (HID_SFX_START + 217)
-#define HID_FILEDLG_AUTOCOMPLETEBOX                 (HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN                        (HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME                   (HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE                   (HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN                      (HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN                        (HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME                   (HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN                      (HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME                 (HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN                  (HID_SFX_START + 227)
-#define HID_PDFOLDERS_GROUPS                        (HID_SFX_START + 228)
-#define HID_OPEN_CHOOSE_FILTER                      (HID_SFX_START + 229)
-#define HID_PDFOLDERS_BOOKMARKS                     (HID_SFX_START + 230)
-#define HID_PDFOLDERS_FAVORITES_ADD                 (HID_SFX_START + 231)
-#define HID_PDFOLDERS_FAVORITES_REMOVE              (HID_SFX_START + 232)
-#define HID_PDFOLDERS_HISTORY                       (HID_SFX_START + 233)
-#define HID_FILEDLG_EDIT_FAVORITES                  (HID_SFX_START + 234)
-#define HID_FILEDLG_NEW_FAVORITE                    (HID_SFX_START + 235)
-#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX          (HID_SFX_START + 236)
-#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR        (HID_SFX_START + 237)
-#define HID_CNT_CB_FORCE_BODY_EXPORT                (HID_SFX_START + 240)
-#define HID_CNT_PAGE_REPSTATE_CONTROL               (HID_SFX_START + 241)
-#define HID_TASKSTATUSBAR                           (HID_SFX_START + 242)
-#define HID_CNT_PAGE_HEADER_TABBAR                  (HID_SFX_START + 244)
-#define HID_CNT_PAGE_SUBSCR_TABBAR                  (HID_SFX_START + 245)
-#define HID_CHAOSDOC_MN_PART_PRINT                  (HID_SFX_START + 246)
-#define HID_STATUSINDICATOR_TEXT                    (HID_SFX_START + 247)
-#define HID_STATUSINDICATOR_PROGRESS                (HID_SFX_START + 248)
-#define HID_CNT_VALUE_ADDED_NONE                    (HID_SFX_START + 249)
-#define HID_CNT_VALUE_ADDED_DOCINFO                 (HID_SFX_START + 250)
-#define HID_CNT_VALUE_ADDED_FULL                    (HID_SFX_START + 251)
-#define HID_CNT_MESSAGE_STOREMODE_REMOTE            (HID_SFX_START + 252)
-#define HID_CNT_MESSAGE_STOREMODE_LOCAL             (HID_SFX_START + 253)
-#define HID_CNT_VIEW_ALL_ARTICLES                   (HID_SFX_START + 254)
-#define HID_CNT_VIEW_UNREAD_ARTICLES                (HID_SFX_START + 255)
-#define HID_CNT_VIEW_READ_ARTICLES                  (HID_SFX_START + 256)
-#define HID_CNT_VIEW_MARKED_ARTICLES                (HID_SFX_START + 257)
-#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES     (HID_SFX_START + 258)
-#define HID_CNT_VIEW_ALL_FOLDERS                    (HID_SFX_START + 259)
-#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS             (HID_SFX_START + 260)
-#define HID_CNT_VIEW_ACTIVE_FOLDERS                 (HID_SFX_START + 261)
-#define HID_CNT_SENT_VIEW_ALL_ARTICLES              (HID_SFX_START + 262)
-#define HID_CNT_SENT_VIEW_SENT_ARTICLES             (HID_SFX_START + 263)
-#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES           (HID_SFX_START + 264)
-#define HID_CNT_SENT_VIEW_MARKED_ARTICLES           (HID_SFX_START + 265)
-#define HID_MAILWIN_SEND_BUTTON                     (HID_SFX_START + 266)
-#define HID_MAILWIN_CLOSE_BUTTON                    (HID_SFX_START + 267)
-#define HID_MAILWIN_ROLE_BOX                        (HID_SFX_START + 268)
-#define HID_MAILWIN_ADDRESS_EDIT                    (HID_SFX_START + 269)
-#define HID_MAILWIN_ADDRESS_BOX                     (HID_SFX_START + 270)
-#define HID_MAILWIN_SUBJECT_EDIT                    (HID_SFX_START + 271)
-#define HID_MAILWIN_FROM_EDIT                       (HID_SFX_START + 272)
-#define HID_MAILWIN_PRIO_BOX                        (HID_SFX_START + 273)
-#define HID_TABDLG_APPLY_BTN                        (HID_SFX_START + 274)
-#define HID_TP_COMMONPRINTOPTIONS                   (HID_SFX_START + 275)
-#define HID_FILEDLG_LINK_CB                         (HID_SFX_START + 276)
-#define HID_FILEDLG_PREVIEW_CB                      (HID_SFX_START + 277)
-#define HID_HELP_WINDOW                             (HID_SFX_START + 278)
-#define HID_HELP_LISTBOX                            (HID_SFX_START + 279)
-#define HID_HELP_TABCONTROL                         (HID_SFX_START + 280)
-#define HID_HELP_TOOLBOX                            (HID_SFX_START + 281)
-#define HID_HELP_TOOLBOXITEM_INDEX                  (HID_SFX_START + 282)
-#define HID_HELP_TOOLBOXITEM_START                  (HID_SFX_START + 283)
-#define HID_HELP_TOOLBOXITEM_BACKWARD               (HID_SFX_START + 284)
-#define HID_HELP_TOOLBOXITEM_FORWARD                (HID_SFX_START + 285)
-#define HID_HELP_TOOLBOXITEM_PRINT                  (HID_SFX_START + 286)
-#define HID_HELP_TOOLBOXITEM_BOOKMARKS              (HID_SFX_START + 287)
-#define HID_HELP_TABPAGE_CONTENTS                   (HID_SFX_START + 288)
-#define HID_HELP_TABPAGE_INDEX                      (HID_SFX_START + 289)
-#define HID_HELP_TABPAGE_SEARCH                     (HID_SFX_START + 290)
-#define HID_HELP_TABPAGE_BOOKMARKS                  (HID_SFX_START + 291)
-#define HID_TBXCONTROL_FILENEW                      (HID_SFX_START + 292)
-#define HID_ORGANIZE_STDTEMPLATE_ADD                (HID_SFX_START + 293)
-#define HID_ORGANIZE_STDTEMPLATE_DEL                (HID_SFX_START + 294)
-#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG           (HID_SFX_START + 295)
-#define HID_HELP_BOOKMARKS_OPEN                     (HID_SFX_START + 296)
-#define HID_HELP_BOOKMARKS_RENAME                   (HID_SFX_START + 297)
-#define HID_HELP_BOOKMARKS_DELETE                   (HID_SFX_START + 298)
-#define HID_CLOSE_WARNING                           (HID_SFX_START + 299)
-#define HID_DID_SAVE_PACKED_XML                     (HID_SFX_START + 300)
-#define HID_HELP_TREELISTBOX_CONTENTS               (HID_SFX_START + 301)
-#define HID_CUSTOMIZETOOLBOX                        (HID_SFX_START + 302)
-#define HID_CUSTOMIZETOOLBOX_FUNCTIONS              (HID_SFX_START + 303)
-#define HID_CUSTOMIZETOOLBOX_TOOLBOX                (HID_SFX_START + 304)
-#define HID_HELP_TEXT_SELECTION_MODE                (HID_SFX_START + 305)
+#define HID_WARNING_SECURITY_HYPERLINK                        "SFX2_HID_WARNING_SECURITY_HYPERLINK"
+#define HID_FILEDLG_EXPORTASPDF                               "SFX2_HID_FILEDLG_EXPORTASPDF"
+#define HID_USERDEFBMP_TOOLBOX                                "SFX2_HID_USERDEFBMP_TOOLBOX"
 
-#define HID_WARNING_SECURITY_HYPERLINK              (HID_SFX_START + 306)
-#define HID_FILEDLG_EXPORTASPDF                     (HID_SFX_START + 307)
-#define HID_USERDEFBMP_TOOLBOX                      (HID_SFX_START + 308)
+#define HID_CONFIG_LOAD                                       "SFX2_HID_CONFIG_LOAD"
+#define HID_CONFIG_SAVE                                       "SFX2_HID_CONFIG_SAVE"
 
-#define HID_CONFIG_LOAD                             (HID_SFX_START + 309)
-#define HID_CONFIG_SAVE                             (HID_SFX_START + 310)
+#define HID_SEARCHDIALOG                                      "SFX2_HID_SEARCHDIALOG"
 
-#define HID_SEARCHDIALOG                            (HID_SFX_START + 311)
+#define HID_XMLSEC_WARNING_BROKENSIGNATURE                    "SFX2_HID_XMLSEC_WARNING_BROKENSIGNATURE"
+#define HID_XMLSEC_QUERY_LOSINGSIGNATURE                      "SFX2_HID_XMLSEC_QUERY_LOSINGSIGNATURE"
+#define HID_XMLSEC_QUERY_SAVEBEFORESIGN                       "SFX2_HID_XMLSEC_QUERY_SAVEBEFORESIGN"
+#define HID_XMLSECDLG_MACROWARN                               "SFX2_HID_XMLSECDLG_MACROWARN"
+#define HID_XMLSEC_INFO_WRONGDOCFORMAT                        "SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT"
+#define HID_WARNING_MACROSDISABLED                            "SFX2_HID_WARNING_MACROSDISABLED"
+#define HID_WARNING_ALIENFORMAT                               "SFX2_HID_WARNING_ALIENFORMAT"
+#define HID_HELP_ONSTARTUP_BOX                                "SFX2_HID_HELP_ONSTARTUP_BOX"
+#define HID_DLG_CHECKFORONLINEUPDATE                          "SFX2_HID_DLG_CHECKFORONLINEUPDATE"
+#define HID_TP_CUSTOMPROPERTIES                               "SFX2_HID_TP_CUSTOMPROPERTIES"
+#define HID_CTRL_CUSTOMPROPERTIES                             "SFX2_HID_CTRL_CUSTOMPROPERTIES"
+#define HID_CTRL_CUSTOMPROPS_YES_NO                           "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO"
+#define HID_DLG_CUSTOMPROPS_DURATION                          "SFX2_HID_DLG_CUSTOMPROPS_DURATION"
 
-#define HID_XMLSEC_WARNING_BROKENSIGNATURE          (HID_SFX_START + 314)
-#define HID_XMLSEC_QUERY_LOSINGSIGNATURE            (HID_SFX_START + 315)
-#define HID_XMLSEC_QUERY_SAVEBEFORESIGN             (HID_SFX_START + 316)
-#define HID_XMLSECDLG_MACROWARN                     (HID_SFX_START + 317)
-#define HID_XMLSEC_INFO_WRONGDOCFORMAT              (HID_SFX_START + 318)
-#define HID_WARNING_MACROSDISABLED                  (HID_SFX_START + 319)
-#define HID_WARNING_ALIENFORMAT                     (HID_SFX_START + 320)
-#define HID_HELP_ONSTARTUP_BOX                      (HID_SFX_START + 321)
-#define HID_DLG_CHECKFORONLINEUPDATE                (HID_SFX_START + 322)
-#define HID_TP_CUSTOMPROPERTIES                     (HID_SFX_START + 324)
-#define HID_CTRL_CUSTOMPROPERTIES                   (HID_SFX_START + 325)
-#define HID_CTRL_CUSTOMPROPS_YES_NO                 (HID_SFX_START + 326)
-#define HID_DLG_CUSTOMPROPS_DURATION                (HID_SFX_START + 327)
+#define HID_HELP_ONHELP                                       "SFX2_HID_HELP_ONHELP"
 
-#define ACT_SFX_HID_END HID_DLG_CUSTOMPROPS_DURATION
-
-// "Uberlaufpr"ufung --------------------------------------------------------
-
-#if ACT_SFX_HID_END > HID_SFX_END
-#error Resource-Ueberlauf in #line, #file
-#endif
-
-#define HID_HELP_ONHELP                             68245
+#define HID_QUERY_LOAD_TEMPLATE                               "SFX2_HID_QUERY_LOAD_TEMPLATE"
 
 #endif // #ifndef _SFX_HELPID_HRC
 
diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src
index 97c9c7f640fa..0f9501e8502a 100644
--- a/sfx2/source/menu/menu.src
+++ b/sfx2/source/menu/menu.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "menu.hrc"
+#include <sfx2/sfxcommands.h>
 
 String STR_MENU_CFGITEM
 {
@@ -44,19 +45,19 @@ Menu MN_CLIPBOARDFUNCS
         MenuItem
         {
             Identifier = SID_CUT ;
-            HelpID = SID_CUT ;
+            HelpID = CMD_SID_CUT ;
             Text [ en-US ] = "Cu~t" ;
         };
         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" ;
         };
     };
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 9137abd04764..c76f47345979 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -160,8 +160,6 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
 
             // einf"ugen
             pMenu->InsertItem( nId, aVerbs[n].VerbName );
-            // FIXME: HELPID
-            pMenu->SetHelpId( nId, ""/*(ULONG) nId*/ );
         }
     }
 }
@@ -376,11 +374,10 @@ void SfxPopupMenuManager::InsertSeparator( USHORT nPos )
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos )
+void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, USHORT nPos )
 {
     pSVMenu->InsertItem( nId, rName, nBits,nPos );
-    // FIXME: HELPID
-    pSVMenu->SetHelpId( nId, ""/*(ULONG) nId*/ );
+    pSVMenu->SetHelpId( nId, rHelpId );
 }
 
 //-------------------------------------------------------------------------
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index e3d694eae747..48ff6a3948c5 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -345,7 +345,9 @@ void SfxVirtualMenu::CreateFromSVMenu()
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     // Merge Addon popup menus into the SV Menu
-    Reference< com::sun::star::frame::XFrame > xFrame( pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface() );
+    SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+    SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+    Reference< com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
     if ( pSVMenu->IsMenuBar() )
     {
@@ -448,24 +450,14 @@ void SfxVirtualMenu::CreateFromSVMenu()
             }
             else
             {
-/*
-                if ( nSlotId >= SID_SFX_START && !SfxMenuManager::IsPopupFunction(nSlotId) )
+                const SfxSlot* pSlot = pSlotPool->GetSlot( nSlotId );
+                if ( pSlot )
                 {
-                    // Echte Popups sollen keine SlotIds haben; leider sind
-                    // da noch Altlasten mit herumzuschleppen ...
-                    String aTitle = pSVMenu->GetItemText( nSlotId );
-                    pSVMenu->SetPopupMenu( nSlotId, NULL );
-                    USHORT nPos = pSVMenu->GetItemPos( nSlotId );
-                    pSVMenu->RemoveItem( nPos );
-                    nSlotId = 1;
-                    while ( pSVMenu->GetItemPos(nSlotId) != MENU_ITEM_NOTFOUND )
-                        nSlotId++;
-                    pSVMenu->InsertItem( nSlotId, aTitle, 0, nPos );
-                    pSVMenu->SetPopupMenu( nSlotId, pPopup );
+                    rtl::OString aCmd(".uno:");
+                    aCmd += pSlot->GetUnoName();
+                    pSVMenu->SetHelpId( nSlotId, pSlot->GetUnoName() );
                 }
-*/
-                // FIXME: HELPID
-                pSVMenu->SetHelpId( nSlotId, ""/*0L*/ );
+
                 pMnuCtrl = pItems+nPos;
 
                 // normalerweise jetzt erst im Activate-Handler
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index defccd4e23be..9b5fbd2d5d4e 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -132,7 +132,12 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     {
         USHORT nSlotId = pSlot->GetSlotId();
         if ( nSlotId > 0 )
+        {
+            rtl::OString aCmd(".uno:");
+            aCmd += pSlot->GetUnoName();
             return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule );
+            pStatusBar->SetHelpId( nSlotId, aCmd );
+        }
     }
 
     return NULL;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index fc26d0077161..f5b38d5a8a18 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1520,8 +1520,7 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId
     , bBigImages( FALSE )
     , pMenu( 0 )
 {
-    // FIXME: HELPID
-    rBox.SetHelpId( nId, ""/*HID_TBXCONTROL_FILENEW*/ );
+    rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW );
     rBox.SetItemBits( nId,  rBox.GetItemBits( nId ) | TIB_DROPDOWN);
 
     // Determine the current background color of the menus
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index fea860f6a3ff..ef2574c0d574 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -127,16 +127,15 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
 
         // TODO/LATER: do we still need this code?
         Window* pWindow = rNEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            // FIXME: HELPID
-            // nHelpId = pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( pFrame, nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( pFrame, sHelpId );
 
         // if focus was on an external window, the clipboard content might have been changed
         pView->GetBindings().Invalidate( SID_PASTE );