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

43 files changed, 153 insertions, 260 deletions

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 073de6f00a5a..ecc39c7aa169 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -460,8 +460,7 @@ void SAL_CALL OApplicationController::disposing()
 sal_Bool OApplicationController::Construct(Window* _pParent)
 {
     setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) );
-    // FIXME: HELPID
-    getView()->SetUniqueId(""/*UID_APP_VIEW*/);
+    getView()->SetUniqueId(UID_APP_VIEW);
 
     // late construction
     sal_Bool bSuccess = sal_False;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 525bf12ffed3..2a5eb22549b8 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -307,29 +307,23 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r
 
     m_aTBPreview.SetOutStyle(TOOLBOX_STYLE_FLAT);
     m_aTBPreview.InsertItem(SID_DB_APP_DISABLE_PREVIEW,m_aMenu->GetItemText(SID_DB_APP_DISABLE_PREVIEW),TIB_LEFT|TIB_DROPDOWN|TIB_AUTOSIZE|TIB_RADIOCHECK);
-    // FIXME: HELPID
-    m_aTBPreview.SetHelpId(""/*HID_APP_VIEW_PREVIEW_CB*/);
+    m_aTBPreview.SetHelpId(HID_APP_VIEW_PREVIEW_CB);
     m_aTBPreview.SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) );
     m_aTBPreview.EnableMenuStrings();
     m_aTBPreview.Enable(TRUE);
 
-    // FIXME: HELPID
-    m_aBorder.SetUniqueId(""/*UID_APP_VIEW_PREVIEW_1*/);
+    m_aBorder.SetUniqueId(UID_APP_VIEW_PREVIEW_1);
 
-    // FIXME: HELPID
-    m_aPreview.SetHelpId(""/*HID_APP_VIEW_PREVIEW_1*/);
+    m_aPreview.SetHelpId(HID_APP_VIEW_PREVIEW_1);
 
     m_pTablePreview = new OTablePreviewWindow(&m_aBorder,WB_READONLY | WB_DIALOGCONTROL );
-    // FIXME: HELPID
-    m_pTablePreview->SetHelpId(""/*HID_APP_VIEW_PREVIEW_2*/);
+    m_pTablePreview->SetHelpId(HID_APP_VIEW_PREVIEW_2);
 
-    // FIXME: HELPID
-    m_aDocumentInfo.SetHelpId(""/*HID_APP_VIEW_PREVIEW_3*/);
+    m_aDocumentInfo.SetHelpId(HID_APP_VIEW_PREVIEW_3);
 
     m_xWindow = VCLUnoHelper::GetInterface( m_pTablePreview );
 
-    // FIXME: HELPID
-    SetUniqueId(""/*UID_APP_DETAILPAGE_HELPER*/);
+    SetUniqueId(UID_APP_DETAILPAGE_HELPER);
     for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i)
         m_pLists[i] = NULL;
     ImplInitSettings();
@@ -709,8 +703,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
                                                             ,getBorderWin().getView()->getORB()
                                                             ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP
                                                             ,sal_False);
-        // FIXME: HELPID
-        pTreeView->SetHelpId(""/*HID_APP_TABLE_TREE*/);
+        pTreeView->SetHelpId(HID_APP_TABLE_TREE);
         m_pLists[E_TABLE] = pTreeView;
 
         ImageProvider aImageProvider( _xConnection );
@@ -760,23 +753,24 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 {
     OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
-    USHORT nHelpId = 0, nImageId = 0, nImageIdH = 0;
+    USHORT nImageId = 0, nImageIdH = 0;
+    rtl::OString sHelpId;
     ImageProvider aImageProvider;
     Image aFolderImage, aFolderImageHC;
     switch( _eType )
     {
         case E_FORM:
-            nHelpId = HID_APP_FORM_TREE;
+            sHelpId = HID_APP_FORM_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false );
             aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true );
             break;
         case E_REPORT:
-            nHelpId = HID_APP_REPORT_TREE;
+            sHelpId = HID_APP_REPORT_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false );
             aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true );
             break;
         case E_QUERY:
-            nHelpId = HID_APP_QUERY_TREE;
+            sHelpId = HID_APP_QUERY_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false );
             aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true );
             break;
@@ -787,7 +781,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 
     if ( !m_pLists[_eType] )
     {
-        m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage, aFolderImageHC );
+        m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage, aFolderImageHC );
     }
 
     if ( m_pLists[_eType] )
@@ -885,15 +879,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
     }
 }
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC )
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC )
 {
     DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
-    // FIXME: HELPID
-    #if 0
-    pTreeView->SetHelpId(_nHelpId);
-    #else
-    (void)_nHelpId;
-    #endif
+    pTreeView->SetHelpId( _sHelpId );
     return createTree( pTreeView, _rImage, _rImageHC );
 }
 
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 5ade6b687949..9f3cadc56a44 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -190,7 +190,7 @@ namespace dbaui
             @return
                 The new tree.
         */
-        DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC );
+        DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC );
 
         DECL_LINK( OnEntryDoubleClick,          SvTreeListBox* );
         DECL_LINK( OnEntrySelChange,            void* );
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index b7ce02485bc6..9908134b8e1c 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -406,15 +406,11 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
     ,m_pDetailView(_pDetailView)
 {
     DBG_CTOR(OTasksWindow,NULL);
-    // FIXME: HELPID
-    SetUniqueId(""/*UID_APP_TASKS_WINDOW*/);
-    // FIXME: HELPID
-    m_aCreation.SetHelpId(""/*HID_APP_CREATION_LIST*/);
+    SetUniqueId(UID_APP_TASKS_WINDOW);
+    m_aCreation.SetHelpId(HID_APP_CREATION_LIST);
     m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl));
-    // FIXME: HELPID
-    m_aHelpText.SetHelpId(""/*HID_APP_HELP_TEXT*/);
-    // FIXME: HELPID
-    m_aDescription.SetHelpId(""/*HID_APP_DESCRIPTION_TEXT*/);
+    m_aHelpText.SetHelpId(HID_APP_HELP_TEXT);
+    m_aDescription.SetHelpId(HID_APP_DESCRIPTION_TEXT);
     m_aDescription.SetText(ModuleRes(STR_DESCRIPTION));
     ImplInitSettings(sal_True,sal_True,sal_True);
 }
