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

11 files changed, 61 insertions, 382 deletions

diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0f666941e57e..4a303a8dc549 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -33,53 +33,53 @@
 
 // Help-Ids --------------------------------------------------------------
 
-#define HID_BASICIDE_TOOLBOX                    (HID_BASICIDE_START +   0)
-#define HID_BASICIDE_OBJECTS                    (HID_BASICIDE_START +   1)
-#define HID_MACRO_OPTIONS                       (HID_BASICIDE_START +   2)
-#define HID_BASICIDE_BRKPNTS                    (HID_BASICIDE_START +   3)
-#define HID_BASICIDE_MODULS                     (HID_BASICIDE_START +   4)
-#define HID_BASICIDE_LIBS_TP                    (HID_BASICIDE_START +   5)
-#define HID_BASICIDE_LIBS_DLG                   (HID_BASICIDE_START +   6)
-#define HID_BASICIDE_CONTROLS                   (HID_BASICIDE_START +   7)
-#define HID_BASICIDE_MACROS                     (HID_BASICIDE_START +   8)
-#define HID_BASICIDE_LIBS                       (HID_BASICIDE_START +   9)
-#define HID_BASICIDE_ORG_TC                     (HID_BASICIDE_START +  10)
+#define HID_BASICIDE_TOOLBOX                              "BASCTL_HID_BASICIDE_TOOLBOX"
+#define HID_BASICIDE_OBJECTS                              "BASCTL_HID_BASICIDE_OBJECTS"
+#define HID_MACRO_OPTIONS                                 "BASCTL_HID_MACRO_OPTIONS"
+#define HID_BASICIDE_BRKPNTS                              "BASCTL_HID_BASICIDE_BRKPNTS"
+#define HID_BASICIDE_MODULS                               "BASCTL_HID_BASICIDE_MODULS"
+#define HID_BASICIDE_LIBS_TP                              "BASCTL_HID_BASICIDE_LIBS_TP"
+#define HID_BASICIDE_LIBS_DLG                             "BASCTL_HID_BASICIDE_LIBS_DLG"
+#define HID_BASICIDE_CONTROLS                             "BASCTL_HID_BASICIDE_CONTROLS"
+#define HID_BASICIDE_MACROS                               "BASCTL_HID_BASICIDE_MACROS"
+#define HID_BASICIDE_LIBS                                 "BASCTL_HID_BASICIDE_LIBS"
+#define HID_BASICIDE_ORG_TC                               "BASCTL_HID_BASICIDE_ORG_TC"
 
-#define HID_BASICIDE_MODULES_TREE               (HID_BASICIDE_START +  11)
-#define HID_BASICIDE_LIBS_TREE                  (HID_BASICIDE_START +  12)
-#define HID_BASICIDE_LIBSDLG_TREE               (HID_BASICIDE_START +  13)
-#define HID_BASICIDE_OBJECTCAT                  (HID_BASICIDE_START +  14)
+#define HID_BASICIDE_MODULES_TREE                         "BASCTL_HID_BASICIDE_MODULES_TREE"
+#define HID_BASICIDE_LIBS_TREE                            "BASCTL_HID_BASICIDE_LIBS_TREE"
+#define HID_BASICIDE_LIBSDLG_TREE                         "BASCTL_HID_BASICIDE_LIBSDLG_TREE"
+#define HID_BASICIDE_OBJECTCAT                            "BASCTL_HID_BASICIDE_OBJECTCAT"
 
-#define HID_BASICIDE_PROP_BROWSER               (HID_BASICIDE_START +  15)
+#define HID_BASICIDE_PROP_BROWSER                         "BASCTL_HID_BASICIDE_PROP_BROWSER"
 
-#define HID_BASICIDE_PROP_BROWSER_LBOX          (HID_BASICIDE_START +  16)
+#define HID_BASICIDE_PROP_BROWSER_LBOX                    "BASCTL_HID_BASICIDE_PROP_BROWSER_LBOX"
 
