mib19: rebase to DEV300m95

25 files changed, 172 insertions, 422 deletions

diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0f666941e57e..4b2f2ba90952 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -27,59 +27,53 @@
 #ifndef _BASCTL_HELPID_HRC
 #define _BASCTL_HELPID_HRC
 
-// include ---------------------------------------------------------------
+#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"
 
-#include <svl/solar.hrc>
+#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"
 
-// Help-Ids --------------------------------------------------------------
+#define HID_BASICIDE_PROP_BROWSER                         "BASCTL_HID_BASICIDE_PROP_BROWSER"
 
-#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_PROP_BROWSER_LBOX                    "BASCTL_HID_BASICIDE_PROP_BROWSER_LBOX"
 
-#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_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_PROP_BROWSER               (HID_BASICIDE_START +  15)
+#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_PROP_BROWSER_LBOX          (HID_BASICIDE_START +  16)
+#define HID_BASICIDE_MODULWINDOW                          "BASCTL_HID_BASICIDE_MODULWINDOW"
+#define HID_BASICIDE_DIALOGWINDOW                         "BASCTL_HID_BASICIDE_DIALOGWINDOW"
 
-#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_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_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_MODULWINDOW                (HID_BASICIDE_START +  25)
-#define HID_BASICIDE_DIALOGWINDOW               (HID_BASICIDE_START +  26)
-
-#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_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/prj/d.lst b/basctl/prj/d.lst
index d05ff35bdabc..b3ded50b6bbe 100644
--- a/basctl/prj/d.lst
+++ b/basctl/prj/d.lst
@@ -21,3 +21,4 @@ mkdir: %_DEST%\inc%_EXT%\basctl
 ..\uiconfig\basicide\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar\*.xml
 ..\uiconfig\basicide\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar\*.xml
 ..\uiconfig\basicide\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar\*.xml
+..\%__SRC%\misc\basctl.component %_DEST%\xml%_EXT%\basctl.component
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index cdf4c58015ba..7b91d7c3a7d8 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -88,42 +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 );
-    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 53c27296cd63..68cdbe9ad9ed 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -28,8 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basctl.hxx"
 
-
-#include <svl/svarray.hxx>
+#include <vector>
 #define _BASIC_TEXTPORTIONS
 #include <basic/sbdef.hxx>
 #include <ide_pch.hxx>
@@ -258,7 +257,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt )
         if ( rHEvt.GetMode() & HELPMODE_CONTEXT )
         {
             String aKeyword = GetWordAtCursor();
-            Application::GetHelp()->Start( aKeyword, this );
+            Application::GetHelp()->SearchKeyword( aKeyword );
             bDone = TRUE;
         }
         else if ( rHEvt.GetMode() & HELPMODE_QUICK )
@@ -773,8 +772,8 @@ void EditorWindow::ImpDoHighlight( ULONG nLine )
         pEditEngine->RemoveAttribs( nLine, TRUE );
         HighlightPortions aPortions;
         aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
-        USHORT nCount = aPortions.Count();
-        for ( USHORT i = 0; i < nCount; i++ )
+
+        for ( size_t i = 0; i < aPortions.size(); i++ )
         {
             HighlightPortion& r = aPortions[i];
             const Color& rColor = ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->getSyntaxColor(r.tokenType);
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index f4a3c1d48fc7..84291656c755 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -91,9 +91,7 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::resource;
 using namespace ::com::sun::star::ui::dialogs;
 
-#if defined(MAC)
-#define FILTERMASK_ALL "****"
-#elif defined(OW) || defined(MTF)
+#if defined(UNX)
 #define FILTERMASK_ALL "*"
 #elif defined(PM2)
 #define FILTERMASK_ALL ""
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 556211f690af..e114c04bc898 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/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index de9eff56ca24..77e92189507b 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -42,14 +42,13 @@
 #include <basdoc.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
+#include <deque>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
 
-SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 )
-
-SV_IMPL_VARARR( EntryArray, SvLBoxEntry*);
+typedef std::deque< SvLBoxEntry* > EntryArray;
 
 
 void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
@@ -196,7 +195,7 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
             case 2:
             case 1:
             {
-                aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
+                aEntries.push_front( pEntry );
             }
             break;
             case 0:
@@ -210,14 +209,14 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
 
     SbxVariable* pVar = 0;
     bool bDocumentObjects = false;
-    if ( aEntries.Count() )
+    if ( !aEntries.empty() )
     {
-        for ( USHORT n = 0; n < aEntries.Count(); n++ )
+        for ( size_t n = 0; n < aEntries.size(); n++ )
         {
             SvLBoxEntry* pLE = aEntries[n];
-            DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
+            DBG_ASSERT( pLE, "Can not find entry in array" );
             BasicEntry* pBE = (BasicEntry*)pLE->GetUserData();
-            DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" );
+            DBG_ASSERT( pBE, "The data in the entry not found!" );
             String aName( GetEntryText( pLE ) );
 
             switch ( pBE->GetType() )
@@ -301,7 +300,7 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
             case 2:
             case 1:
             {
-                aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
+                aEntries.push_front( pEntry );
             }
             break;
             case 0:
@@ -319,9 +318,9 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
         pEntry = GetParent( pEntry );
     }
 
-    if ( aEntries.Count() )
+    if ( !aEntries.empty() )
     {
-        for ( USHORT n = 0; n < aEntries.Count(); n++ )
+        for ( size_t n = 0; n < aEntries.size(); n++ )
         {
             SvLBoxEntry* pLE = aEntries[n];
             DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index 00fd8fbf8968..6f243a8548db 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -29,7 +29,7 @@
 #include <brkdlg.hrc>
 ModalDialog RID_BASICIDE_BREAKPOINTDLG
 {
-     // HelpId = HID_BASICIDE_BRKPNTS ;
+    HelpId = "basctl:RID_BASICIDE_BREAKPOINTDLG" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 178 , 116 ) ;
@@ -37,6 +37,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
      // Closeable = TRUE;
     ComboBox RID_CB_BRKPOINTS
     {
+        HelpID = "basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 110 , 70 ) ;
         TabStop = TRUE ;
@@ -55,6 +56,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     PushButton RID_PB_NEW
     {
+        HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW";
         Pos = MAP_APPFONT ( 122 , 57 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -62,6 +64,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     PushButton RID_PB_DEL
     {
+        HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL";
         Pos = MAP_APPFONT ( 122 , 74 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? L�schen : L�schen */
@@ -70,6 +73,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     CheckBox RID_CHKB_ACTIVE
     {
+        HelpID = "basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE";
         Pos = MAP_APPFONT ( 6 , 87 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -89,6 +93,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     NumericField RID_FLD_PASS
     {
+        HelpID = "basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81 , 100 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 24bc5beacb30..996e98f52ce4 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -121,9 +121,10 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) :
     aMacroBox.SetSelectHdl( LINK( this, MacroChooser, MacroSelectHdl ) );
 
     aBasicBox.SetMode( BROWSEMODE_MODULES );
-    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
-                             WB_HASBUTTONS | WB_HASBUTTONSATROOT |
-                             WB_HSCROLL );
+    aBasicBox.SetStyle( WB_TABSTOP | WB_BORDER |
+                        WB_HASLINES | WB_HASLINESATROOT |
+                        WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+                        WB_HSCROLL );
 
     BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
     SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 5037879802b0..347e73906222 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -31,7 +31,7 @@
 #include <helpid.hrc>
 ModalDialog RID_MACROCHOOSER
 {
-     // HelpId = SID_BASICCHOOSER ;
+    HelpId = "basctl:ModalDialog:RID_MACROCHOOSER" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 287 , 165 ) ;
@@ -70,6 +70,7 @@ ModalDialog RID_MACROCHOOSER
     };
     Edit RID_ED_MACRONAME
     {
+        HelpID = "basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
@@ -97,6 +98,7 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_RUN
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN";
         Pos = MAP_APPFONT ( 231 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE;
@@ -114,6 +116,7 @@ ModalDialog RID_MACROCHOOSER
 
     PushButton RID_PB_ASSIGN
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN";
         Pos = MAP_APPFONT ( 231 , 60 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Assign..." ;
@@ -121,6 +124,7 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT";
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Pos = MAP_APPFONT ( 231 , 77 ) ;
         Text [ en-US ] = "~Edit" ;
@@ -128,18 +132,21 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_NEWLIB
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB";
         Pos = MAP_APPFONT ( 231 , 60 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "New ~Library";
     };
     PushButton RID_PB_NEWMOD
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD";
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Pos = MAP_APPFONT ( 231 , 77 ) ;
         Text [ en-US ] = "New M~odule";
     };
     PushButton RID_PB_DEL
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL";
         Pos = MAP_APPFONT ( 231 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~L�schen... : ~L�schen... */
@@ -148,6 +155,7 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_ORG
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG";
         Pos = MAP_APPFONT ( 231 , 114 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Organizer..." ;
@@ -160,6 +168,7 @@ ModalDialog RID_MACROCHOOSER
     };
     MultiLineEdit RID_ML_DESCRIPTION
     {
+        HelpID = "basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 131 ) ;
         Size = MAP_APPFONT ( 216 , 28 ) ;
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index b225b987b24b..452d698d0428 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/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 714fc6656941..35bc94e24fca 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -521,7 +521,7 @@ LibPage::LibPage( Window * pParent )
 
     aLibBox.SetMode( LIBMODE_MANAGER );
     aLibBox.EnableInplaceEditing( TRUE );
-    aLibBox.SetWindowBits( WB_HSCROLL );
+    aLibBox.SetStyle( WB_HSCROLL | WB_BORDER | WB_TABSTOP );
     aCloseButton.GrabFocus();
 
     long aTabs[] = { 2, 30, 120 };
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 0f66a6ebe120..c877b2f35bb2 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -596,9 +596,10 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
     aBasicBox.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY );
     aBasicBox.EnableInplaceEditing( TRUE );
     aBasicBox.SetMode( nMode );
-    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
-                             WB_HASBUTTONS | WB_HASBUTTONSATROOT |
-                             WB_HSCROLL );
+    aBasicBox.SetStyle( WB_BORDER | WB_TABSTOP |
+                        WB_HASLINES | WB_HASLINESATROOT |
+                        WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+                        WB_HSCROLL );
     aBasicBox.ScanAllEntries();
 
     aEditButton.GrabFocus();
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index a6ac943f29d0..130aad751a77 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -64,7 +64,7 @@ TabDialog RID_TD_ORGANIZE
 };
 TabPage RID_TP_MODULS
 {
-     // HelpId = HID_BASICIDE_MODULS ;
+    HelpId = "basctl:TabPage:RID_TP_MODULS" ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -84,6 +84,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT";
         Text [ en-US ] = "~Edit";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -99,6 +100,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_NEWMOD
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -106,6 +108,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_NEWDLG
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -113,6 +116,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_DELETE
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE";
         Pos = MAP_APPFONT ( 144 , 120 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~L�schen... : ~L�schen... */
@@ -122,6 +126,7 @@ TabPage RID_TP_MODULS
 };
 TabPage RID_TP_DLGS
 {
+    HelpID = "basctl:TabPage:RID_TP_DLGS";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -141,6 +146,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT";
         Text [ en-US ] = "~Edit";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -156,6 +162,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_NEWMOD
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWMOD";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -163,6 +170,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_NEWDLG
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -170,6 +178,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_DELETE
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE";
         Pos = MAP_APPFONT ( 144 , 120 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~L�schen... : ~L�schen... */
@@ -179,7 +188,7 @@ TabPage RID_TP_DLGS
 };
 TabPage RID_TP_LIBS
 {
-     // HelpId = HID_BASICIDE_LIBS_TP ;
+    HelpId = "basctl:TabPage:RID_TP_LIBS" ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -191,6 +200,7 @@ TabPage RID_TP_LIBS
     };
     ListBox RID_LB_BASICS
     {
+        HelpID = "basctl:ListBox:RID_TP_LIBS:RID_LB_BASICS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 130 , 80 ) ;
@@ -214,6 +224,7 @@ TabPage RID_TP_LIBS
 
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EDIT";
         Text [ en-US ] = "~Edit";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -230,6 +241,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_PASSWORD
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_PASSWORD";
         Pos = MAP_APPFONT ( 144 , 43 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Password..." ;
@@ -238,6 +250,7 @@ TabPage RID_TP_LIBS
 
     PushButton RID_PB_NEWLIB
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_NEWLIB";
         Pos = MAP_APPFONT ( 144 , 69 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -245,6 +258,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_APPEND
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_APPEND";
         Pos = MAP_APPFONT ( 144 , 86 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Hin~zuf�gen... : Hin~zuf�gen... */
@@ -252,6 +266,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_EXPORT
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EXPORT";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "E~xport..." ;
@@ -259,6 +274,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_DELETE
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE";
         Pos = MAP_APPFONT ( 144 , 120 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~L�schen... : ~L�schen... */
@@ -268,7 +284,7 @@ TabPage RID_TP_LIBS
 };
 ModalDialog RID_DLG_LIBS
 {
-     // HelpId = HID_BASICIDE_LIBS_DLG ;
+    HelpId = "basctl:ModalDialog:RID_DLG_LIBS" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 168 , 132 ) ;
@@ -308,6 +324,7 @@ ModalDialog RID_DLG_LIBS
     };
     CheckBox RID_CB_REF
     {
+        HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF";
         Pos = MAP_APPFONT ( 12 , 100 ) ;
         Size = MAP_APPFONT ( 146 , 10 ) ;
         TabStop = TRUE ;
@@ -315,6 +332,7 @@ ModalDialog RID_DLG_LIBS
     };
     CheckBox RID_CB_REPL
     {
+        HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL";
         Pos = MAP_APPFONT ( 12 , 113 ) ;
         Size = MAP_APPFONT ( 146 , 10 ) ;
         Text [ en-US ] = "Replace existing libraries" ;
@@ -322,6 +340,7 @@ ModalDialog RID_DLG_LIBS
 };
 ModalDialog RID_DLG_NEWLIB
 {
+    HelpID = "basctl:ModalDialog:RID_DLG_NEWLIB";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 160 , 55 ) ;
@@ -348,6 +367,7 @@ ModalDialog RID_DLG_NEWLIB
     };
     Edit RID_ED_LIBNAME
     {
+        HelpID = "basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 19 ) ;
         Size = MAP_APPFONT ( 92 , 12 ) ;
@@ -357,6 +377,7 @@ ModalDialog RID_DLG_NEWLIB
 
 ModalDialog RID_DLG_EXPORT
 {
+    HelpID = "basctl:ModalDialog:RID_DLG_EXPORT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 115 , 55 ) ;
@@ -379,6 +400,7 @@ ModalDialog RID_DLG_EXPORT
 
     RadioButton RB_EXPORTASPACKAGE
     {
+        HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE";
         Pos = MAP_APPFONT( 6, 6 );
         Size = MAP_APPFONT( 103, 10 );
         Group = TRUE;
@@ -387,6 +409,7 @@ ModalDialog RID_DLG_EXPORT
     };
     RadioButton RB_EXPORTASBASIC
     {
+        HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC";
         Pos = MAP_APPFONT( 6, 19 );
         Size = MAP_APPFONT( 103, 10 );
         //Group = TRUE;
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
index ef1be222095c..43efcf1dd6a9 100644
--- a/basctl/source/basicide/moptions.src
+++ b/basctl/source/basicide/moptions.src
@@ -29,7 +29,7 @@
 #include <moptions.hrc>
 ModalDialog RID_MACROOPTIONS
 {
-     // HelpId = HID_MACRO_OPTIONS ;
+    HelpId = "basctl:ModalDialog:RID_MACROOPTIONS" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 224 , 121 ) ;
@@ -70,6 +70,7 @@ ModalDialog RID_MACROOPTIONS
     };
     MultiLineEdit RID_ME_DESCR
     {
+        HelpID = "basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6 , 32 ) ;
@@ -93,6 +94,7 @@ ModalDialog RID_MACROOPTIONS
     };
     NumericField RID_NF_HELPID
     {
+        HelpID = "basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 95 , 83 ) ;
@@ -110,6 +112,7 @@ ModalDialog RID_MACROOPTIONS
     };
     Edit RID_ED_HELPNAME
     {
+        HelpID = "basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 95 , 99 ) ;
         Size = MAP_APPFONT ( 120 , 12 ) ;
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index ac7a2c28531d..82030adfccee 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -102,9 +102,10 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
     aToolBox.SetSizePixel( aToolBox.CalcWindowSizePixel() );
     aToolBox.SetSelectHdl( LINK( this, ObjectCatalog, ToolBoxHdl ) );
 
-    aMacroTreeList.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
-                                  WB_HASBUTTONS | WB_HASBUTTONSATROOT |
-                                  WB_HSCROLL );
+    aMacroTreeList.SetStyle( WB_BORDER | WB_TABSTOP |
+                             WB_HASLINES | WB_HASLINESATROOT |
+                             WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+                             WB_HSCROLL );
 
     aMacroTreeList.SetSelectHdl( LINK( this, ObjectCatalog, TreeListHighlightHdl ) );
 
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index c8de023dec53..2d7981dd1c28 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -32,6 +32,7 @@
 
 FloatingWindow RID_BASICIDE_OBJCAT
 {
+    HelpID = "basctl:FloatingWindow:RID_BASICIDE_OBJCAT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 191 , 179 ) ;
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index 0ee179dc1aa6..724ee765c254 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -53,28 +53,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
 }
 
 SAL_DLLPUBLIC_EXPORT
-sal_Bool SAL_CALL component_writeInfo(  void*   pServiceManager ,
-                                        void*   pRegistryKey    )
-{
-    (void)pServiceManager;
-
-    Reference< ::registry::XRegistryKey >
-            xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    sal_Int32 i;
-    Reference< ::registry::XRegistryKey >  xNewKey;
-    xNewKey = xKey->createKey( aDelimiter + SIDEModel::getImplementationName_Static() + aUnoServices );
-    Sequence< OUString > aServices = SIDEModel::getSupportedServiceNames_Static();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
-SAL_DLLPUBLIC_EXPORT
 void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* pRegistryKey )
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.src b/basctl/source/dlged/managelang.src
index b03421e1aa22..c83af6be6e38 100644
--- a/basctl/source/dlged/managelang.src
+++ b/basctl/source/dlged/managelang.src
@@ -45,6 +45,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE";
         Pos = MAP_APPFONT ( MANAGE_COL1 , MANAGE_ROW2 ) ;
         Size = MAP_APPFONT ( MANAGE_LB_WIDTH , MANAGE_LB_HEIGHT ) ;
         Border = TRUE;
@@ -52,6 +53,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     PushButton PB_ADD_LANG
     {
+        HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG";
         Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW2 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -59,6 +61,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     PushButton PB_DEL_LANG
     {
+        HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG";
         Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -66,6 +69,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     PushButton PB_MAKE_DEFAULT
     {
+        HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_MAKE_DEFAULT";
         Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW4 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -135,6 +139,7 @@ ModalDialog RID_DLG_SETDEF_LANGUAGE
     };
     ListBox LB_DEF_LANGUAGE
     {
+        HelpID = "basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE";
         Pos = MAP_APPFONT ( SETDEF_COL1 , SETDEF_ROW2 ) ;
         Size = MAP_APPFONT ( SETDEF_LB_WIDTH , SETDEF_LB_HEIGHT ) ;
         Border = TRUE;
diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component
new file mode 100644
index 000000000000..f101deaf28be
--- /dev/null
+++ b/basctl/util/basctl.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.basic.BasicIDE">
+    <service name="com.sun.star.script.BasicIDE"/>
+  </implementation>
+</component>
diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map
index 80359606ccc8..83193fe176fa 100755
--- a/basctl/util/basctl.map
+++ b/basctl/util/basctl.map
@@ -4,7 +4,6 @@ UDK_3_0_0 {
         basicide_macro_organizer;
         basicide_handle_basic_error;
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
     local:
     *;
diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src
index cd8fe7b26bf5..ce2607b3296d 100644
--- a/basctl/util/hidother.src
+++ b/basctl/util/hidother.src
@@ -25,7 +25,6 @@
  *
  ************************************************************************/
 #include "../inc/helpid.hrc"            // HID_XXX
-//#include "hidother.hrc"
 
 hidspecial HID_BASICIDE_PROP_BROWSER_LBOX   { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; };
 hidspecial HID_BASICIDE_PROP_BROWSER        { HelpID = HID_BASICIDE_PROP_BROWSER; };
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index 47de65cc58c0..b33fa3f1d721 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -103,3 +103,11 @@ RESLIB1SRSFILES= $(SRSFILELIST)
 
 .ENDIF # "$(header)" == ""
 
+
+ALLTAR : $(MISC)/basctl.component
+
+$(MISC)/basctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        basctl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt basctl.component