@@ -604,8 +600,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
     ,m_rBorderWin(_rParent)
 {
     DBG_CTOR(OApplicationDetailView,NULL);
-    // FIXME: HELPID
-    SetUniqueId(""/*UID_APP_DETAIL_VIEW*/);
+    SetUniqueId(UID_APP_DETAIL_VIEW);
     ImplInitSettings( sal_True, sal_True, sal_True );
 
     m_pControlHelper = new OAppDetailPageHelper(&m_aContainer,m_rBorderWin,_ePreviewMode);
@@ -616,12 +611,10 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
     pTasks->Show();
     pTasks->Disable(m_rBorderWin.getView()->getCommandController().isDataSourceReadOnly());
     m_aTasks.setChildWindow(pTasks);
-    // FIXME: HELPID
-    m_aTasks.SetUniqueId(""/*UID_APP_TASKS_VIEW*/);
+    m_aTasks.SetUniqueId(UID_APP_TASKS_VIEW);
     m_aTasks.Show();
 
-    // FIXME: HELPID
-    m_aContainer.SetUniqueId(""/*UID_APP_CONTAINER_VIEW*/);
+    m_aContainer.SetUniqueId(UID_APP_CONTAINER_VIEW);
     m_aContainer.Show();
 
     const long  nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width();
@@ -630,8 +623,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
     set(&m_aContainer,&m_aTasks);
 
     m_aHorzSplitter.Show();
-    // FIXME: HELPID
-    m_aHorzSplitter.SetUniqueId(""/*UID_APP_VIEW_HORZ_SPLIT*/);
+    m_aHorzSplitter.SetUniqueId(UID_APP_VIEW_HORZ_SPLIT);
     setSplitter(&m_aHorzSplitter);
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 6ecb2d0e4701..ae9ca3f5d93e 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -81,8 +81,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
 
     m_aIconControl.SetClickHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl));
     m_aIconControl.setControlActionListener( &m_rBorderWin.getView()->getAppController() );
-    // FIXME: HELPID
-    m_aIconControl.SetHelpId(""/*HID_APP_SWAP_ICONCONTROL*/);
+    m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL);
     m_aIconControl.Show();
     //m_aIconControl.Enable(TRUE);
 }
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index d6a53cc112f4..e049f60d0f13 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -138,12 +138,10 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
     m_pPanel->SetBorderStyle(WINDOW_BORDER_MONO);
     OApplicationSwapWindow* pSwap = new OApplicationSwapWindow( m_pPanel, *this );
     pSwap->Show();
-    // FIXME: HELPID
-    pSwap->SetUniqueId(""/*UID_APP_SWAP_VIEW*/);
+    pSwap->SetUniqueId(UID_APP_SWAP_VIEW);
 
     m_pPanel->setChildWindow(pSwap);
-    // FIXME: HELPID
-    m_pPanel->SetUniqueId(""/*UID_APP_DATABASE_VIEW*/);
+    m_pPanel->SetUniqueId(UID_APP_DATABASE_VIEW);
     m_pPanel->Show();
 
     m_pDetailView = new OApplicationDetailView(*this,_ePreviewMode);
@@ -286,8 +284,7 @@ OApplicationView::OApplicationView( Window* pParent
     }
 
     m_pWin = new OAppBorderWindow(this,_ePreviewMode);
-    // FIXME: HELPID
-    m_pWin->SetUniqueId(""/*UID_APP_VIEW_BORDER_WIN*/);
+    m_pWin->SetUniqueId(UID_APP_VIEW_BORDER_WIN);
     m_pWin->Show();
 
     ImplInitSettings();
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 2dec9005f847..4af2bdb70521 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -111,14 +111,12 @@ Menu RID_MENU_APP_NEW
         MenuItem
         {
             Identifier = SID_APP_NEW_FORM;
-            HelpId = SID_APP_NEW_FORM;
             Command = ".uno:DBNewForm";
             Text [ en-US ] = "Form..." ;
         };
         MenuItem
         {
             Identifier = SID_APP_NEW_REPORT;
-            HelpId = SID_APP_NEW_REPORT;
             Command = ".uno:DBNewReport";
             Text [ en-US ] = "Report..." ;
         };
@@ -154,7 +152,6 @@ Menu RID_MENU_APP_NEW
         MenuItem
         {
             Identifier = SID_DB_NEW_VIEW_SQL;
-            HelpId = SID_DB_NEW_VIEW_SQL;
             Command = ".uno:DBNewViewSQL";
             Text [ en-US ] = "View (Simple)..." ;
         };
@@ -177,7 +174,6 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_DB_APP_PASTE_SPECIAL;
-            HelpID = SID_DB_APP_PASTE_SPECIAL ;
             Text[ en-US ] = "Paste Special...";
             Command = ".uno:PasteSpecial";
         };
@@ -188,42 +184,36 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_DB_APP_DELETE;
-            HelpID = SID_DB_APP_DELETE ;
             Text[ en-US ] = "Delete";
             Command = ".uno:DBDelete";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_RENAME;
-            HelpID = SID_DB_APP_RENAME ;
             Text[ en-US ] = "Rename";
             Command = ".uno:DBRename";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_EDIT;
-            HelpID = SID_DB_APP_EDIT ;
             Text[ en-US ] = "Edit";
             Command = ".uno:DBEdit";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_EDIT_SQL_VIEW;
-            HelpID = SID_DB_APP_EDIT_SQL_VIEW ;
             Text [ en-US ] = "Edit in SQL View...";
             Command = ".uno:DBEditSqlView";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_OPEN;
-            HelpID = SID_DB_APP_OPEN ;
             Text[ en-US ] = "Open";
             Command = ".uno:DBOpen";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_CONVERTTOVIEW;
-            HelpID = SID_DB_APP_CONVERTTOVIEW ;
             Text[ en-US ] = "Create as View";
             Command = ".uno:DBConvertToView";
         };
@@ -236,14 +226,12 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_APP_NEW_REPORT_PRE_SEL;
-            HelpId = SID_APP_NEW_REPORT_PRE_SEL;
             Command = ".uno:DBNewReportWithPreSelection";
             Text [ en-US ] = "Report..." ;
         };
         MenuItem
         {
             Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ;
-            HelpID = HID_DOCUMENT_CREATE_REPWIZ ;
             Text[ en-US ] = "Report Wizard...";
 
             Command = ".uno:DBNewReportAutoPilotWithPreSelection";
@@ -255,7 +243,6 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_SELECTALL;
-            HelpID = SID_SELECTALL ;
             Text[ en-US ] = "Select All";
             Command = ".uno:SelectAll";
         };