-#define HID_BASICIDE_OBJCAT_SHOW                (HID_BASICIDE_START +  17)
-#define HID_BASICIDE_OBJCAT_PROPS               (HID_BASICIDE_START +  18)
-#define HID_BASICIDE_OBJCAT_HELP                (HID_BASICIDE_START +  19)
+#define HID_BASICIDE_OBJCAT_SHOW                          "BASCTL_HID_BASICIDE_OBJCAT_SHOW"
+#define HID_BASICIDE_OBJCAT_PROPS                         "BASCTL_HID_BASICIDE_OBJCAT_PROPS"
+#define HID_BASICIDE_OBJCAT_HELP                          "BASCTL_HID_BASICIDE_OBJCAT_HELP"
 
-#define HID_BASICIDE_BRKDLG                     (HID_BASICIDE_START +  20)
-#define HID_BASICIDE_ACTIV                      (HID_BASICIDE_START +  21)
-#define HID_BASICIDE_BRKPROPS                   (HID_BASICIDE_START +  22)
-#define HID_BASICIDE_REMOVEWATCH                (HID_BASICIDE_START +  23)
-#define HID_BASICIDE_GOTOALL                    (HID_BASICIDE_START +  24)
+#define HID_BASICIDE_BRKDLG                               "BASCTL_HID_BASICIDE_BRKDLG"
+#define HID_BASICIDE_ACTIV                                "BASCTL_HID_BASICIDE_ACTIV"
+#define HID_BASICIDE_BRKPROPS                             "BASCTL_HID_BASICIDE_BRKPROPS"
+#define HID_BASICIDE_REMOVEWATCH                          "BASCTL_HID_BASICIDE_REMOVEWATCH"
+#define HID_BASICIDE_GOTOALL                              "BASCTL_HID_BASICIDE_GOTOALL"
 
-#define HID_BASICIDE_MODULWINDOW                (HID_BASICIDE_START +  25)
-#define HID_BASICIDE_DIALOGWINDOW               (HID_BASICIDE_START +  26)
+#define HID_BASICIDE_MODULWINDOW                          "BASCTL_HID_BASICIDE_MODULWINDOW"
+#define HID_BASICIDE_DIALOGWINDOW                         "BASCTL_HID_BASICIDE_DIALOGWINDOW"
 
-#define HID_BASICIDE_EDITORWINDOW               (HID_BASICIDE_START +  27)
-#define HID_BASICIDE_BREAKPOINTWINDOW           (HID_BASICIDE_START +  28)
-#define HID_BASICIDE_WATCHWINDOW                (HID_BASICIDE_START +  29)
-#define HID_BASICIDE_STACKWINDOW                (HID_BASICIDE_START +  30)
-#define HID_BASICIDE_TABBAR                     (HID_BASICIDE_START +  31)
-#define HID_BASICIDE_WATCHWINDOW_EDIT           (HID_BASICIDE_START +  32)
-#define HID_BASICIDE_WATCHWINDOW_LIST           (HID_BASICIDE_START +  33)
-#define HID_BASICIDE_STACKWINDOW_LIST           (HID_BASICIDE_START +  34)
+#define HID_BASICIDE_EDITORWINDOW                         "BASCTL_HID_BASICIDE_EDITORWINDOW"
+#define HID_BASICIDE_BREAKPOINTWINDOW                     "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"
+#define HID_BASICIDE_WATCHWINDOW                          "BASCTL_HID_BASICIDE_WATCHWINDOW"
+#define HID_BASICIDE_STACKWINDOW                          "BASCTL_HID_BASICIDE_STACKWINDOW"
+#define HID_BASICIDE_TABBAR                               "BASCTL_HID_BASICIDE_TABBAR"
+#define HID_BASICIDE_WATCHWINDOW_EDIT                     "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"
+#define HID_BASICIDE_WATCHWINDOW_LIST                     "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
+#define HID_BASICIDE_STACKWINDOW_LIST                     "BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
 