@@ -274,21 +261,18 @@ Menu RID_MENU_APP_EDIT
                     MenuItem
                     {
                         Identifier = SID_DB_APP_DSPROPS;
-                        HelpID = SID_DB_APP_DSPROPS ;
                         Text[ en-US ] = "Properties";
                         Command = ".uno:DBDSProperties";
                     };
                     MenuItem
                     {
                         Identifier = SID_DB_APP_DSCONNECTION_TYPE;
-                        HelpID = SID_DB_APP_DSCONNECTION_TYPE ;
                         Text[ en-US ] = "Connection Type";
                         Command = ".uno:DBDSConnectionType";
                     };
                     MenuItem
                     {
                         Identifier = SID_DB_APP_DSADVANCED_SETTINGS;
-                        HelpID = SID_DB_APP_DSADVANCED_SETTINGS ;
                         Text[ en-US ] = "Advanced Settings";
                         Command = ".uno:DBDSAdvancedSettings";
                     };
@@ -394,7 +378,6 @@ Menu RID_MENU_APP_PREVIEW
         MenuItem
         {
             Identifier = SID_DB_APP_DISABLE_PREVIEW;
-            HelpId = SID_DB_APP_DISABLE_PREVIEW;
             Text[ en-US ] = "None";
             Command = ".uno:DBDisablePreview";
             Checkable = TRUE;
@@ -404,7 +387,6 @@ Menu RID_MENU_APP_PREVIEW
         MenuItem
         {
             Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
-            HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
             Text[ en-US ] = "Document Information";
             Command = ".uno:DBShowDocInfoPreview";
             Checkable = TRUE;
@@ -414,7 +396,6 @@ Menu RID_MENU_APP_PREVIEW
         MenuItem
         {
             Identifier = SID_DB_APP_VIEW_DOC_PREVIEW;
-            HelpId = SID_DB_APP_VIEW_DOC_PREVIEW;
             Text[ en-US ] = "Document";
             Command = ".uno:DBShowDocPreview";
             Checkable = TRUE;
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 8129c67afd0f..65185f9f3e73 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -64,8 +64,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >
     m_pTreeListBox->EnableCheckButton(NULL);
     m_pTreeListBox->SetDragDropMode( 0 );
     m_pTreeListBox->EnableInplaceEditing( sal_True );
-    // FIXME: HELPID
-    m_pTreeListBox->SetHelpId(""/*HID_TLB_TREELISTBOX*/);
+    m_pTreeListBox->SetHelpId(HID_TLB_TREELISTBOX);
     m_pTreeListBox->Show();
 }
 
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 5935baafa2c0..b81b073a56bf 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -1387,9 +1387,9 @@ void OGenericUnoController::openHelpAgent(rtl::OUString const& _suHelpStringURL
     openHelpAgent( aURL );
 }
 
-void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId)
+void OGenericUnoController::openHelpAgent(const rtl::OString& _sHelpId)
 {
-    openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _nHelpId ) );
+    openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _sHelpId ) );
 }
 
 void OGenericUnoController::openHelpAgent( const URL& _rURL )
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 747a2d7ac8cf..476fcf683b3f 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -190,14 +190,12 @@ Menu RID_MENU_REFRESH_DATA
         MenuItem
         {
             MID_SBA_QRY_REFRESH
-            HelpId = SID_FM_REFRESH ;
             Command = ".uno:Refresh";
         };
         MenuItem
         {
             Identifier = ID_BROWSER_REFRESH_REBUILD;
             Command = ".uno:DBRebuildData";
-            HelpId = HID_BROWSER_REFRESH_REBUILDVIEW;
             Text [ en-US ] = "Rebuild";
         };
     };
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 3b111cbb869d..f5880cf804de 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -393,8 +393,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
 
         m_pTreeView->getListBox().setContextMenuProvider( this );
         m_pTreeView->getListBox().setControlActionListener( this );
-        // FIXME: HELPID
-        m_pTreeView->SetHelpId(""/*HID_CTL_TREEVIEW*/);
+        m_pTreeView->SetHelpId(HID_CTL_TREEVIEW);
 
         // a default pos for the splitter, so that the listbox is about 80 (logical) pixels wide
         m_pSplitter->SetSplitPosPixel( getBrowserView()->LogicToPixel( ::Size( 80, 0 ), MAP_APPFONT ).Width() );
@@ -410,15 +409,11 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
         m_pTreeView->setSelChangeHdl( LINK( this, SbaTableQueryBrowser, OnSelectionChange ) );
 
         // TODO
-        // FIXME: HELPID
-        getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(""/*UID_DATABROWSE_DATAWINDOW*/);
-        // FIXME: HELPID
-        getBrowserView()->getVclControl()->SetHelpId(""/*HID_CTL_TABBROWSER*/);
-        // FIXME: HELPID
-        getBrowserView()->SetUniqueId(""/*UID_CTL_CONTENT*/);
+        getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(UID_DATABROWSE_DATAWINDOW);
+        getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER);
+        getBrowserView()->SetUniqueId(UID_CTL_CONTENT);
         if (getBrowserView()->getVclControl()->GetHeaderBar())
-            // FIXME: HELPID
-            getBrowserView()->getVclControl()->GetHeaderBar()->SetHelpId(""/*HID_DATABROWSE_HEADER*/);
+            getBrowserView()->getVclControl()->GetHeaderBar()->SetHelpId(HID_DATABROWSE_HEADER);
         InvalidateFeature(ID_BROWSER_EXPLORER);
     }
 
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 95fcbf5e150d..c5c2a084b64a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1070,14 +1070,9 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
     }
 }
 // -----------------------------------------------------------------------------
-void OFieldDescControl::InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler)
+void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OString& _sHelpId,bool _bAddChangeHandler)
 {
-    // FIXME: HELPID
-    #if 0
-    _pControl->SetHelpId(_nHelpId);
-    #else
-    (void)_nHelpId;
-    #endif
+    _pControl->SetHelpId(_sHelpId);
     if ( _bAddChangeHandler )
         ((OPropListBoxCtrl*)_pControl)->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl));
 
@@ -1094,7 +1089,7 @@ FixedText* OFieldDescControl::CreateText(USHORT _nTextRes)
     return pFixedText;
 }
 // -----------------------------------------------------------------------------
-OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId)
+OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId)
 {
     OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER );
     pControl->SetDecimalDigits(0);
@@ -1102,7 +1097,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s
     pControl->SetMax(0x7FFFFFFF);   // soll draussen geaendert werden, wenn noetig
     pControl->SetStrictFormat(TRUE);
 
-    InitializeControl(pControl,_nHelpId,false);
+    InitializeControl(pControl,_sHelpId,false);
 
     return pControl;
 }
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 72c36f9a8cd5..ca94faeb56f8 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -338,18 +338,18 @@ namespace dbaui
     {
         DBG_CHKTHIS(ORelationControl,NULL);
 
-        ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
+        rtl::OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL );
 
         Reference< XPropertySet> xDef;
         switch ( getColumnIdent(nColumnId) )
         {
             case SOURCE_COLUMN:
                 xDef    = m_xSourceDef;
-                nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
+                sHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
                 break;
             case DEST_COLUMN:
                 xDef    = m_xDestDef;
-                nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL;
+                sHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL;
                 break;
             default:
                 //  ?????????
@@ -367,10 +367,7 @@ namespace dbaui
                 m_pListCell->SelectEntry( sName );
             }
 
-            // FIXME: HELPID
-            #if 0
-            m_pListCell->SetHelpId(nHelpId);
-            #endif
+            m_pListCell->SetHelpId(sHelpId);
         }
     }
 
@@ -508,8 +505,7 @@ OTableListBoxControl::OTableListBoxControl(  Window* _pParent
      , m_pParentDialog(_pParentDialog)
     {
         m_pRC_Tables = new ORelationControl( this,m_pTableMap );
-        // FIXME: HELPID
-        m_pRC_Tables->SetHelpId(""/*HID_RELDLG_KEYFIELDS*/);
+        m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS);
         m_pRC_Tables->Init( );
         m_pRC_Tables->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND);
 
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index ac031d635cea..1945557c2999 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -52,8 +52,7 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent,  WinBits nWinStyle ) :
     ,m_bStopTimer(sal_False )
 {
     DBG_CTOR(OSqlEdit,NULL);
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_CTL_QRYSQLEDIT*/ );
+    SetHelpId( HID_CTL_QRYSQLEDIT );
     SetModifyHdl( LINK(this, OSqlEdit, ModifyHdl) );
 
     m_timerUndoActionCreation.SetTimeout(1000);
diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index 425e713094f3..258eec3a2acf 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
@@ -126,7 +126,7 @@
 // -------------------------------------------------------------------------------------------------
 
 
-#define  AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID)                                         \
+#define  AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID, AUTO_HID2)                                      \
     FixedText FT_AUTOBROWSEURL {                                                                    \
         Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ;                                                     \
         Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ;                     \
@@ -147,7 +147,7 @@
     {                                                                                               \
          Pos = MAP_APPFONT ( AUTOPAGE_X  - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \
          Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;                                      \
-          HelpId = (AUTO_HID + 1);                                                                  \
+          HelpId = AUTO_HID2;                                                                   \
         TabStop = TRUE ;                                                                            \
          Text[ en-US ]  = "Browse";                                                                  \
     };
@@ -214,7 +214,9 @@
 
 // --------------------------------------------------------------------------------------------------
 
-
+// MBA: the HID set in the FixText can't make any sense; in case this macro was called from within the
+// AUTOHELP_JDBCCONTROLGROUP, the FixText would have got the same HID as an EditField from the
+// also called AUTO_JDBCDRIVERCLASSGROUP macro; thus I conclude that we can remove the HID from the FixedText
 #define AUTO_PORTCONTROLGROUP(AUTO_Y, AUTO_HID)                                                     \
     FixedText FT_AUTOPORTNUMBER                                                                     \
     {                                                                                               \
@@ -235,7 +237,6 @@
                                                                                                     \
     FixedText FT_AUTOPORTNUMBERDEFAULT                                                              \
     {                                                                                               \
-        HelpId = AUTO_HID + 1 ;                                                                     \
         Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2)  ;                              \
         Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
         Text[ en-US ]   = "" ;                                                                      \
@@ -445,9 +446,9 @@
 
 // --------------------------------------------------------------------------------------------------
 
-#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID)                          \
+#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2)                           \
     AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT)                                                 \
-    AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID)
+    AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID, AUTO_HID2)
 
 
 // --------------------------------------------------------------------------------------------------
@@ -455,7 +456,7 @@
 
 // --------------------------------------------------------------------------------------------------
 
-#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID)                                   \
+#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2)                                   \
                                                                                       \
     FixedText FT_AUTOJDBCDRIVERCLASS                                                  \
      {                                                                                 \
@@ -479,7 +480,7 @@
         Pos = MAP_APPFONT ( WIZARD_PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ;   \
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;                                                       \
          Size = MAP_APPFONT (50, 14);                                                                               \
-         HelpId = AUTO_HID + 1;                                                                         \
+         HelpId = AUTO_HID2;                                                                            \
         Text[ en-US ]  = "Test class" ;                                                                             \
     };
 
@@ -502,13 +503,13 @@
     };
 
 
-#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID )                                           \
+#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID, AUTO_HID2, AUTO_HID3, AUTO_HID4, AUTO_HID5 )                                           \
     AUTO_WIZARDHELPTEXT( 6 )                                                            \
     AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID )                \
-    AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1)                                             \
-    AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 )                                           \
+    AUTO_HOSTCONTROLGROUP(96, AUTO_HID2)                                                \
+    AUTO_PORTCONTROLGROUP(113, AUTO_HID3 )                                              \
     AUTO_SOCKETCONTROLGROUP(129)                                                        \
-    AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3)
+    AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5)
 
 
 // --------------------------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 8a49ceb7e59b..dac80070a640 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -244,23 +244,19 @@ namespace dbaui
         {
             case  ::dbaccess::DST_DBASE:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_DBASE_PATH_OR_FILE)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_DBASE_PATH*/);
+                m_aConnectionURL.SetHelpId(HID_DSADMIN_DBASE_PATH);
                 break;
             case  ::dbaccess::DST_FLAT:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_FLAT_PATH_OR_FILE)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_FLAT_PATH*/);
+                m_aConnectionURL.SetHelpId(HID_DSADMIN_FLAT_PATH);
                 break;
             case  ::dbaccess::DST_CALC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_CALC_PATH_OR_FILE)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_CALC_PATH*/);
+                m_aConnectionURL.SetHelpId(HID_DSADMIN_CALC_PATH);
                 break;
             case  ::dbaccess::DST_ADABAS:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_ADABAS_DATABASE_NAME)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_ADABAS_DATABASE*/);
+                m_aConnectionURL.SetHelpId(HID_DSADMIN_ADABAS_DATABASE);
                 break;
             case  ::dbaccess::DST_ADO:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL)));
@@ -268,40 +264,33 @@ namespace dbaui
             case  ::dbaccess::DST_MSACCESS:
             case  ::dbaccess::DST_MSACCESS_2007:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_MSACCESS_MDB_FILE)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_MSACCESS_MDB_FILE*/);