-#define HID_BASICIDE_MANAGE_LANGUAGE            (HID_BASICIDE_START +  35)
-#define HID_BASICIDE_SETDEFAULT_LANGUAGE        (HID_BASICIDE_START +  36)
-#define HID_BASICIDE_ADDNEW_LANGUAGE            (HID_BASICIDE_START +  37)
-#define HID_BASICIDE_ADDNEW_CONTROL             (HID_BASICIDE_START +  38)
+#define HID_BASICIDE_MANAGE_LANGUAGE                      "BASCTL_HID_BASICIDE_MANAGE_LANGUAGE"
+#define HID_BASICIDE_SETDEFAULT_LANGUAGE                  "BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE"
+#define HID_BASICIDE_ADDNEW_LANGUAGE                      "BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE"
+#define HID_BASICIDE_ADDNEW_CONTROL                       "BASCTL_HID_BASICIDE_ADDNEW_CONTROL"
 
 #endif
 
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 69db90a10024..7b91d7c3a7d8 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -88,43 +88,6 @@ void BasicDocShell::SetPrinter( SfxPrinter* pPr )
     }
 }
 
-void BasicDocShell::FillStatusBar( StatusBar& rStatusBar )
-{
-    String aTmp;
-
-    // Titel
-    aTmp.Fill( 30, 'X' );
-    rStatusBar.InsertItem( SID_BASICIDE_STAT_TITLE,
-        rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT);
-
-    // Modify
-    rStatusBar.InsertItem( SID_DOC_MODIFIED,
-        rStatusBar.GetTextWidth( '*' ) );
-
-    // signatures
-    rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW );
-    // FIXME: HELPID
-    rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/);
-
-    // Position
-    aTmp.Erase();
-    aTmp.Fill( 15, 'X' );
-    rStatusBar.InsertItem( SID_BASICIDE_STAT_POS,
-        rStatusBar.GetTextWidth( aTmp ), SIB_LEFT);
-
-    // Insert/Overwrite
-    rStatusBar.InsertItem( SID_ATTR_INSERT,
-        rStatusBar.GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM( "XXXXX" /* "EINFG" */ ) ) ) );
-
-    // Uhrzeit
-    aTmp.Fill( 20, 'X' );
-    rStatusBar.InsertItem( SID_ATTR_SIZE,
-        rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT | SIB_USERDRAW );
-
-//  return pStatusBar;
-
-}
-
 void BasicDocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, String*, sal_Int32, sal_Bool bTemplate) const
 {
     (void)bTemplate;
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 1ef5991cfab4..a2ec0917ceb5 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -39,7 +39,6 @@ class BasicDocShell: public SfxObjectShell
     SfxPrinter*         pPrinter;
 
 protected:
-    virtual void        FillStatusBar( StatusBar& rBar);
     virtual void    Draw( OutputDevice *, const JobSetup & rSetup,
                           USHORT nAspect = ASPECT_CONTENT );
     virtual void    FillClass( SvGlobalName * pClassName,
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index d2b227319e60..b6b4accb7dd6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -177,8 +177,7 @@ EditorWindow::EditorWindow( Window* pParent ) :
         Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
     SetPointer( Pointer( POINTER_TEXT ) );
 
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_BASICIDE_EDITORWINDOW*/ );
+    SetHelpId( HID_BASICIDE_EDITORWINDOW );
     pSourceViewConfig->AddListener(this);
 }
 
@@ -949,8 +948,7 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) :
     // Falls in EditEngine autom. gescrollt wurde, wuesste ich sonst nicht,
     // wo ich gerade stehe.
 
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_BASICIDE_BREAKPOINTWINDOW*/ );
+    SetHelpId( HID_BASICIDE_BREAKPOINTWINDOW );
 }
 
 
@@ -1189,8 +1187,7 @@ WatchWindow::WatchWindow( Window* pParent ) :
     nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
     nHeaderBarHeight = 16;
 
-    // FIXME: HELPID
-    aTreeListBox.SetHelpId(""/*HID_BASICIDE_WATCHWINDOW_LIST*/);
+    aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST);
     aTreeListBox.EnableInplaceEditing( TRUE );
     aTreeListBox.SetSelectHdl( LINK( this, WatchWindow, TreeListHdl ) );
     aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight + nHeaderBarHeight ) );