+                m_aConnectionURL.SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE);
                 break;
             case  ::dbaccess::DST_MYSQL_NATIVE:
             case  ::dbaccess::DST_MYSQL_JDBC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_MYSQL_DATABASE_NAME)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_MYSQL_DATABASE*/ );
+                m_aConnectionURL.SetHelpId( HID_DSADMIN_MYSQL_DATABASE );
                 break;
             case  ::dbaccess::DST_ORACLE_JDBC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_ORACLE_DATABASE_NAME)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_ORACLE_DATABASE*/);
+                m_aConnectionURL.SetHelpId(HID_DSADMIN_ORACLE_DATABASE);
                 break;
             case  ::dbaccess::DST_MYSQL_ODBC:
             case  ::dbaccess::DST_ODBC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_NAME_OF_ODBC_DATASOURCE)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId( ""/*eType ==  ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE*/);
+                m_aConnectionURL.SetHelpId( eType ==  ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE);
                 break;
             case  ::dbaccess::DST_LDAP:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_HOSTNAME)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_LDAP_HOSTNAME*/ );
+                m_aConnectionURL.SetHelpId( HID_DSADMIN_LDAP_HOSTNAME );
                 break;
             case  ::dbaccess::DST_MOZILLA:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_MOZILLA_PROFILE_NAME)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_MOZILLA_PROFILE_NAME*/ );
+                m_aConnectionURL.SetHelpId( HID_DSADMIN_MOZILLA_PROFILE_NAME );
                 break;
             case  ::dbaccess::DST_THUNDERBIRD:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_THUNDERBIRD_PROFILE_NAME)));
-                // FIXME: HELPID
-                m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_THUNDERBIRD_PROFILE_NAME*/ );
+                m_aConnectionURL.SetHelpId( HID_DSADMIN_THUNDERBIRD_PROFILE_NAME );
                 break;
             case  ::dbaccess::DST_OUTLOOK:
             case  ::dbaccess::DST_OUTLOOKEXP:
@@ -331,8 +320,7 @@ namespace dbaui
         bool bShowUserAuthenfication = ( eAuthMode != AuthNone );
         bool bShowUser = ( eAuthMode == AuthUserPwd );
 
-        // FIXME: HELPID
-        m_aPB_Connection.SetHelpId(""/*HID_DSADMIN_BROWSECONN*/);
+        m_aPB_Connection.SetHelpId(HID_DSADMIN_BROWSECONN);
         m_aFL2.Show( bShowUserAuthenfication );
         m_aUserNameLabel.Show( bShowUser && bShowUserAuthenfication );
         m_aUserName.Show( bShowUser && bShowUserAuthenfication );
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 8ead374bdef4..fb5131ebea6c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -55,7 +55,7 @@ TabPage PAGE_CONNECTION
     };
 
 
-    AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL)
+    AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL, HID_DSADMIN_BROWSECONN)
 
 
     FixedText FT_NO_ADDITIONAL_SETTINGS
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index 4a12a0dd13ea..352963b21272 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -34,9 +34,6 @@
 #ifndef _DBAUI_DBADMINIMPL_HXX_
 #include "DbAdminImpl.hxx"
 #endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
-#include "dbaccess_helpid.hrc"
-#endif
 #ifndef _DBAUI_TABLESPAGE_HXX_
 #include "tablespage.hxx"
 #endif
@@ -51,6 +48,8 @@
 #include "propertysetitem.hxx"
 #endif
 
+#include "dbu_dlg.hrc"
+
 //.........................................................................
 namespace dbaui
 {
@@ -69,7 +68,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
             ,SfxItemSet* _pItems
             ,const Reference< XMultiServiceFactory >& _rxORB
             ,const ::com::sun::star::uno::Any& _aDataSourceName)
-    :SfxSingleTabDialog(pParent,UID_DLG_TABLE_FILTER,_pItems)
+    :SfxSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems)
     ,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
     ,m_bStopExecution(sal_False)
     ,m_pOutSet(_pItems)
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 5f0e7628876e..a4914cd45cc5 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -360,13 +360,10 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext )
     // der Close-Button hat schon einen Standard-Help-Text, den ich aber hier nicht haben moechte, also den Text ruecksetzen
     // und eine neue ID verteilen
     aCloseButton.SetHelpText(String());
-    // FIXME: HELPID
-    aCloseButton.SetHelpId(""/*HID_JOINSH_ADDTAB_CLOSE*/);
+    aCloseButton.SetHelpId(HID_JOINSH_ADDTAB_CLOSE);
 
-    // FIXME: HELPID
-    m_aTableList.SetHelpId( ""/*HID_JOINSH_ADDTAB_TABLELIST*/ );
-    // FIXME: HELPID
-    m_aQueryList.SetHelpId( ""/*HID_JOINSH_ADDTAB_QUERYLIST*/ );
+    m_aTableList.SetHelpId( HID_JOINSH_ADDTAB_TABLELIST );
+    m_aQueryList.SetHelpId( HID_JOINSH_ADDTAB_QUERYLIST );
 
     //////////////////////////////////////////////////////////////////////
     m_aCaseTables.SetClickHdl( LINK( this, OAddTableDlg, OnTypeSelected ) );
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index af1d861a0faa..431f86f3d51d 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -38,7 +38,7 @@ ModelessDialog DLG_JOIN_TABADD
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    HelpID = DLG_JOIN_TABADD ;
+    HelpID = HID_DLG_JOIN_TABADD ;
     Size = MAP_APPFONT ( 178 , 147 ) ;
     Moveable = TRUE ;
     Closeable = TRUE ;
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 7b0dbe011342..2a8d762e8d57 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -370,7 +370,7 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC
         Text[ en-US ] = "Default: 3306";
     };
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME)
+    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS,HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS)
 };
 
 TabPage PAGE_DBWIZARD_MYSQL_NATIVE
@@ -416,7 +416,7 @@ TabPage PAGE_DBWIZARD_DBASE
         Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
     };
 
-     AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
+     AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION)
 };
 
 
@@ -440,7 +440,7 @@ TabPage PAGE_DBWIZARD_TEXT
     };
 
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE)
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE,HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE)
     AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X)
  };
 
@@ -464,7 +464,7 @@ TabPage PAGE_DBWIZARD_MSACCESS
         Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION)
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION)
 // FT_MSACCESS_MDB_FILE
 };
 
@@ -527,7 +527,7 @@ TabPage PAGE_DBWIZARD_ADABAS
         Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME)
+    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME)
 };
 
 
@@ -547,7 +547,7 @@ TabPage PAGE_DBWIZARD_ADO
         Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL)
+    AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL)
 
 };
 
@@ -568,7 +568,7 @@ TabPage PAGE_DBWIZARD_ODBC
         Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE)
+    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE, HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE)
 };
 
 TabPage PAGE_DBWIZARD_USERDEFINED
@@ -578,7 +578,7 @@ TabPage PAGE_DBWIZARD_USERDEFINED
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE)
+    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE)
 };
 
 
@@ -599,8 +599,8 @@ TabPage PAGE_DBWIZARD_JDBC
         Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL)
-    AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS)
+    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL, HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL)
+    AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS, HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS)
 };
 
 
@@ -632,7 +632,7 @@ TabPage PAGE_DBWIZARD_ORACLE
         Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME)
+    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS)
 };
 
 
@@ -654,7 +654,7 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
     };
 
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH )
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH )
 
     String STR_SPREADSHEETPATH{
         Text[ en-US ] = "~Location and file name" ;
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 78fe8aef1f84..cdecbd295df6 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -145,16 +145,11 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
     enableButtons(WZB_FINISH, sal_False);
     enableAutomaticNextButtonState( true );
 
-    // FIXME: HELPID
-    m_pPrevPage->SetHelpId(""/*HID_DBWIZ_PREVIOUS*/);
-    // FIXME: HELPID
-    m_pNextPage->SetHelpId(""/*HID_DBWIZ_NEXT*/);
-    // FIXME: HELPID
-    m_pCancel->SetHelpId(""/*HID_DBWIZ_CANCEL*/);
-    // FIXME: HELPID
-    m_pFinish->SetHelpId(""/*HID_DBWIZ_FINISH*/);
-    // FIXME: HELPID
-    m_pHelp->SetUniqueId(""/*UID_DBWIZ_HELP*/);
+    m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS);
+    m_pNextPage->SetHelpId(HID_DBWIZ_NEXT);
+    m_pCancel->SetHelpId(HID_DBWIZ_CANCEL);
+    m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
+    m_pHelp->SetUniqueId(UID_DBWIZ_HELP);
     // no local resources needed anymore
 
     DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _pItems->GetItem(DSID_TYPECOLLECTION));
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index c2bf98061782..5a601bd56c92 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -318,16 +318,11 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
     aPath.push_back(PAGE_DBSETUPWIZARD_INTRO);
     declarePath( static_cast<PathId>(m_pCollection->size()+1), aPath);
 
-    // FIXME: HELPID
-    m_pPrevPage->SetHelpId(""/*HID_DBWIZ_PREVIOUS*/);
-    // FIXME: HELPID
-    m_pNextPage->SetHelpId(""/*HID_DBWIZ_NEXT*/);
-    // FIXME: HELPID
-    m_pCancel->SetHelpId(""/*HID_DBWIZ_CANCEL*/);
-    // FIXME: HELPID
-    m_pFinish->SetHelpId(""/*HID_DBWIZ_FINISH*/);
-    // FIXME: HELPID
-    m_pHelp->SetUniqueId(""/*UID_DBWIZ_HELP*/);
+    m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS);
+    m_pNextPage->SetHelpId(HID_DBWIZ_NEXT);
+    m_pCancel->SetHelpId(HID_DBWIZ_CANCEL);
+    m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
+    m_pHelp->SetUniqueId(UID_DBWIZ_HELP);
     SetRoadmapInteractive( sal_True );
     ActivatePage();
 }
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index db0542525aa3..ee6b853b5eed 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -470,8 +470,7 @@ void OSaveAsDlg::implInit()
     else if ( SAD_TITLE_RENAME == ( m_pImpl->m_nFlags & SAD_TITLE_RENAME ) )
     {
         SetText( String( ModuleRes( STR_TITLE_RENAME ) ) );
-        // FIXME: HELPID
-        m_pImpl->m_aTitle.SetHelpId(""/*HID_DLG_RENAME*/);
+        m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME);
     }
 
     m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl));
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index aa1dd1d3e002..ef715d8061cd 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -128,10 +128,8 @@ DBG_NAME(IndexFieldsControl)
     {
         DBG_CTOR(IndexFieldsControl,NULL);
 
-        // FIXME: HELPID
-        SetUniqueId( ""/*UID_DLGINDEX_INDEXDETAILS_BACK*/ );
-        // FIXME: HELPID
-        GetDataWindow().SetUniqueId( ""/*UID_DLGINDEX_INDEXDETAILS_MAIN*/ );
+        SetUniqueId( UID_DLGINDEX_INDEXDETAILS_BACK );
+        GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN );
     }
 
     //------------------------------------------------------------------
@@ -292,10 +290,8 @@ DBG_NAME(IndexFieldsControl)
         m_pSortingCell->InsertEntry(m_sAscendingText);
         m_pSortingCell->InsertEntry(m_sDescendingText);
 
-        // FIXME: HELPID
-        m_pFieldNameCell->SetHelpId( ""/*HID_DLGINDEX_INDEXDETAILS_FIELD*/ );
-        // FIXME: HELPID
-        m_pSortingCell->SetHelpId( ""/*HID_DLGINDEX_INDEXDETAILS_SORTORDER*/ );
+        m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD );
+        m_pSortingCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_SORTORDER );
     }
 
     //------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 34f26083c913..5dd0ccda31b0 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -689,8 +689,13 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle )
     {
         lcl_addButton( *this, BUTTON_HELP, false );
 
-        // FIXME: HELPID
-        SetHelpId( rtl::OUStringToOString( m_sHelpURL, RTL_TEXTENCODING_UTF8 ) );
+        rtl::OUString aTmp;
+        if ( m_sHelpURL.indexOfAsciiL( "HID:", 4 ) == 0 )
+            aTmp = m_sHelpURL.copy( 4 );
+        else
+            aTmp = m_sHelpURL;
+
+        SetHelpId( rtl::OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) );
     }
 }
 
@@ -723,8 +728,7 @@ void OSQLMessageBox::impl_addDetailsButton()
         PushButton* pButton = GetPushButton( BUTTONID_MORE );
         OSL_ENSURE( pButton, "OSQLMessageBox::impl_addDetailsButton: just added this button, why isn't it there?" );
         pButton->SetClickHdl( LINK( this, OSQLMessageBox, ButtonClickHdl ) );