@@ -1242,8 +1239,7 @@ WatchWindow::WatchWindow( Window* pParent ) :
 
     SetText( String( IDEResId( RID_STR_WATCHNAME ) ) );
 
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_BASICIDE_WATCHWINDOW*/ );
+    SetHelpId( HID_BASICIDE_WATCHWINDOW );
 
     // make watch window keyboard accessible
     GetSystemWindow()->GetTaskPaneList()->AddWindow( this );
@@ -1526,8 +1522,7 @@ StackWindow::StackWindow( Window* pParent ) :
     aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ),
     aStackStr( IDEResId( RID_STR_STACK ) )
 {
-    // FIXME: HELPID
-    aTreeListBox.SetHelpId(""/*HID_BASICIDE_STACKWINDOW_LIST*/);
+    aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST);
     aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) );
     aTreeListBox.SetHighlightRange();
     aTreeListBox.SetSelectionMode( NO_SELECTION );
@@ -1536,8 +1531,7 @@ StackWindow::StackWindow( Window* pParent ) :
 
     SetText( String( IDEResId( RID_STR_STACKNAME ) ) );
 
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_BASICIDE_STACKWINDOW*/ );
+    SetHelpId( HID_BASICIDE_STACKWINDOW );
 
     aGotoCallButton.SetClickHdl( LINK( this, StackWindow, ButtonHdl ) );
     aGotoCallButton.SetPosPixel( Point( DWBORDER, 2 ) );
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 9e84a7d36adf..afbe3daf5be1 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -124,8 +124,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
     pEditor->GetModel()->SetNotifyUndoActionHdl(
         LINK(this, DialogWindow, NotifyUndoActionHdl));
 
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ );
+    SetHelpId( HID_BASICIDE_DIALOGWINDOW );
 
     // set readonly mode for readonly libraries
     ::rtl::OUString aOULibName( aLibName );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 7ae1f9528bb2..4432de9aa282 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1065,16 +1065,14 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
             AdjustPosSizePixel( Point( 0, 0 ), GetViewFrame()->GetWindow().GetOutputSizePixel() );
             if( pCurWin->IsA( TYPE( ModulWindow ) ) )
             {
-                // FIXME: HELPID
-                GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ );
+                GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW );
                 pModulLayout->SetModulWindow( (ModulWindow*)pCurWin );
                 pModulLayout->Show();
             }
             else
             {
                 pModulLayout->Hide();
-                // FIXME: HELPID
-                GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ );
+                GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_DIALOGWINDOW );
             }
 
             if ( bRememberAsCurrent )
@@ -1123,8 +1121,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
         else
         {
             SetWindow( pModulLayout );
-            // FIXME: HELPID
-            GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ );
+            GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW );
             SfxObjectShell::SetCurrentComponent( NULL );
         }
         SetUndoManager( pCurWin ? pCurWin->GetUndoManager() : 0 );
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index f0c0727cd22f..949732389709 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -31,6 +31,8 @@
 #include <svx/globlmn.hrc>
 #endif
 #include "dlgresid.hrc"
+#include <sfx2/sfxcommands.h>
+#include <svx/svxcommands.h>
 
 #define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
 
@@ -442,13 +444,13 @@ Menu RID_POPUP_TABBAR
                     MenuItem
                     {
                         Identifier = SID_BASICIDE_NEWMODULE ;
-                        HelpId = SID_BASICIDE_NEWMODULE ;
+                        HelpId = CMD_SID_BASICIDE_NEWMODULE ;
                         Text [ en-US ] = "BASIC Module" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_BASICIDE_NEWDIALOG ;
-                        HelpId = SID_BASICIDE_NEWDIALOG ;
+                        HelpId = CMD_SID_BASICIDE_NEWDIALOG ;
                         Text [ en-US ] = "BASIC Dialog" ;
                     };
                 };