-        // FIXME: HELPID
-        pButton->SetUniqueId( ""/*UID_SQLERROR_BUTTONMORE*/ );
+        pButton->SetUniqueId( UID_SQLERROR_BUTTONMORE );
     }
 }
 
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index a384ad23cb04..10c8c8ec47a0 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -158,9 +158,9 @@ namespace dbaui
 
         sal_Bool            isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const;
         void                Contruct();
-        OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId);
+        OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId);
         FixedText*          CreateText(USHORT _nTextRes);
-        void                InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler);
+        void                InitializeControl(Control* _pControl,const rtl::OString& _sHelpId,bool _bAddChangeHandler);
 
     protected:
         inline  void    setRightAligned()       { m_bRightAligned = true; }
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index df7208aba9b7..daa8756751cf 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -337,7 +337,7 @@ namespace dbaui
         @return
             The URL for the help agent to dispatch.
     */
-    ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId);
+    ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const rtl::OString& _rHelpId);
 
     /** set the evaluation flag at the number formatter
         @param  _rxFormatter
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index be49adc0e518..730235b207ad 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -118,7 +118,7 @@
 #define DLG_DATABASE_WIZARD             RID_DIALOG_START + 29
 #define RID_EXTENSION_NOT_PRESENT_DLG   RID_DIALOG_START + 30
 #define DLG_TEXT_CONNECTION_SETTINGS    RID_DIALOG_START + 31
-
+#define DLG_TABLE_FILTER                RID_DIALOG_START + 32
 //========================================================================
 // tab pages
 
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 4979718ad41f..9656a9f90d37 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1497,13 +1497,13 @@ namespace
 } // annonymous
 // .........................................................................
 // -----------------------------------------------------------------------------
-::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId)
+::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId)
 {
     ::com::sun::star::util::URL aURL;
     aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
     aURL.Complete += _sModuleName;
     aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-    aURL.Complete += ::rtl::OUString::valueOf(_nHelpId);
+    aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8);
 
     ::rtl::OUString sAnchor;
     ::rtl::OUString sTempURL = aURL.Complete;
@@ -1651,8 +1651,7 @@ sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Boo
     if ( _bAll )
     {
         aAsk.AddButton(String(ModuleRes(STR_BUTTON_TEXT_ALL)), RET_ALL, 0);
-        // FIXME: HELPID
-        aAsk.GetPushButton(RET_ALL)->SetHelpId(""/*HID_CONFIRM_DROP_BUTTON_ALL*/);
+        aAsk.GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL);
     }
     return aAsk.Execute();
 }
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index f33c82abecb7..fa72a03269cc 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -70,6 +70,8 @@
 #include "FieldControls.hxx"
 #endif
 
+#include "dbaccess_slotid.hrc"
+
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 9871c3f7d810..624be87c898e 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -35,6 +35,7 @@
 #include "dbaccess_helpid.hrc"
 #endif
 
+#include "dbaccess_slotid.hrc"
 
 #define WINDOW_SIZE_X   276
 #define WINDOW_SIZE_Y   185
@@ -308,7 +309,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
         MenuItem
         {
             Identifier      = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-            HelpID          = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+            HelpID          = HID_TABLEDESIGN_TABED_PRIMARYKEY ;
             Checkable       = TRUE ;
             Text [ en-US ] = "Primary Key" ;
         };
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index d06c45cfce3a..f22d6f64ee87 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -119,8 +119,7 @@ OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::v
     if (m_strInitialAlias == pTabWinData->GetTableName())
         m_strInitialAlias = ::rtl::OUString();
 
-    // FIXME: HELPID
-    SetHelpId(""/*HID_CTL_QRYDGNTAB*/);
+    SetHelpId(HID_CTL_QRYDGNTAB);
 }
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index e61d0b52fc84..c083392a9613 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -310,8 +310,7 @@ OQueryTableView::OQueryTableView( Window* pParent,OQueryDesignView* pView)
     : OJoinTableView( pParent,pView)
 {
     DBG_CTOR(OQueryTableView,NULL);
-    // FIXME: HELPID
-    SetHelpId(""/*HID_CTL_QRYDGNTAB*/);
+    SetHelpId(HID_CTL_QRYDGNTAB);
 }
 
 //------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 1723a262ab49..66b6eec9465c 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -173,8 +173,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
                    ,m_bInUndoMode(sal_False)
 {
     DBG_CTOR(OSelectionBrowseBox,NULL);
-    // FIXME: HELPID
-    SetHelpId(""/*HID_CTL_QRYDGNCRIT*/);
+    SetHelpId(HID_CTL_QRYDGNCRIT);
 
     m_nMode =       BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT
                 |   BROWSER_KEEPSELECTION   | BROWSER_HIDECURSOR
@@ -189,16 +188,11 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
     m_pOrderCell    = new ListBoxControl(&GetDataWindow());
     m_pFunctionCell = new ListBoxControl(&GetDataWindow());     m_pFunctionCell->SetDropDownLineCount( 20 );
 
-    // FIXME: HELPID
-    m_pVisibleCell->SetHelpId(""/*HID_QRYDGN_ROW_VISIBLE*/);
-    // FIXME: HELPID
-    m_pTableCell->SetHelpId(""/*HID_QRYDGN_ROW_TABLE*/);
-    // FIXME: HELPID
-    m_pFieldCell->SetHelpId(""/*HID_QRYDGN_ROW_FIELD*/);
-    // FIXME: HELPID
-    m_pOrderCell->SetHelpId(""/*HID_QRYDGN_ROW_ORDER*/);
-    // FIXME: HELPID
-    m_pFunctionCell->SetHelpId(""/*HID_QRYDGN_ROW_FUNCTION*/);
+    m_pVisibleCell->SetHelpId(HID_QRYDGN_ROW_VISIBLE);
+    m_pTableCell->SetHelpId(HID_QRYDGN_ROW_TABLE);
+    m_pFieldCell->SetHelpId(HID_QRYDGN_ROW_FIELD);
+    m_pOrderCell->SetHelpId(HID_QRYDGN_ROW_ORDER);
+    m_pFunctionCell->SetHelpId(HID_QRYDGN_ROW_FUNCTION);
 
     //////////////////////////////////////////////////////////////////////
     // TriState der ::com::sun::star::form::CheckBox abschalten
@@ -2706,7 +2700,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window
     _pControl->EnableInput(bEnable);
 }
 // -----------------------------------------------------------------------------
-void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId)
+void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId)
 {
     m_pTextCell->SetText(_sText);
     m_pTextCell->ClearModifyFlag();
@@ -2715,15 +2709,10 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c
 
     enableControl(_rEntry,m_pTextCell);
 
-    // FIXME: HELPID
-    #if 0
-    if (m_pTextCell->GetHelpId() != _nHelpId)
+    if (m_pTextCell->GetHelpId() != _sHelpId)
         // da TextCell in verschiedenen Kontexten verwendet wird, muss ich den gecachten HelpText loeschen
         m_pTextCell->SetHelpText(String());
-    m_pTextCell->SetHelpId(_nHelpId);
-    #else
-    (void)_nHelpId;
-    #endif
+    m_pTextCell->SetHelpId(_sHelpId);
 }
 // -----------------------------------------------------------------------------
 void OSelectionBrowseBox::invalidateUndoRedo()
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index e4fd3471fd97..3d215a81f4c8 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -261,7 +261,7 @@ namespace dbaui
         void            appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow);
         OTableFields&   getFields() const;
         void            enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl);
-        void            setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId);
+        void            setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId);
         void            invalidateUndoRedo();
         OTableFieldDescRef getEntry(OTableFields::size_type _nPos);
 
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index c422ea5cf1e1..e14c234cc5d3 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -101,8 +101,7 @@ ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pV
 
 {
     DBG_CTOR(ORelationTableView,NULL);
-    // FIXME: HELPID
-    SetHelpId(""/*HID_CTL_RELATIONTAB*/);
+    SetHelpId(HID_CTL_RELATIONTAB);
 }
 
 //------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 8d5edcdacd1b..727de7fe60ea 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -62,8 +62,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp
 {
     DBG_CTOR(OFieldDescGenWin,NULL);
     m_pFieldControl = new OTableFieldControl(this,pHelp);
-    // FIXME: HELPID
-    m_pFieldControl->SetHelpId(""/*HID_TAB_DESIGN_FIELDCONTROL*/);
+    m_pFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL);
     m_pFieldControl->Show();
 }
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 4590d7b9082b..2f7fc5f5a2b1 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -106,6 +106,8 @@
 #include "TableFieldControl.hxx"
 #endif
 
+#include "dbaccess_slotid.hrc"
+
 using namespace ::dbaui;
 using namespace ::comphelper;
 using namespace ::svt;
@@ -246,10 +248,8 @@ OTableEditorCtrl::OTableEditorCtrl(Window* pWindow)
 {
     DBG_CTOR(OTableEditorCtrl,NULL);
 
-    // FIXME: HELPID
-    SetHelpId(""/*HID_TABDESIGN_BACKGROUND*/);
-    // FIXME: HELPID
-    GetDataWindow().SetHelpId(""/*HID_CTL_TABLEEDIT*/);
+    SetHelpId(HID_TABDESIGN_BACKGROUND);
+    GetDataWindow().SetHelpId(HID_CTL_TABLEEDIT);
 
     m_pRowList = GetView()->getController().getRows();
     m_nDataPos = 0;
@@ -344,12 +344,9 @@ void OTableEditorCtrl::InitCellController()
     pDescrCell = new Edit( &GetDataWindow(), WB_LEFT );
     pDescrCell->SetMaxTextLen( MAX_DESCR_LEN );
 
-    // FIXME: HELPID
-    pNameCell->SetHelpId(""/*HID_TABDESIGN_NAMECELL*/);
-    // FIXME: HELPID
-    pTypeCell->SetHelpId(""/*HID_TABDESIGN_TYPECELL*/);
-    // FIXME: HELPID
-    pDescrCell->SetHelpId(""/*HID_TABDESIGN_COMMENTCELL*/);
+    pNameCell->SetHelpId(HID_TABDESIGN_NAMECELL);
+    pTypeCell->SetHelpId(HID_TABDESIGN_TYPECELL);
+    pDescrCell->SetHelpId(HID_TABDESIGN_COMMENTCELL);
 
     Size aHeight;
     const Control* pControls[] = { pTypeCell,pDescrCell,pNameCell};
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 183bcb8fca71..c2326e441c95 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -52,8 +52,7 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) :
 {
     DBG_CTOR(OTableDesignHelpBar,NULL);
     m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY);
-    // FIXME: HELPID
-    m_pTextWin->SetHelpId(""/*HID_TABLE_DESIGN_HELP_WINDOW*/);
+    m_pTextWin->SetHelpId(HID_TABLE_DESIGN_HELP_WINDOW);
     m_pTextWin->SetReadOnly();
     m_pTextWin->SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
     m_pTextWin->Show();
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index ce106ee74952..f16624dbdad2 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -90,8 +90,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD
     m_pEditorCtrl   = new OTableEditorCtrl( this);
     m_pFieldDescWin = new OTableFieldDescWin( this );
 
-    // FIXME: HELPID
-    m_pFieldDescWin->SetHelpId(""/*HID_TAB_DESIGN_DESCWIN*/);
+    m_pFieldDescWin->SetHelpId(HID_TAB_DESIGN_DESCWIN);
 
     // set depending windows and controls
     m_pEditorCtrl->SetDescrWin(m_pFieldDescWin);
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 3f60dd06f4b5..6f136ab0b4e8 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -93,13 +93,11 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent)
     //////////////////////////////////////////////////////////////////////
     // HelpBar
     m_pHelpBar = new OTableDesignHelpBar( this );
-    // FIXME: HELPID
-    m_pHelpBar->SetHelpId(""/*HID_TAB_DESIGN_HELP_TEXT_FRAME*/);
+    m_pHelpBar->SetHelpId(HID_TAB_DESIGN_HELP_TEXT_FRAME);
     m_pHelpBar->Show();
 
     m_pGenPage = new OFieldDescGenWin( this, m_pHelpBar );
-    // FIXME: HELPID
-    getGenPage()->SetHelpId( ""/*HID_TABLE_DESIGN_TABPAGE_GENERAL*/ );
+    getGenPage()->SetHelpId( HID_TABLE_DESIGN_TABPAGE_GENERAL );
     getGenPage()->Show();
 }
 
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index d40da4e3c358..fe01dff5f79f 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -171,7 +171,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
     MenuItem
     {
         Identifier = SID_TABLEDESIGN_INSERTROWS ;
-        HelpID = SID_TABLEDESIGN_INSERTROWS ;
+        HelpID = HID_TABLEDESIGN_INSERTROWS ;
         Text [ en-US ] = "Insert Rows" ;
         };
     MenuItem
@@ -181,7 +181,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
     MenuItem
     {
         Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-        HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+        HelpID = HID_TABLEDESIGN_TABED_PRIMARYKEY ;
         Checkable = TRUE ;
         Text [ en-US ] = "Primary Key" ;
         };