@@ -458,7 +460,7 @@ Menu RID_POPUP_TABBAR
         MenuItem
         {
             Identifier = SID_BASICIDE_DELETECURRENT ;
-            HelpId = SID_BASICIDE_DELETECURRENT ;
+            HelpId = CMD_SID_BASICIDE_DELETECURRENT ;
             /* ### ACHTUNG: Neuer Text in Resource? L�schen : L�schen */
             Text [ en-US ] = "Delete" ;
             /* ### ACHTUNG: Neuer Text in Resource? Modul oder Dialog l�schen : Modul oder Dialog l�schen */
@@ -466,13 +468,13 @@ Menu RID_POPUP_TABBAR
         MenuItem
         {
             Identifier = SID_BASICIDE_RENAMECURRENT ;
-            HelpId = SID_BASICIDE_RENAMECURRENT ;
+            HelpId = CMD_SID_BASICIDE_RENAMECURRENT ;
             Text [ en-US ] = "Rename" ;
         };
         MenuItem
         {
             Identifier = SID_BASICIDE_HIDECURPAGE ;
-            HelpId = SID_BASICIDE_HIDECURPAGE ;
+            HelpId = CMD_SID_BASICIDE_HIDECURPAGE ;
             Text [ en-US ] = "Hide" ;
         };
         MenuItem
@@ -482,7 +484,7 @@ Menu RID_POPUP_TABBAR
         MenuItem
         {
             Identifier = SID_BASICIDE_MODULEDLG ;
-            HelpId = SID_BASICIDE_MODULEDLG ;
+            HelpId = CMD_SID_BASICIDE_MODULEDLG ;
             Text [ en-US ] = "Modules..." ;
         };
     };
@@ -495,7 +497,7 @@ Menu RID_POPUP_DLGED
         MenuItem
         {
             Identifier = SID_SHOW_PROPERTYBROWSER ;
-            HelpId = SID_SHOW_PROPERTYBROWSER ;
+            HelpId = CMD_SID_SHOW_PROPERTYBROWSER ;
             Text [ en-US ] = "Properties...";
         };
     };
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index cd2f155528e0..af42503a5dae 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -521,8 +521,7 @@ BasicIDETabBar::BasicIDETabBar( Window* pParent ) :
 {
     EnableEditMode( TRUE );
 
-    // FIXME: HELPID
-    SetHelpId( ""/*HID_BASICIDE_TABBAR*/ );
+    SetHelpId( HID_BASICIDE_TABBAR );
 }
 
 void __EXPORT BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index 62c4755112d1..8854e6bfc927 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -81,7 +81,7 @@ SLOFILES =  $(EXCEPTIONSFILES) \
             $(SLO)$/objdlg.obj	\
 
 SRS1NAME=$(TARGET)
-SRC1FILES=	basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src tbxctl.src basicprint.src
+SRC1FILES=	basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src basicprint.src
 
 .INCLUDE :  target.mk
 
diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src
deleted file mode 100644
index 89d839619238..000000000000
--- a/basctl/source/basicide/tbxctl.src
+++ /dev/null
@@ -1,273 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "svx/svxids.hrc"
-#include "tbxctl.hrc"
-#include "helpid.hrc"
-FloatingWindow RID_TBXCONTROLS
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpId = HID_BASICIDE_CONTROLS ;
-    Text [ en-US ] = "Controls" ;
-    String RID_TOOLBOX
-    {
-        Text [ en-US ] = "Controls" ;
-    };
-};
-ToolBox RID_TOOLBOX
-{
-    SVLook = TRUE ;
-     // HelpId = HID_BASICIDE_CONTROLS ;
-    LineCount = 2 ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_PUSHBUTTON ;
-            Identifier = SID_INSERT_PUSHBUTTON ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Button" ;
-            /* ### ACHTUNG: Neuer Text in Resource? CommandButton einf�gen : CommandButton einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_CHECKBOX ;
-            Identifier = SID_INSERT_CHECKBOX ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Check Box" ;
-            /* ### ACHTUNG: Neuer Text in Resource? CheckBox einf�gen : CheckBox einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_FIXEDTEXT ;
-            Identifier = SID_INSERT_FIXEDTEXT ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Label field" ;
-            /* ### ACHTUNG: Neuer Text in Resource? Label einf�gen : Label einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_LISTBOX ;
-            Identifier = SID_INSERT_LISTBOX ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "List Box" ;
-            /* ### ACHTUNG: Neuer Text in Resource? ListBox einf�gen : ListBox einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_HSCROLLBAR ;
-            Identifier = SID_INSERT_HSCROLLBAR ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Horizontal Scroll Bar" ;
-            /* ### ACHTUNG: Neuer Text in Resource? Horizontale ScrollBar einf�gen : Horizontale ScrollBar einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_GROUPBOX ;
-            Identifier = SID_INSERT_GROUPBOX ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Group Box" ;
-            /* ### ACHTUNG: Neuer Text in Resource? GroupBox einf�gen : GroupBox einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_HFIXEDLINE ;
-            Identifier = SID_INSERT_HFIXEDLINE ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Horizontal Line" ;
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_DATEFIELD ;
-            Identifier = SID_INSERT_DATEFIELD ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Date Field";
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_NUMERICFIELD ;
-            Identifier = SID_INSERT_NUMERICFIELD ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Numeric Field";
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_FORMATTEDFIELD ;
-            Identifier = SID_INSERT_FORMATTEDFIELD ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Formatted Field";
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_FILECONTROL ;
-            Identifier = SID_INSERT_FILECONTROL ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "File Selection";
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_TREECONTROL ;
-            Identifier = SID_INSERT_TREECONTROL ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Tree Control";
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            HelpId = SID_SHOW_PROPERTYBROWSER ;
-            Identifier = SID_SHOW_PROPERTYBROWSER ;
-            Text [ en-US ] = "Properties" ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_BREAK ; };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_IMAGECONTROL ;
-            Identifier = SID_INSERT_IMAGECONTROL ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Image Control" ;
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_RADIOBUTTON ;
-            Identifier = SID_INSERT_RADIOBUTTON ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Option Button" ;
-            /* ### ACHTUNG: Neuer Text in Resource? RadioButton einf�gen : RadioButton einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_EDIT ;
-            Identifier = SID_INSERT_EDIT ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Text Box" ;
-            /* ### ACHTUNG: Neuer Text in Resource? Edit einf�gen : Edit einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_COMBOBOX ;
-            Identifier = SID_INSERT_COMBOBOX ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Combo Box" ;
-            /* ### ACHTUNG: Neuer Text in Resource? ComboBox einf�gen : ComboBox einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_VSCROLLBAR ;
-            Identifier = SID_INSERT_VSCROLLBAR ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Vertical Scroll Bar" ;
-            /* ### ACHTUNG: Neuer Text in Resource? Vertikale ScrollBar einf�gen : Vertikale ScrollBar einf�gen */
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_PROGRESSBAR ;
-            Identifier = SID_INSERT_PROGRESSBAR ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Progress Bar" ;
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_VFIXEDLINE ;
-            Identifier = SID_INSERT_VFIXEDLINE ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Vertical Line" ;
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_TIMEFIELD ;
-            Identifier = SID_INSERT_TIMEFIELD ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Time Field";
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_CURRENCYFIELD ;
-            Identifier = SID_INSERT_CURRENCYFIELD ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Currency Field";
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_PATTERNFIELD ;
-            Identifier = SID_INSERT_PATTERNFIELD ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Pattern Field";
-        };
-        ToolBoxItem
-        {
-            HelpId = SID_INSERT_SELECT ;
-            Identifier = SID_INSERT_SELECT ;
-            RadioCheck = TRUE ;
-            Text [ en-US ] = "Select" ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            HelpId = SID_DIALOG_TESTMODE ;
-            Identifier = SID_DIALOG_TESTMODE ;
-            Text [ en-US ] = "Activate Test Mode" ;
-        };
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 1b39a568b23b..41c86699203b 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -323,8 +323,7 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio
     if ( m_pLocalizationMgr->isLibraryLocalized() )
     {
         // change to "Add Interface Language" mode
-        // FIXME: HELPID
-        SetHelpId( ""/*HID_BASICIDE_ADDNEW_LANGUAGE*/ );
+        SetHelpId( HID_BASICIDE_ADDNEW_LANGUAGE );
         m_pCheckLangLB = new SvxCheckListBox( this, IDEResId( LB_ADD_LANGUAGE ) );
         SetText( String( IDEResId( STR_ADDLANG_TITLE ) ) );
         m_aLanguageFT.SetText( String( IDEResId( STR_ADDLANG_LABEL ) ) );